Skip to content

Commit 1c1efb2

Browse files
committed
Merge branch 'version-10.0.0-dev' of https://github.com/firebase/FirebaseUI-Android into feat/P8
2 parents 473610f + 5de660b commit 1c1efb2

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
5252
import com.firebase.ui.auth.compose.configuration.auth_provider.rememberAnonymousSignInHandler
5353
import com.firebase.ui.auth.compose.configuration.auth_provider.rememberSignInWithFacebookLauncher
5454
import com.firebase.ui.auth.compose.configuration.auth_provider.signInWithEmailLink
55+
import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
5556
import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider
5657
import com.firebase.ui.auth.compose.ui.components.ErrorRecoveryDialog
5758
import com.firebase.ui.auth.compose.ui.method_picker.AuthMethodPicker
@@ -444,7 +445,7 @@ private sealed class AuthRoute(val route: String) {
444445

445446
data class AuthSuccessUiContext(
446447
val authUI: FirebaseAuthUI,
447-
val stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider,
448+
val stringProvider: AuthUIStringProvider,
448449
val onSignOut: () -> Unit,
449450
val onManageMfa: () -> Unit,
450451
val onReloadUser: () -> Unit
@@ -453,7 +454,7 @@ data class AuthSuccessUiContext(
453454
@Composable
454455
private fun SuccessDestination(
455456
authState: AuthState,
456-
stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider,
457+
stringProvider: AuthUIStringProvider,
457458
uiContext: AuthSuccessUiContext
458459
) {
459460
when (authState) {
@@ -497,7 +498,7 @@ private fun SuccessDestination(
497498
@Composable
498499
private fun AuthSuccessContent(
499500
authUI: FirebaseAuthUI,
500-
stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider,
501+
stringProvider: AuthUIStringProvider,
501502
onSignOut: () -> Unit,
502503
onManageMfa: () -> Unit
503504
) {
@@ -530,7 +531,7 @@ private fun AuthSuccessContent(
530531
@Composable
531532
private fun EmailVerificationContent(
532533
authUI: FirebaseAuthUI,
533-
stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider,
534+
stringProvider: AuthUIStringProvider,
534535
onCheckStatus: () -> Unit,
535536
onSignOut: () -> Unit
536537
) {
@@ -564,7 +565,7 @@ private fun EmailVerificationContent(
564565
@Composable
565566
private fun ProfileCompletionContent(
566567
missingFields: List<String>,
567-
stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
568+
stringProvider: AuthUIStringProvider
568569
) {
569570
Column(
570571
modifier = Modifier.fillMaxSize(),

composeapp/src/main/java/com/firebase/composeapp/MainActivity.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import com.google.firebase.auth.actionCodeSettings
3636

3737
class MainActivity : ComponentActivity() {
3838
companion object {
39-
private const val USE_AUTH_EMULATOR = false
39+
private const val USE_AUTH_EMULATOR = true
4040
private const val AUTH_EMULATOR_HOST = "10.0.2.2"
4141
private const val AUTH_EMULATOR_PORT = 9099
4242
}
@@ -103,6 +103,7 @@ class MainActivity : ComponentActivity() {
103103
privacyPolicyUrl = "https://policies.google.com/privacy?hl=en-NG&fg=1"
104104
}
105105

106+
setContent {
106107
AuthUITheme {
107108
Surface(
108109
modifier = Modifier.fillMaxSize(),
@@ -242,5 +243,15 @@ private fun AppAuthenticatedContent(
242243
CircularProgressIndicator()
243244
}
244245
}
246+
247+
else -> {
248+
Column(
249+
modifier = Modifier.fillMaxSize(),
250+
horizontalAlignment = Alignment.CenterHorizontally,
251+
verticalArrangement = Arrangement.Center
252+
) {
253+
CircularProgressIndicator()
254+
}
255+
}
245256
}
246257
}

0 commit comments

Comments
 (0)