From 72e6df93cb4d017bee73168b9365c938ab1d0f2d Mon Sep 17 00:00:00 2001
From: pahill <pamela.a.hill@gmail.com>
Date: Thu, 17 Apr 2025 16:10:24 +0200
Subject: [PATCH 1/4] Convert to Jetpack Compose and StateFlow.

---
 .idea/misc.xml                                |   1 -
 app/build.gradle.kts                          |  23 +++
 .../androidapp/ui/login/LoginActivity.kt      | 135 ++++-------------
 .../androidapp/ui/login/LoginScreen.kt        | 138 ++++++++++++++++++
 .../androidapp/ui/login/LoginViewModel.kt     |  33 +++--
 gradle/libs.versions.toml                     |  13 +-
 6 files changed, 219 insertions(+), 124 deletions(-)
 create mode 100644 app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a8cf6ba..9997112 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d9d0644..f656592 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
@@ -39,6 +40,11 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.7.8"
     }
     namespace = "com.jetbrains.simplelogin.androidapp"
 }
@@ -51,6 +57,23 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+
+    // Compose
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling.preview)
+    implementation(libs.compose.foundation)
+    implementation(libs.compose.material3)
+    implementation(libs.compose.runtime)
+    debugImplementation(libs.compose.ui.tooling)
+
+    // Coroutines
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
index 217c7ea..efb408a 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
@@ -1,130 +1,49 @@
 package com.jetbrains.simplelogin.androidapp.ui.login
 
 import android.app.Activity
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import android.os.Bundle
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AppCompatActivity
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
 import android.widget.Toast
