wip: e2e tests for PhoneAuthScreen

Author: demolaf

auth/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.dsl.TestOptions
-
 plugins {
     id("com.android.library")
     id("com.vanniktech.maven.publish")
@@ -13,7 +11,7 @@ android {
 
     defaultConfig {
         minSdk = Config.SdkVersions.min
-        targetSdk =Config.SdkVersions.target
+        targetSdk = Config.SdkVersions.target
 
         buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 
@@ -27,8 +25,8 @@ android {
             consumerProguardFiles("auth-proguard.pro")
         }
     }
-        
-    compileOptions {    
+
+    compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
@@ -82,8 +80,8 @@ dependencies {
     implementation(Config.Libs.Androidx.Compose.tooling)
     implementation(Config.Libs.Androidx.Compose.toolingPreview)
     implementation(Config.Libs.Androidx.Compose.activityCompose)
-    implementation(Config.Libs.Androidx.materialDesign)
     implementation(Config.Libs.Androidx.activity)
+    implementation(Config.Libs.Androidx.materialDesign)
     implementation(Config.Libs.Androidx.Compose.materialIconsExtended)
     implementation(Config.Libs.Androidx.datastorePreferences)
     // The new activity result APIs force us to include Fragment 1.3.0

auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProvider.kt

@@ -14,6 +14,7 @@
 
 package com.firebase.ui.auth.compose.configuration.auth_provider
 
+import android.app.Activity
 import android.content.Context
 import android.net.Uri
 import android.util.Log
@@ -44,6 +45,7 @@ import com.google.firebase.auth.TwitterAuthProvider
 import com.google.firebase.auth.UserProfileChangeRequest
 import com.google.firebase.auth.actionCodeSettings
 import kotlinx.coroutines.tasks.await
+import kotlinx.serialization.Serializable
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -404,13 +406,15 @@ abstract class AuthProvider(open val providerId: String) {
          */
         internal suspend fun verifyPhoneNumberAwait(
             auth: FirebaseAuth,
+            activity: Activity?,
             phoneNumber: String,
             multiFactorSession: MultiFactorSession? = null,
             forceResendingToken: PhoneAuthProvider.ForceResendingToken?,
             verifier: Verifier = DefaultVerifier(),
         ): VerifyPhoneNumberResult {
             return verifier.verifyPhoneNumber(
                 auth,
+                activity,
                 phoneNumber,
                 timeout,
                 forceResendingToken,
@@ -425,11 +429,12 @@ abstract class AuthProvider(open val providerId: String) {
         internal interface Verifier {
             suspend fun verifyPhoneNumber(
                 auth: FirebaseAuth,
+                activity: Activity?,
                 phoneNumber: String,
                 timeout: Long,
                 forceResendingToken: PhoneAuthProvider.ForceResendingToken?,
                 multiFactorSession: MultiFactorSession?,
-                isInstantVerificationEnabled: Boolean
+                isInstantVerificationEnabled: Boolean,
             ): VerifyPhoneNumberResult
         }
 
@@ -439,18 +444,20 @@ abstract class AuthProvider(open val providerId: String) {
         internal class DefaultVerifier : Verifier {
             override suspend fun verifyPhoneNumber(
                 auth: FirebaseAuth,
+                activity: Activity?,
                 phoneNumber: String,
                 timeout: Long,
                 forceResendingToken: PhoneAuthProvider.ForceResendingToken?,
                 multiFactorSession: MultiFactorSession?,
-                isInstantVerificationEnabled: Boolean
+                isInstantVerificationEnabled: Boolean,
             ): VerifyPhoneNumberResult {
                 return suspendCoroutine { continuation ->
                     val options = PhoneAuthOptions.newBuilder(auth)
                         .setPhoneNumber(phoneNumber)
                         .requireSmsValidation(!isInstantVerificationEnabled)
                         .setTimeout(timeout, TimeUnit.SECONDS)
-                        .setCallbacks(object : PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
+                        .setCallbacks(object :
+                            PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
                             override fun onVerificationCompleted(credential: PhoneAuthCredential) {
                                 continuation.resume(VerifyPhoneNumberResult.AutoVerified(credential))
                             }
@@ -471,11 +478,14 @@ abstract class AuthProvider(open val providerId: String) {
                                 )
                             }
                         })
-                    if (forceResendingToken != null) {
-                        options.setForceResendingToken(forceResendingToken)
+                    activity?.let {
+                        options.setActivity(it)
                     }
-                    if (multiFactorSession != null) {
-                        options.setMultiFactorSession(multiFactorSession)
+                    forceResendingToken?.let {
+                        options.setForceResendingToken(it)
+                    }
+                    multiFactorSession?.let {
+                        options.setMultiFactorSession(it)
                     }
                     PhoneAuthProvider.verifyPhoneNumber(options.build())
                 }
@@ -495,7 +505,10 @@ abstract class AuthProvider(open val providerId: String) {
          * @suppress
          */
         internal class DefaultCredentialProvider : CredentialProvider {
-            override fun getCredential(verificationId: String, smsCode: String): PhoneAuthCredential {
+            override fun getCredential(
+                verificationId: String,
+                smsCode: String,
+            ): PhoneAuthCredential {
                 return PhoneAuthProvider.getCredential(verificationId, smsCode)
             }
         }

auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/PhoneAuthProvider+FirebaseAuthUI.kt

@@ -1,5 +1,6 @@
 package com.firebase.ui.auth.compose.configuration.auth_provider
 
+import android.app.Activity
 import com.firebase.ui.auth.compose.AuthException
 import com.firebase.ui.auth.compose.AuthState
 import com.firebase.ui.auth.compose.FirebaseAuthUI
@@ -101,6 +102,7 @@ import kotlinx.coroutines.CancellationException
  */
 internal suspend fun FirebaseAuthUI.verifyPhoneNumber(
     provider: AuthProvider.Phone,
+    activity: Activity?,
     phoneNumber: String,
     multiFactorSession: MultiFactorSession? = null,
     forceResendingToken: PhoneAuthProvider.ForceResendingToken? = null,
@@ -110,6 +112,7 @@ internal suspend fun FirebaseAuthUI.verifyPhoneNumber(
         updateAuthState(AuthState.Loading("Verifying phone number..."))
         val result = provider.verifyPhoneNumberAwait(
             auth = auth,
+            activity = activity,
             phoneNumber = phoneNumber,
             multiFactorSession = multiFactorSession,
             forceResendingToken = forceResendingToken,

auth/src/main/java/com/firebase/ui/auth/compose/configuration/string_provider/AuthUIStringProvider.kt

@@ -175,7 +175,7 @@ interface AuthUIStringProvider {
     val resendCode: String
 
     /** Resend code with timer */
-    fun resendCodeTimer(seconds: Int): String
+    fun resendCodeTimer(timeFormatted: String): String
 
     /** Verifying progress text */
     val verifying: String

auth/src/main/java/com/firebase/ui/auth/compose/configuration/string_provider/DefaultAuthUIStringProvider.kt

@@ -170,8 +170,8 @@ class DefaultAuthUIStringProvider(
     override val resendCode: String
         get() = localizedContext.getString(R.string.fui_resend_code)
 
-    override fun resendCodeTimer(seconds: Int): String =
-        localizedContext.getString(R.string.fui_resend_code_in, seconds)
+    override fun resendCodeTimer(timeFormatted: String): String =
+        localizedContext.getString(R.string.fui_resend_code_in, timeFormatted)
 
     override val verifying: String
         get() = localizedContext.getString(R.string.fui_verifying)

auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/phone/EnterVerificationCodeUI.kt

@@ -133,7 +133,10 @@ fun EnterVerificationCodeUI(
             ) {
                 Text(
                     text = if (resendTimer > 0) {
-                        stringProvider.resendCodeTimer(resendTimer)
+                        val minutes = resendTimer / 60
+                        val seconds = resendTimer % 60
+                        val timeFormatted = "$minutes:${String.format("%02d", seconds)}"
+                        stringProvider.resendCodeTimer(timeFormatted)
                     } else {
                         stringProvider.resendCode
                     },

auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/phone/PhoneAuthScreen.kt

@@ -14,6 +14,7 @@
 
 package com.firebase.ui.auth.compose.ui.screens.phone
 
+import android.app.Activity
 import android.content.Context
 import android.util.Log
 import androidx.compose.runtime.Composable
@@ -26,6 +27,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import com.firebase.ui.auth.compose.AuthException
 import com.firebase.ui.auth.compose.AuthState
 import com.firebase.ui.auth.compose.FirebaseAuthUI
@@ -42,6 +44,7 @@ import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.PhoneAuthProvider
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import androidx.activity.compose.LocalActivity
 
 enum class PhoneAuthStep {
     /**
@@ -138,6 +141,7 @@ fun PhoneAuthScreen(
     modifier: Modifier = Modifier,
     content: @Composable ((PhoneAuthContentState) -> Unit)? = null,
 ) {
+    val activity = LocalActivity.current
     val provider = configuration.providers.filterIsInstance<AuthProvider.Phone>().first()
     val stringProvider = DefaultAuthUIStringProvider(context)
     val coroutineScope = rememberCoroutineScope()
@@ -242,6 +246,7 @@ fun PhoneAuthScreen(
                 try {
                     authUI.verifyPhoneNumber(
                         provider = provider,
+                        activity = activity,
                         phoneNumber = fullPhoneNumber,
                     )
                 } catch (e: Exception) {
@@ -274,6 +279,7 @@ fun PhoneAuthScreen(
                 coroutineScope.launch {
                     try {
                         authUI.verifyPhoneNumber(
+                            activity = activity,
                             provider = provider,
                             phoneNumber = fullPhoneNumber,
                             forceResendingToken = forceResendingToken.value,
@@ -288,6 +294,7 @@ fun PhoneAuthScreen(
         resendTimer = resendTimerSeconds.intValue,
         onChangeNumberClick = {
             step.value = PhoneAuthStep.EnterPhoneNumber
+            //phoneNumberValue.value = ""
             verificationCodeValue.value = ""
             verificationId.value = null
             forceResendingToken.value = null

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

@@ -129,7 +129,7 @@
     <string name="fui_verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
     <string name="fui_invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
     <string name="fui_enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code we sent to</string>
-    <string name="fui_resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="fui_resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in %s</string>
     <string name="fui_verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
     <string name="fui_verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
     <string name="fui_incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>

buildSrc/src/main/kotlin/Config.kt

@@ -3,10 +3,11 @@ object Config {
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     const val kotlinVersion = "2.2.0"
+    const val kotlinSerializationVersion = "1.9.0"
 
     object SdkVersions {
-        const val compile = 35
-        const val target = 35
+        const val compile = 36
+        const val target = 36
         const val min = 23
     }
 
@@ -45,16 +46,24 @@ object Config {
             const val datastorePreferences = "androidx.datastore:datastore-preferences:1.1.1"
             const val credentials = "androidx.credentials:credentials:1.3.0"
             object Compose {
-                const val bom = "androidx.compose:compose-bom:2025.08.00"
+                const val bom = "androidx.compose:compose-bom:2025.10.00"
                 const val ui = "androidx.compose.ui:ui"
                 const val uiGraphics = "androidx.compose.ui:ui-graphics"
                 const val toolingPreview = "androidx.compose.ui:ui-tooling-preview"
                 const val tooling = "androidx.compose.ui:ui-tooling"
                 const val foundation = "androidx.compose.foundation:foundation"
                 const val material3 = "androidx.compose.material3:material3"
                 const val materialIconsExtended = "androidx.compose.material:material-icons-extended"
-                const val activityCompose = "androidx.activity:activity-compose:1.9.0"
+                const val activityCompose = "androidx.activity:activity-compose:1.11.0"
             }
+
+            object Navigation {
+                const val nav3Runtime = "androidx.navigation3:navigation3-runtime:1.0.0-alpha08"
+                const val nav3UI = "androidx.navigation3:navigation3-ui:1.0.0-alpha08"
+                const val lifecycleViewmodelNav3 = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
+            }
+
+            const val kotlinxSerialization = "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlinSerializationVersion"
         }
 
         object Firebase {

composeapp/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
+    id("org.jetbrains.kotlin.plugin.serialization") version Config.kotlinVersion
     id("com.google.gms.google-services") apply false
 }
 
@@ -52,6 +53,12 @@ dependencies {
     implementation(Config.Libs.Androidx.Compose.toolingPreview)
     implementation(Config.Libs.Androidx.Compose.material3)
 
+    // Navigation 3
+    implementation(Config.Libs.Androidx.Navigation.nav3Runtime)
+    implementation(Config.Libs.Androidx.Navigation.nav3UI)
+    implementation(Config.Libs.Androidx.Navigation.lifecycleViewmodelNav3)
+    implementation(Config.Libs.Androidx.kotlinxSerialization)
+
     testImplementation(Config.Libs.Test.junit)
     androidTestImplementation(Config.Libs.Test.junitExt)
     androidTestImplementation(platform(Config.Libs.Androidx.Compose.bom))