diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt index a40a773cd..03e273231 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt @@ -23,10 +23,11 @@ fun LoadingButtonWithIcon( borderColor: Color = Color.LightGray, backgroundColor: Color = MaterialTheme.colorScheme.surface, progressIndicatorColor: Color = MaterialTheme.colorScheme.primary, + modifier: Modifier = Modifier, onClick: () -> Unit ) { Surface( - modifier = Modifier.clickable( + modifier = modifier.clickable( enabled = !isLoading, onClick = onClick ), diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt index ab81ae451..fd5b0683d 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt @@ -76,6 +76,7 @@ fun WelcomeScreenContent(viewModel: LoginViewModel, navController: NavHostContro text = "Continue with Apple", loadingText = "Signing in...", icon = painterResource(id = R.drawable.ic_logo_apple), + modifier = Modifier.padding(vertical = 6.dp), onClick = {} )