-import com.jetbrains.simplelogin.androidapp.databinding.ActivityLoginBinding
-
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.lifecycle.ViewModelProvider
 import com.jetbrains.simplelogin.androidapp.R
 
 class LoginActivity : AppCompatActivity() {
 
     private lateinit var loginViewModel: LoginViewModel
-    private lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        binding = ActivityLoginBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val username = binding.username
-        val password = binding.password
-        val login = binding.login
-        val loading = binding.loading
-
         loginViewModel = ViewModelProvider(this, LoginViewModelFactory())
             .get(LoginViewModel::class.java)
 
-        loginViewModel.loginFormState.observe(this@LoginActivity, Observer {
-            val loginState = it ?: return@Observer
-
-            // disable login button unless both username / password is valid
-            login.isEnabled = loginState.isDataValid
-
-            if (loginState.usernameError != null) {
-                username.error = loginState.usernameError
-            }
-            if (loginState.passwordError != null) {
-                password.error = loginState.passwordError
-            }
-        })
-
-        loginViewModel.loginResult.observe(this@LoginActivity, Observer {
-            val loginResult = it ?: return@Observer
-
-            loading.visibility = View.GONE
-            if (loginResult.error != null) {
-                showLoginFailed(loginResult.error)
-            }
-            if (loginResult.success != null) {
-                updateUiWithUser(loginResult.success)
-            }
-            setResult(Activity.RESULT_OK)
-
-            //Complete and destroy login activity once successful
-            finish()
-        })
-
-        username.afterTextChanged {
-            loginViewModel.loginDataChanged(
-                username.text.toString(),
-                password.text.toString()
-            )
-        }
-
-        password.apply {
-            afterTextChanged {
-                loginViewModel.loginDataChanged(
-                    username.text.toString(),
-                    password.text.toString()
-                )
-            }
-
-            setOnEditorActionListener { _, actionId, _ ->
-                when (actionId) {
-                    EditorInfo.IME_ACTION_DONE ->
-                        loginViewModel.login(
-                            username.text.toString(),
-                            password.text.toString()
-                        )
+        setContent {
+            MaterialTheme {
+                Surface(color = MaterialTheme.colorScheme.background) {
+                    LoginScreen(
+                        viewModel = loginViewModel,
+                        onLoginSuccess = {
+                            // Show welcome message
+                            val user = loginViewModel.loginResult.value?.success
+                            user?.let {
+                                val welcome = getString(R.string.welcome)
+                                Toast.makeText(
+                                    applicationContext,
+                                    "$welcome ${it.displayName}",
+                                    Toast.LENGTH_LONG
+                                ).show()
+                            }
+
+                            // Complete the login process
+                            setResult(Activity.RESULT_OK)
+                            finish()
+                        }
+                    )
                 }
-                false
-            }
-
-            login.setOnClickListener {
-                loading.visibility = View.VISIBLE
-                loginViewModel.login(username.text.toString(), password.text.toString())
             }
         }
     }
-
-    private fun updateUiWithUser(model: LoggedInUserView) {
-        val welcome = getString(R.string.welcome)
-        val displayName = model.displayName
-        // TODO : initiate successful logged in experience
-        Toast.makeText(
-            applicationContext,
-            "$welcome $displayName",
-            Toast.LENGTH_LONG
-        ).show()
-    }
-
-    private fun showLoginFailed(@StringRes errorString: Int) {
-        Toast.makeText(applicationContext, errorString, Toast.LENGTH_SHORT).show()
-    }
 }
-
-/**
- * Extension function to simplify setting an afterTextChanged action to EditText components.
- */
-fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
-    this.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(editable: Editable?) {
-            afterTextChanged.invoke(editable.toString())
-        }
-
-        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
-    })
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
new file mode 100644
index 0000000..fa0265f
--- /dev/null
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
@@ -0,0 +1,138 @@
+package com.jetbrains.simplelogin.androidapp.ui.login
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.jetbrains.simplelogin.androidapp.R
+
+@Composable
+fun LoginScreen(
+    viewModel: LoginViewModel,
+    onLoginSuccess: () -> Unit
+) {
+    val loginFormState by viewModel.loginFormState.collectAsStateWithLifecycle()
+    val loginResult by viewModel.loginResult.collectAsStateWithLifecycle()
+    val context = LocalContext.current
+    
+    var username by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
+    val passwordFocusRequester = remember { FocusRequester() }
+    
+    // Handle login result
+    LaunchedEffect(loginResult) {
+        loginResult?.let { result ->
+            if (result.success != null) {
+                // Show welcome message
+                onLoginSuccess()
+            }
+        }
+    }
+    
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        // Username field
+        OutlinedTextField(
+            value = username,
+            onValueChange = { 
+                username = it
+                viewModel.loginDataChanged(username, password)
+            },
+            label = { Text(stringResource(R.string.prompt_email)) },
+            isError = loginFormState.usernameError != null,
+            supportingText = {
+                loginFormState.usernameError?.let {
+                    Text(it)
+                }
+            },
+            keyboardOptions = KeyboardOptions(
+                keyboardType = KeyboardType.Email,
+                imeAction = ImeAction.Next
+            ),
+            keyboardActions = KeyboardActions(
+                onNext = { passwordFocusRequester.requestFocus() }
+            ),
+            singleLine = true,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 8.dp)
+        )
+        
+        // Password field
+        OutlinedTextField(
+            value = password,
+            onValueChange = { 
+                password = it
+                viewModel.loginDataChanged(username, password)
+            },
+            label = { Text(stringResource(R.string.prompt_password)) },
+            isError = loginFormState.passwordError != null,
+            supportingText = {
+                loginFormState.passwordError?.let {
+                    Text(it)
+                }
+            },
+            visualTransformation = PasswordVisualTransformation(),
+            keyboardOptions = KeyboardOptions(
+                keyboardType = KeyboardType.Password,
+                imeAction = ImeAction.Done
+            ),
+            keyboardActions = KeyboardActions(
+                onDone = { 
+                    if (loginFormState.isDataValid) {
+                        viewModel.login(username, password)
+                    }
+                }
+            ),
+            singleLine = true,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+                .focusRequester(passwordFocusRequester)
+        )
+        
+        // Login button
+        Button(
+            onClick = { viewModel.login(username, password) },
+            enabled = loginFormState.isDataValid,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(50.dp)
+        ) {
+            Text(stringResource(R.string.action_sign_in))
+        }
+        
+        // Loading indicator
+        if (loginResult != null && loginResult?.success == null && loginResult?.error == null) {
+            CircularProgressIndicator(
+                modifier = Modifier.padding(16.dp)
+            )
+        }
+        
+        // Error message
+        loginResult?.error?.let { errorId ->
+            Text(
+                text = stringResource(errorId),
+                color = MaterialTheme.colorScheme.error,
+                modifier = Modifier.padding(top = 16.dp)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt
index 492bad1..f4250c8 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModel.kt
@@ -1,37 +1,42 @@
 package com.jetbrains.simplelogin.androidapp.ui.login
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.jetbrains.simplelogin.androidapp.data.LoginRepository
 import com.jetbrains.simplelogin.androidapp.data.Result
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
 
 import com.jetbrains.simplelogin.androidapp.R
 import com.jetbrains.simplelogin.androidapp.data.LoginDataValidator
 
 class LoginViewModel(private val loginRepository: LoginRepository, private val dataValidator: LoginDataValidator) : ViewModel() {
 
-    private val _loginForm = MutableLiveData<LoginFormState>()
-    val loginFormState: LiveData<LoginFormState> = _loginForm
+    private val _loginFormState = MutableStateFlow(LoginFormState(null, null))
+    val loginFormState: StateFlow<LoginFormState> = _loginFormState.asStateFlow()
 
-    private val _loginResult = MutableLiveData<LoginResult>()
-    val loginResult: LiveData<LoginResult> = _loginResult
+    private val _loginResult = MutableStateFlow<LoginResult?>(null)
+    val loginResult: StateFlow<LoginResult?> = _loginResult.asStateFlow()
 
     fun login(username: String, password: String) {
         // can be launched in a separate asynchronous job
-        val result = loginRepository.login(username, password)
-
-        if (result is Result.Success) {
-            _loginResult.value = LoginResult(success = LoggedInUserView(displayName = result.data.displayName))
-        } else {
-            _loginResult.value = LoginResult(error = R.string.login_failed)
+        viewModelScope.launch {
+            val result = loginRepository.login(username, password)
+
+            if (result is Result.Success) {
+                _loginResult.value = LoginResult(success = LoggedInUserView(displayName = result.data.displayName))
+            } else {
+                _loginResult.value = LoginResult(error = R.string.login_failed)
+            }
         }
     }
 
     fun loginDataChanged(username: String, password: String) {
-        _loginForm.value = LoginFormState(
+        _loginFormState.value = LoginFormState(
             usernameError = (dataValidator.checkUsername(username) as? LoginDataValidator.Result.Error)?.message,
             passwordError = (dataValidator.checkPassword(password) as? LoginDataValidator.Result.Error)?.message
         )
     }
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca5b642..8c7d7f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android-gradlePlugin = "8.8.2"
+android-gradlePlugin = "8.8.0-alpha05"
 android-compileSdk = "35"
 android-minSdk = "24"
 android-targetSdk = "35"
@@ -19,12 +19,18 @@ kotlin = "2.1.10"
 ktor = "3.1.0"
 kotlinxCoroutinesCore = "1.10.1"
 lifecycleLivedataKtx = "2.8.7"
+lifecycleRuntimeKtx = "2.8.7"
+lifecycleViewmodelCompose = "2.8.7"
+material3 = "1.3.0"
 voyagerNavigator = "1.0.0"
 
 [libraries]
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleLivedataKtx" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
 image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "imageLoader" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
@@ -36,9 +42,14 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
+compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
+compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" }
 ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }

From 66b0d074ec00b63aa22252d5d7a9ea2bfe052330 Mon Sep 17 00:00:00 2001
From: pahill <pamela.a.hill@gmail.com>
Date: Sat, 19 Apr 2025 10:21:06 +0200
Subject: [PATCH 2/4] Update Gradle settings, dependencies, and cleanup unused
 code

Revised Gradle properties, upgraded dependencies, and migrated to a local JVM path for consistency. Removed outdated or unused plugins, libraries, and code (e.g., view binding, constraint layout). Simplified logic in `LoginActivity` and `LoginScreen` for improved readability.
---
 .idea/gradle.xml                              |  2 +-
 app/build.gradle.kts                          |  3 ---
 .../androidapp/ui/login/LoginActivity.kt      |  6 ++---
 .../androidapp/ui/login/LoginScreen.kt        |  1 -
 gradle/libs.versions.toml                     | 22 ++++---------------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 6 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dec7287..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f656592..8eb5830 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,7 +39,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
     buildFeatures {
-        viewBinding = true
         compose = true
     }
 
@@ -54,8 +53,6 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.material)
     implementation(libs.androidx.annotation)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.runtime.compose)
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
index efb408a..ec29e90 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
@@ -22,13 +22,13 @@ class LoginActivity : AppCompatActivity() {
 
         setContent {
             MaterialTheme {
-                Surface(color = MaterialTheme.colorScheme.background) {
+                Surface() {
                     LoginScreen(
                         viewModel = loginViewModel,
                         onLoginSuccess = {
                             // Show welcome message
-                            val user = loginViewModel.loginResult.value?.success
-                            user?.let {
+                            val successResult = loginViewModel.loginResult.value?.success
+                            successResult?.let {
                                 val welcome = getString(R.string.welcome)
                                 Toast.makeText(
                                     applicationContext,
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
index fa0265f..d318598 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
@@ -25,7 +25,6 @@ fun LoginScreen(
 ) {
     val loginFormState by viewModel.loginFormState.collectAsStateWithLifecycle()
     val loginResult by viewModel.loginResult.collectAsStateWithLifecycle()
-    val context = LocalContext.current
     
     var username by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8c7d7f7..32ef55e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,28 +1,25 @@
 [versions]
-android-gradlePlugin = "8.8.0-alpha05"
+android-gradlePlugin = "8.9.0"
 android-compileSdk = "35"
 android-minSdk = "24"
 android-targetSdk = "35"
 androidx-activityCompose = "1.10.1"
 androidx-appcompat = "1.7.0"
 androidx-constraintlayout = "2.2.1"
-androidx-core-ktx = "1.15.0"
+androidx-core-ktx = "1.16.0"
 androidx-espresso-core = "3.6.1"
 androidx-material = "1.12.0"
 androidx-test-junit = "1.2.1"
 annotation = "1.9.1"
 compose = "1.7.8"
-compose-plugin = "1.6.10"
-imageLoader = "1.6.3"
+compose-plugin = "1.7.3"
 junit = "4.13.2"
 kotlin = "2.1.10"
-ktor = "3.1.0"
 kotlinxCoroutinesCore = "1.10.1"
 lifecycleLivedataKtx = "2.8.7"
 lifecycleRuntimeKtx = "2.8.7"
 lifecycleViewmodelCompose = "2.8.7"
-material3 = "1.3.0"
-voyagerNavigator = "1.0.0"
+material3 = "1.3.2"
 
 [libraries]
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
@@ -31,9 +28,6 @@ androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-view
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
-image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "imageLoader" }
-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
 androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
@@ -50,16 +44,8 @@ compose-material3 = { module = "androidx.compose.material3:material3", version.r
 compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyagerNavigator" }
-ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "android-gradlePlugin" }
-androidLibrary = { id = "com.android.library", version.ref = "android-gradlePlugin" }
-jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72..e2847c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From c06a2ae9bb65ee97f6f5c48344e34426f2cf2f7e Mon Sep 17 00:00:00 2001
From: pahill <pamela.a.hill@gmail.com>
Date: Wed, 23 Apr 2025 16:32:14 +0200
Subject: [PATCH 3/4] Code review changes

---
 app/build.gradle.kts                          |  3 ---
 .../androidapp/ui/login/LoginActivity.kt      | 18 +++++++------
 .../androidapp/ui/login/LoginScreen.kt        |  4 +--
 .../ui/login/LoginViewModelFactory.kt         | 27 -------------------
 4 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8eb5830..4360b26 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -42,9 +42,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.7.8"
-    }
     namespace = "com.jetbrains.simplelogin.androidapp"
 }
 
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
index ec29e90..75267f7 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginActivity.kt
@@ -7,27 +7,29 @@ import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.lifecycle.ViewModelProvider
 import com.jetbrains.simplelogin.androidapp.R
+import com.jetbrains.simplelogin.androidapp.data.LoginDataSource
+import com.jetbrains.simplelogin.androidapp.data.LoginDataValidator
+import com.jetbrains.simplelogin.androidapp.data.LoginRepository
 
 class LoginActivity : AppCompatActivity() {
 
-    private lateinit var loginViewModel: LoginViewModel
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        loginViewModel = ViewModelProvider(this, LoginViewModelFactory())
-            .get(LoginViewModel::class.java)
-
         setContent {
             MaterialTheme {
                 Surface() {
                     LoginScreen(
-                        viewModel = loginViewModel,
+                        viewModel = LoginViewModel(
+                            loginRepository = LoginRepository(
+                                dataSource = LoginDataSource()
+                            ),
+                            dataValidator = LoginDataValidator()
+                        ),
                         onLoginSuccess = {
                             // Show welcome message
-                            val successResult = loginViewModel.loginResult.value?.success
+                            val successResult = it.success
                             successResult?.let {
                                 val welcome = getString(R.string.welcome)
                                 Toast.makeText(
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
index d318598..948b198 100644
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
+++ b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginScreen.kt
@@ -21,7 +21,7 @@ import com.jetbrains.simplelogin.androidapp.R
 @Composable
 fun LoginScreen(
     viewModel: LoginViewModel,
-    onLoginSuccess: () -> Unit
+    onLoginSuccess: (LoginResult) -> Unit
 ) {
     val loginFormState by viewModel.loginFormState.collectAsStateWithLifecycle()
     val loginResult by viewModel.loginResult.collectAsStateWithLifecycle()
@@ -35,7 +35,7 @@ fun LoginScreen(
         loginResult?.let { result ->
             if (result.success != null) {
                 // Show welcome message
-                onLoginSuccess()
+                onLoginSuccess(result)
             }
         }
     }
diff --git a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt b/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt
deleted file mode 100644
index bd29246..0000000
--- a/app/src/main/java/com/jetbrains/simplelogin/androidapp/ui/login/LoginViewModelFactory.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jetbrains.simplelogin.androidapp.ui.login
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import com.jetbrains.simplelogin.androidapp.data.LoginDataSource
-import com.jetbrains.simplelogin.androidapp.data.LoginDataValidator
-import com.jetbrains.simplelogin.androidapp.data.LoginRepository
-
-/**
- * ViewModel provider factory to instantiate LoginViewModel.
- * Required given LoginViewModel has a non-empty constructor
- */
-class LoginViewModelFactory : ViewModelProvider.Factory {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        if (modelClass.isAssignableFrom(LoginViewModel::class.java)) {
-            return LoginViewModel(
-                loginRepository = LoginRepository(
-                    dataSource = LoginDataSource()
-                ),
-                dataValidator = LoginDataValidator()
-            ) as T
-        }
-        throw IllegalArgumentException("Unknown ViewModel class")
-    }
-}
\ No newline at end of file

From ad775ecac1c21caade62654554d687d263f0e5ca Mon Sep 17 00:00:00 2001
From: pahill <pamela.a.hill@gmail.com>
Date: Wed, 23 Apr 2025 16:32:28 +0200
Subject: [PATCH 4/4] Code review changes

---
 .../UserInterfaceState.xcuserstate              | Bin 0 -> 21631 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate

diff --git a/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/simpleLoginIOS.xcodeproj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000000000000000000000000000000000000..900cd9cc89f33bf63d99a9f1e261c438cc8b479f
GIT binary patch
literal 21631
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

literal 0
HcmV?d00001