feat: add back navigation support to authentication screens

demolaf · demolaf · commit 94fa030c6879 · 2025-12-12T17:21:51.000+01:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt
@@ -385,7 +385,8 @@ private fun DefaultEmailAuthContent(
                 onPasswordChange = state.onPasswordChange,
                 onConfirmPasswordChange = state.onConfirmPasswordChange,
                 onSignUpClick = state.onSignUpClick,
-                onGoToSignIn = state.onGoToSignIn
+                onGoToSignIn = state.onGoToSignIn,
+                onNavigateBack = onCancel
             )
         }
 
@@ -397,7 +398,8 @@ private fun DefaultEmailAuthContent(
                 resetLinkSent = state.resetLinkSent,
                 onEmailChange = state.onEmailChange,
                 onSendResetLink = state.onSendResetLinkClick,
-                onGoToSignIn = state.onGoToSignIn
+                onGoToSignIn = state.onGoToSignIn,
+                onNavigateBack = onCancel
             )
         }
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/ResetPasswordUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/ResetPasswordUI.kt
@@ -24,10 +24,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.AlertDialog
 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
@@ -63,6 +67,7 @@ fun ResetPasswordUI(
     onEmailChange: (String) -> Unit,
     onSendResetLink: () -> Unit,
     onGoToSignIn: () -> Unit,
+    onNavigateBack: (() -> Unit)? = null,
 ) {
 
     val context = LocalContext.current
@@ -115,6 +120,16 @@ fun ResetPasswordUI(
                 title = {
                     Text(stringProvider.recoverPasswordPageTitle)
                 },
+                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/ui/screens/email/SignUpUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignUpUI.kt
@@ -24,9 +24,13 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 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.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -65,6 +69,7 @@ fun SignUpUI(
     onConfirmPasswordChange: (String) -> Unit,
     onGoToSignIn: () -> Unit,
     onSignUpClick: () -> Unit,
+    onNavigateBack: (() -> Unit)? = null,
 ) {
     val provider = configuration.providers.filterIsInstance<AuthProvider.Email>().first()
     val context = LocalContext.current
@@ -105,6 +110,16 @@ fun SignUpUI(
                 title = {
                     Text(stringProvider.signupPageTitle)
                 },
+                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/ui/screens/phone/EnterVerificationCodeUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterVerificationCodeUI.kt
@@ -24,9 +24,13 @@ import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 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
@@ -66,6 +70,7 @@ fun EnterVerificationCodeUI(
     onResendCodeClick: () -> Unit,
     onChangeNumberClick: () -> Unit,
     title: String? = null,
+    onNavigateBack: (() -> Unit)? = null,
 ) {
     val context = LocalContext.current
     val stringProvider = LocalAuthUIStringProvider.current
@@ -88,6 +93,16 @@ fun EnterVerificationCodeUI(
                 title = {
                     Text(title ?: stringProvider.verifyPhoneNumber)
                 },
+                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/ui/screens/phone/PhoneAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt
@@ -344,7 +344,8 @@ private fun DefaultPhoneAuthContent(
                 onVerificationCodeChange = state.onVerificationCodeChange,
                 onVerifyCodeClick = state.onVerifyCodeClick,
                 onResendCodeClick = state.onResendCodeClick,
-                onChangeNumberClick = state.onChangeNumberClick
+                onChangeNumberClick = state.onChangeNumberClick,
+                onNavigateBack = onCancel
             )
         }
     }
diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/ui/AccessibilityTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/AccessibilityTest.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.test.core.app.ApplicationProvider
+import com.firebase.ui.auth.FirebaseAuthUI
 import com.firebase.ui.auth.configuration.authUIConfiguration
 import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
 import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider
@@ -28,6 +29,7 @@ import com.firebase.ui.auth.ui.components.AuthTextField
 import com.firebase.ui.auth.ui.components.CountrySelector
 import com.firebase.ui.auth.ui.components.QrCodeImage
 import com.firebase.ui.auth.ui.components.VerificationCodeInputField
+import com.firebase.ui.auth.ui.screens.email.EmailAuthScreen
 import com.firebase.ui.auth.ui.screens.email.SignInUI
 import com.firebase.ui.auth.ui.screens.phone.EnterPhoneNumberUI
 import com.firebase.ui.auth.util.CountryUtils

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,8 @@ private fun DefaultEmailAuthContent(`
`385`	`385`	`onPasswordChange = state.onPasswordChange,`
`386`	`386`	`onConfirmPasswordChange = state.onConfirmPasswordChange,`
`387`	`387`	`onSignUpClick = state.onSignUpClick,`
`388`		`- onGoToSignIn = state.onGoToSignIn`
	`388`	`+ onGoToSignIn = state.onGoToSignIn,`
	`389`	`+ onNavigateBack = onCancel`
`389`	`390`	`)`
`390`	`391`	`}`
`391`	`392`
`@@ -397,7 +398,8 @@ private fun DefaultEmailAuthContent(`
`397`	`398`	`resetLinkSent = state.resetLinkSent,`
`398`	`399`	`onEmailChange = state.onEmailChange,`
`399`	`400`	`onSendResetLink = state.onSendResetLinkClick,`
`400`		`- onGoToSignIn = state.onGoToSignIn`
	`401`	`+ onGoToSignIn = state.onGoToSignIn,`
	`402`	`+ onNavigateBack = onCancel`
`401`	`403`	`)`
`402`	`404`	`}`
`403`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@ private fun DefaultPhoneAuthContent(`
`344`	`344`	`onVerificationCodeChange = state.onVerificationCodeChange,`
`345`	`345`	`onVerifyCodeClick = state.onVerifyCodeClick,`
`346`	`346`	`onResendCodeClick = state.onResendCodeClick,`
`347`		`- onChangeNumberClick = state.onChangeNumberClick`
	`347`	`+ onChangeNumberClick = state.onChangeNumberClick,`
	`348`	`+ onNavigateBack = onCancel`
`348`	`349`	`)`
`349`	`350`	`}`
`350`	`351`	`}`