diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
index cd27ceb50..853787007 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
@@ -39,7 +39,7 @@ fun GoogleAuthButton(viewModel: LoginViewModel) {
}
}
- GoogleSignInButton(
+ LoadingButtonWithIcon(
text = "Continue with Google",
loadingText = "Signing in...",
isLoading = viewModel.isLoading,
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleSignInButton.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt
similarity index 86%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleSignInButton.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt
index 0a55344eb..a40a773cd 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleSignInButton.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoadingButtonWithIcon.kt
@@ -3,8 +3,7 @@ package app.omnivore.omnivore.ui.auth
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.Surface
+import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -14,17 +13,16 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.unit.dp
-@ExperimentalMaterialApi
@Composable
-fun GoogleSignInButton(
+fun LoadingButtonWithIcon(
text: String,
- loadingText: String = "Signing in...",
+ loadingText: String,
icon: Painter,
isLoading: Boolean = false,
shape: Shape = Shapes().medium,
borderColor: Color = Color.LightGray,
- backgroundColor: Color = MaterialTheme.colors.surface,
- progressIndicatorColor: Color = MaterialTheme.colors.primary,
+ backgroundColor: Color = MaterialTheme.colorScheme.surface,
+ progressIndicatorColor: Color = MaterialTheme.colorScheme.primary,
onClick: () -> Unit
) {
Surface(
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 59ecfcf02..ab81ae451 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
@@ -12,7 +12,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusEvent
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
@@ -73,9 +72,12 @@ fun WelcomeScreenContent(viewModel: LoginViewModel, navController: NavHostContro
GoogleAuthButton(viewModel)
}
- AppleSignInButton(painterResource(id = R.drawable.ic_logo_google)) {
- // Fill in later...
- }
+ LoadingButtonWithIcon(
+ text = "Continue with Apple",
+ loadingText = "Signing in...",
+ icon = painterResource(id = R.drawable.ic_logo_apple),
+ onClick = {}
+ )
ContinueWithEmailButton(navController)
}
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_logo_apple.xml b/android/Omnivore/app/src/main/res/drawable/ic_logo_apple.xml
new file mode 100644
index 000000000..84a25baf6
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_logo_apple.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_omnivore_name_logo.xml b/android/Omnivore/app/src/main/res/drawable/ic_omnivore_name_logo.xml
new file mode 100644
index 000000000..3129b743c
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_omnivore_name_logo.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+