Merge branch 'version-10.0.0-dev' of https://github.com/firebase/FirebaseUI-Android into version-10.0.0-dev

demolaf · demolaf · commit 1b9e219e96a8 · 2025-11-03T14:14:56.000+01:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/configuration/theme/ProviderStyleDefaults.kt b/auth/src/main/java/com/firebase/ui/auth/compose/configuration/theme/ProviderStyleDefaults.kt
@@ -43,7 +43,7 @@ internal object ProviderStyleDefaults {
                 Provider.FACEBOOK -> {
                     provider.id to AuthUITheme.ProviderStyle(
                         icon = AuthUIAsset.Resource(R.drawable.fui_ic_facebook_white_22dp),
-                        backgroundColor = Color(0xFF3B5998),
+                        backgroundColor = Color(0xFF1877F2),
                         contentColor = Color.White
                     )
                 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -106,12 +107,16 @@ fun AuthProviderButton(
                 val iconTint = providerStyle.iconTint
                 if (iconTint != null) {
                     Icon(
+                        modifier = Modifier
+                            .size(24.dp),
                         painter = providerIcon.painter,
                         contentDescription = providerLabel,
                         tint = iconTint
                     )
                 } else {
                     Image(
+                        modifier = Modifier
+                            .size(24.dp),
                         painter = providerIcon.painter,
                         contentDescription = providerLabel
                     )
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/TopLevelDialogController.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/TopLevelDialogController.kt
@@ -21,6 +21,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import com.firebase.ui.auth.compose.AuthException
+import com.firebase.ui.auth.compose.AuthState
 import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
 
 /**
@@ -66,12 +67,15 @@ val LocalTopLevelDialogController = compositionLocalOf<TopLevelDialogController?
  * @since 10.0.0
  */
 class TopLevelDialogController(
-    private val stringProvider: AuthUIStringProvider
+    private val stringProvider: AuthUIStringProvider,
+    private val authState: AuthState
 ) {
     private var dialogState by mutableStateOf<DialogState?>(null)
+    private val shownErrorStates = mutableSetOf<AuthState.Error>()
 
     /**
      * Shows an error recovery dialog at the top level using [ErrorRecoveryDialog].
+     * Automatically prevents duplicate dialogs for the same AuthState.Error instance.
      *
      * @param exception The auth exception to display
      * @param onRetry Callback when user clicks retry button
@@ -84,6 +88,17 @@ class TopLevelDialogController(
         onRecover: (AuthException) -> Unit = {},
         onDismiss: () -> Unit = {}
     ) {
+        // Get current error state
+        val currentErrorState = authState as? AuthState.Error
+
+        // If this exact error state has already been shown, skip
+        if (currentErrorState != null && currentErrorState in shownErrorStates) {
+            return
+        }
+
+        // Mark this error state as shown
+        currentErrorState?.let { shownErrorStates.add(it) }
+
         dialogState = DialogState.ErrorDialog(
             exception = exception,
             onRetry = onRetry,
@@ -148,9 +163,10 @@ class TopLevelDialogController(
  */
 @Composable
 fun rememberTopLevelDialogController(
-    stringProvider: AuthUIStringProvider
+    stringProvider: AuthUIStringProvider,
+    authState: AuthState
 ): TopLevelDialogController {
-    return remember(stringProvider) {
-        TopLevelDialogController(stringProvider)
+    return remember(stringProvider, authState) {
+        TopLevelDialogController(stringProvider, authState)
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/FirebaseAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/FirebaseAuthScreen.kt
@@ -97,9 +97,9 @@ fun FirebaseAuthScreen(
     val coroutineScope = rememberCoroutineScope()
     val stringProvider = DefaultAuthUIStringProvider(context)
     val navController = rememberNavController()
-    val dialogController = rememberTopLevelDialogController(stringProvider)
 
     val authState by authUI.authStateFlow().collectAsState(AuthState.Idle)
+    val dialogController = rememberTopLevelDialogController(stringProvider, authState)
     val lastSuccessfulUserId = remember { mutableStateOf<String?>(null) }
     val pendingLinkingCredential = remember { mutableStateOf<AuthCredential?>(null) }
     val pendingResolver = remember { mutableStateOf<MultiFactorResolver?>(null) }
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/SignUpUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/SignUpUI.kt
@@ -116,18 +116,6 @@ fun SignUpUI(
                 .padding(horizontal = 16.dp)
                 .verticalScroll(rememberScrollState()),
         ) {
-            AuthTextField(
-                value = email,
-                validator = emailValidator,
-                enabled = !isLoading,
-                label = {
-                    Text(stringProvider.emailHint)
-                },
-                onValueChange = { text ->
-                    onEmailChange(text)
-                }
-            )
-            Spacer(modifier = Modifier.height(16.dp))
             if (provider.isDisplayNameRequired) {
                 AuthTextField(
                     value = displayName,
@@ -142,6 +130,18 @@ fun SignUpUI(
                 )
                 Spacer(modifier = Modifier.height(16.dp))
             }
+            AuthTextField(
+                value = email,
+                validator = emailValidator,
+                enabled = !isLoading,
+                label = {
+                    Text(stringProvider.emailHint)
+                },
+                onValueChange = { text ->
+                    onEmailChange(text)
+                }
+            )
+            Spacer(modifier = Modifier.height(16.dp))
             AuthTextField(
                 value = password,
                 validator = passwordValidator,
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/phone/EnterPhoneNumberUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/phone/EnterPhoneNumberUI.kt
@@ -27,12 +27,14 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.CheckBox
 import androidx.compose.material.icons.filled.CheckBoxOutlineBlank
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -70,6 +72,7 @@ fun EnterPhoneNumberUI(
     onCountrySelected: (CountryData) -> Unit,
     onSendCodeClick: () -> Unit,
     title: String? = null,
+    onNavigateBack: (() -> Unit)? = null,
 ) {
     val context = LocalContext.current
     val provider = configuration.providers.filterIsInstance<AuthProvider.Phone>().first()
@@ -91,6 +94,16 @@ fun EnterPhoneNumberUI(
                 title = {
                     Text(title ?: stringProvider.signInWithPhone)
                 },
+                navigationIcon = {
+                    if (onNavigateBack != null) {
+                        IconButton(onClick = onNavigateBack) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                contentDescription = stringProvider.backAction
+                            )
+                        }
+                    }
+                },
                 colors = AuthUITheme.topAppBarColors
             )
         },
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/phone/PhoneAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/phone/PhoneAuthScreen.kt
@@ -308,15 +308,17 @@ fun PhoneAuthScreen(
     } else {
         DefaultPhoneAuthContent(
             configuration = configuration,
-            state = state
+            state = state,
+            onCancel = onCancel
         )
     }
 }
 
 @Composable
 private fun DefaultPhoneAuthContent(
     configuration: AuthUIConfiguration,
-    state: PhoneAuthContentState
+    state: PhoneAuthContentState,
+    onCancel: () -> Unit,
 ) {
     when (state.step) {
         PhoneAuthStep.EnterPhoneNumber -> {
@@ -327,7 +329,8 @@ private fun DefaultPhoneAuthContent(
                 selectedCountry = state.selectedCountry,
                 onPhoneNumberChange = state.onPhoneNumberChange,
                 onCountrySelected = state.onCountrySelected,
-                onSendCodeClick = state.onSendCodeClick
+                onSendCodeClick = state.onSendCodeClick,
+                onNavigateBack = onCancel
             )
         }
 
diff --git a/auth/src/main/res/drawable/fui_ic_facebook_white_22dp.xml b/auth/src/main/res/drawable/fui_ic_facebook_white_22dp.xml
@@ -1,13 +1,9 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportHeight="266.895"
-    android:viewportWidth="266.893">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M248.08,262.31c7.85,0 14.22,-6.37 14.22,-14.23V18.81c0,-7.86 -6.37,-14.22 -14.22,-14.22H18.81c-7.86,0 -14.22,6.37 -14.22,14.22v229.27c0,7.86 6.37,14.23 14.22,14.23H248.08z" />
-    <path
-        android:fillColor="#3C5A99"
-        android:pathData="M182.41,262.31v-99.8h33.5l5.02,-38.9h-38.51V98.78c0,-11.26 3.13,-18.93 19.27,-18.93l20.6,-0.01V45.04c-3.56,-0.47 -15.79,-1.53 -30.01,-1.53c-29.69,0 -50.03,18.13 -50.03,51.41v28.68h-33.58v38.9h33.58v99.8H182.41z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="314dp"
+    android:height="313dp"
+    android:viewportWidth="314"
+    android:viewportHeight="313">
+  <path
+      android:pathData="M314,157.07C314,70.33 243.71,0 157,0C70.29,0 0,70.33 0,157.07C0,230.74 50.69,292.55 119.07,309.52V205.08H86.7V157.07H119.07V136.39C119.07,82.93 143.26,58.15 195.72,58.15C205.67,58.15 222.83,60.1 229.85,62.05V105.56C226.15,105.17 219.71,104.98 211.72,104.98C185.98,104.98 176.03,114.73 176.03,140.1V157.07H227.31L218.5,205.08H176.03V313C253.76,303.61 314,237.38 314,157.07Z"
+      android:fillColor="#ffffff"/>
 </vector>
diff --git a/composeapp/build.gradle.kts b/composeapp/build.gradle.kts
@@ -19,23 +19,18 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    signingConfigs {
-        getByName("debug") {
-            storeFile = file("${System.getProperty("user.home")}/.android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
-        }
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            signingConfig = signingConfigs.getByName("debug")
+            // Only sign with debug keystore if it exists (for local testing)
+            val debugKeystoreFile = file("${System.getProperty("user.home")}/.android/debug.keystore")
+            if (debugKeystoreFile.exists()) {
+                signingConfig = signingConfigs.getByName("debug")
+            }
         }
     }
     compileOptions {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ internal object ProviderStyleDefaults {`
`43`	`43`	`Provider.FACEBOOK -> {`
`44`	`44`	`provider.id to AuthUITheme.ProviderStyle(`
`45`	`45`	`icon = AuthUIAsset.Resource(R.drawable.fui_ic_facebook_white_22dp),`
`46`		`- backgroundColor = Color(0xFF3B5998),`
	`46`	`+ backgroundColor = Color(0xFF1877F2),`
`47`	`47`	`contentColor = Color.White`
`48`	`48`	`)`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,15 +308,17 @@ fun PhoneAuthScreen(`
`308`	`308`	`} else {`
`309`	`309`	`DefaultPhoneAuthContent(`
`310`	`310`	`configuration = configuration,`
`311`		`- state = state`
	`311`	`+ state = state,`
	`312`	`+ onCancel = onCancel`
`312`	`313`	`)`
`313`	`314`	`}`
`314`	`315`	`}`
`315`	`316`
`316`	`317`	`@Composable`
`317`	`318`	`private fun DefaultPhoneAuthContent(`
`318`	`319`	`configuration: AuthUIConfiguration,`
`319`		`- state: PhoneAuthContentState`
	`320`	`+ state: PhoneAuthContentState,`
	`321`	`+ onCancel: () -> Unit,`
`320`	`322`	`) {`
`321`	`323`	`when (state.step) {`
`322`	`324`	`PhoneAuthStep.EnterPhoneNumber -> {`
`@@ -327,7 +329,8 @@ private fun DefaultPhoneAuthContent(`
`327`	`329`	`selectedCountry = state.selectedCountry,`
`328`	`330`	`onPhoneNumberChange = state.onPhoneNumberChange,`
`329`	`331`	`onCountrySelected = state.onCountrySelected,`
`330`		`- onSendCodeClick = state.onSendCodeClick`
	`332`	`+ onSendCodeClick = state.onSendCodeClick,`
	`333`	`+ onNavigateBack = onCancel`
`331`	`334`	`)`
`332`	`335`	`}`
`333`	`336`