Merge pull request #418 from fobo66/auth

Obtain Steam Id from the phone

app/src/main/kotlin/io/github/fobo66/wearmmr/ui/SettingsActivity.kt

@@ -19,24 +19,42 @@ package io.github.fobo66.wearmmr.ui
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView.BufferType.EDITABLE
 import androidx.activity.ComponentActivity
 import androidx.core.content.getSystemService
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.wear.ambient.AmbientLifecycleObserver
+import androidx.wear.phone.interactions.authentication.CodeChallenge
+import androidx.wear.phone.interactions.authentication.CodeVerifier
+import androidx.wear.phone.interactions.authentication.OAuthRequest
+import androidx.wear.phone.interactions.authentication.OAuthResponse
+import androidx.wear.phone.interactions.authentication.RemoteAuthClient
 import androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester
 import com.google.android.material.color.DynamicColors
 import io.github.fobo66.wearmmr.databinding.ActivitySettingsBinding
 import io.github.fobo66.wearmmr.domain.RatingComplicationDataSource
 import io.github.fobo66.wearmmr.model.SettingsViewModel
+import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import timber.log.Timber
 
 class SettingsActivity : ComponentActivity() {
 
     private lateinit var binding: ActivitySettingsBinding
 
+    private val ambientObserver = AmbientLifecycleObserver(
+        this,
+        object: AmbientLifecycleObserver.AmbientLifecycleCallback {
+
+        }
+    )
+
     private val updateRequester: ComplicationDataSourceUpdateRequester by lazy {
         ComplicationDataSourceUpdateRequester.create(
             this,
@@ -49,14 +67,17 @@ class SettingsActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         DynamicColors.applyToActivityIfAvailable(this)
+        lifecycle.addObserver(ambientObserver)
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        lifecycleScope.launchWhenResumed {
-            binding.playerIdInput.editText?.setText(
-                settingsViewModel.loadPlayerId(),
-                EDITABLE
-            )
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                binding.playerIdInput.editText?.setText(
+                    settingsViewModel.loadPlayerId(),
+                    EDITABLE
+                )
+            }
         }
 
         binding.playerIdInput.editText?.setOnEditorActionListener { _, actionId, _ ->
@@ -72,6 +93,33 @@ class SettingsActivity : ComponentActivity() {
                 false
             }
         }
+
+        binding.signInButton.setOnClickListener {
+            val codeVerifier = CodeVerifier()
+            val request = OAuthRequest.Builder(this.applicationContext)
+                .setAuthProviderUrl(Uri.parse("https://steamcommunity.com/oauth/login"))
+                .setCodeChallenge(CodeChallenge(codeVerifier))
+                .setClientId("wearmmr")
+                .build()
+            val client = RemoteAuthClient.create(this)
+            client.sendAuthorizationRequest(request,
+                { command -> command?.run() },
+                object : RemoteAuthClient.Callback() {
+                    override fun onAuthorizationError(request: OAuthRequest, errorCode: Int) {
+                        Timber.e("Auth failed with code %d", errorCode)
+                    }
+
+                    override fun onAuthorizationResponse(
+                        request: OAuthRequest,
+                        response: OAuthResponse
+                    ) {
+                        Timber.d("Auth successful")
+                    }
+                }
+            )
+
+
+        }
     }
 
     private fun updateComplication() {
@@ -87,7 +135,10 @@ class SettingsActivity : ComponentActivity() {
 
     companion object {
         fun start(context: Context) {
-            context.startActivity(Intent(context, SettingsActivity::class.java))
+            context.startActivity(Intent(context, SettingsActivity::class.java).setClassName(
+                context.packageName,
+                SettingsActivity::class.java.name
+            ))
         }
     }
 }

app/src/main/res/layout/activity_settings.xml

@@ -57,8 +57,8 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textview.MaterialTextView
-                style="@style/TextAppearance.Material3.BodySmall"
                 android:id="@+id/settings_player_id_hint"
+                style="@style/TextAppearance.Material3.BodySmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -69,6 +69,16 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/player_id_input" />
+
+            <Button
+                android:id="@+id/sign_in_button"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_action_on_the_phone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/settings_player_id_hint" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.wear.widget.BoxInsetLayout>

app/src/main/res/values/strings.xml

@@ -29,4 +29,5 @@
     <string name="settings_player_id_hint">Please specify your Steam ID in the input above so we can fetch your MMR</string>
     <string name="invalid_player_id_error">Your player ID seems to be incorrect. Please specify your Steam ID in the settings so we can fetch your MMR</string>
     <string name="no_rating_error">Unable to fetch your MMR. Please try again later</string>
+    <string name="settings_action_on_the_phone">Sign in on the phone</string>
 </resources>

buildSrc/build.gradle.kts

@@ -18,6 +18,10 @@ plugins {
     `kotlin-dsl`
 }
 
+kotlin {
+    jvmToolchain(17)
+  }
+
 repositories {
     mavenCentral()
 }

gradle.properties

@@ -14,14 +14,15 @@
 #    limitations under the License.
 #
 
-org.gradle.jvmargs=-Xms1g -Xmx8g -XX:+UseParallelGC
+org.gradle.jvmargs=-Xms512m -Xmx16g -XX:+UseSerialGC -XX:CompileCommand=exclude,com/android/tools/r8/internal/fb,a
 org.gradle.parallel=true
 org.gradle.configureondemand=false
 org.gradle.caching=true
 android.useAndroidX=true
 android.enableJetifier=false
 android.disableResourceValidation=true
+android.nonFinalResIds=true
 kotlin.code.style=official
 org.gradle.vfs.watch=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 kotlin.incremental.useClasspathSnapshot=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -29,9 +29,9 @@ dependencyResolutionManagement {
         }
 
         register("libs") {
-            version("kotlin", "1.9.21")
+            version("kotlin", "1.9.22")
             version("coroutines", "1.7.3")
-            plugin("ksp", "com.google.devtools.ksp").version("1.9.21-1.0.16")
+            plugin("ksp", "com.google.devtools.ksp").version("1.9.22-1.0.16")
             plugin("detekt", "io.gitlab.arturbosch.detekt").version("1.23.4")
             library("coil", "io.coil-kt:coil-compose:2.5.0")
             library("material", "com.google.android.material:material:1.11.0")
@@ -56,7 +56,7 @@ dependencyResolutionManagement {
         }
 
         register("compose") {
-            version("compiler", "1.5.7")
+            version("compiler", "1.5.8")
             version("regular", "1.5.4")
             version("wear", "1.2.1")
             library("foundation", "androidx.compose.foundation", "foundation").versionRef("regular")