Skip to content

Commit 61352ea

Browse files
committed
style: use scaffold for auth method picker internally
1 parent 3512daf commit 61352ea

File tree

1 file changed

+37
-32
lines changed

1 file changed

+37
-32
lines changed

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

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.material3.AlertDialog
2626
import androidx.compose.material3.Button
2727
import androidx.compose.material3.CircularProgressIndicator
2828
import androidx.compose.material3.MaterialTheme
29+
import androidx.compose.material3.Scaffold
2930
import androidx.compose.material3.Surface
3031
import androidx.compose.material3.Text
3132
import androidx.compose.runtime.Composable
@@ -207,52 +208,56 @@ fun FirebaseAuthScreen(
207208
startDestination = AuthRoute.MethodPicker.route
208209
) {
209210
composable(AuthRoute.MethodPicker.route) {
210-
AuthMethodPicker(
211-
providers = configuration.providers,
212-
logo = logoAsset,
213-
termsOfServiceUrl = configuration.tosUrl,
214-
privacyPolicyUrl = configuration.privacyPolicyUrl,
215-
onProviderSelected = { provider ->
216-
when (provider) {
217-
is AuthProvider.Anonymous -> onSignInAnonymously?.invoke()
218-
219-
is AuthProvider.Email -> {
220-
navController.navigate(AuthRoute.Email.route)
221-
}
211+
Scaffold { innerPadding ->
212+
AuthMethodPicker(
213+
modifier = modifier
214+
.padding(innerPadding),
215+
providers = configuration.providers,
216+
logo = logoAsset,
217+
termsOfServiceUrl = configuration.tosUrl,
218+
privacyPolicyUrl = configuration.privacyPolicyUrl,
219+
onProviderSelected = { provider ->
220+
when (provider) {
221+
is AuthProvider.Anonymous -> onSignInAnonymously?.invoke()
222+
223+
is AuthProvider.Email -> {
224+
navController.navigate(AuthRoute.Email.route)
225+
}
222226

223-
is AuthProvider.Phone -> {
224-
navController.navigate(AuthRoute.Phone.route)
225-
}
227+
is AuthProvider.Phone -> {
228+
navController.navigate(AuthRoute.Phone.route)
229+
}
226230

227-
is AuthProvider.Google -> onSignInWithGoogle?.invoke()
231+
is AuthProvider.Google -> onSignInWithGoogle?.invoke()
228232

229-
is AuthProvider.Facebook -> onSignInWithFacebook?.invoke()
233+
is AuthProvider.Facebook -> onSignInWithFacebook?.invoke()
230234

231-
is AuthProvider.Apple -> onSignInWithApple?.invoke()
235+
is AuthProvider.Apple -> onSignInWithApple?.invoke()
232236

233-
is AuthProvider.Github -> onSignInWithGithub?.invoke()
237+
is AuthProvider.Github -> onSignInWithGithub?.invoke()
234238

235-
is AuthProvider.Microsoft -> onSignInWithMicrosoft?.invoke()
239+
is AuthProvider.Microsoft -> onSignInWithMicrosoft?.invoke()
236240

237-
is AuthProvider.Yahoo -> onSignInWithYahoo?.invoke()
241+
is AuthProvider.Yahoo -> onSignInWithYahoo?.invoke()
238242

239-
is AuthProvider.Twitter -> onSignInWithTwitter?.invoke()
243+
is AuthProvider.Twitter -> onSignInWithTwitter?.invoke()
240244

241-
is AuthProvider.GenericOAuth -> genericOAuthHandlers[provider]?.invoke()
245+
is AuthProvider.GenericOAuth -> genericOAuthHandlers[provider]?.invoke()
242246

243-
else -> {
244-
onSignInFailure(
245-
AuthException.UnknownException(
246-
message = "Provider ${provider.providerId} is not supported in FirebaseAuthScreen",
247-
cause = IllegalArgumentException(
248-
"Provider ${provider.providerId} is not supported in FirebaseAuthScreen"
247+
else -> {
248+
onSignInFailure(
249+
AuthException.UnknownException(
250+
message = "Provider ${provider.providerId} is not supported in FirebaseAuthScreen",
251+
cause = IllegalArgumentException(
252+
"Provider ${provider.providerId} is not supported in FirebaseAuthScreen"
253+
)
249254
)
250255
)
251-
)
256+
}
252257
}
253258
}
254-
}
255-
)
259+
)
260+
}
256261
}
257262

258263
composable(AuthRoute.Email.route) {

0 commit comments

Comments
 (0)