diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index 86c1239ca..cb1022569 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -128,6 +128,7 @@ dependencies { implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha16' implementation 'com.google.android.gms:play-services-auth:20.2.0' + implementation "com.google.accompanist:accompanist-systemuicontroller:0.25.1" } apollo { 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 a072d9669..38eb6fc9f 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 @@ -8,13 +8,12 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.text.ClickableText -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text +import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString import androidx.navigation.NavHostController @@ -23,17 +22,26 @@ import com.google.android.gms.common.GoogleApiAvailability @Composable fun WelcomeScreen(viewModel: LoginViewModel, navController: NavHostController) { +// val systemUiController = rememberSystemUiController() +// systemUiController.isSystemBarsVisible = false + + Surface(modifier = Modifier.fillMaxSize(), color = Color(0xFFFBEAA8 )) { + WelcomeScreenContent(viewModel = viewModel, navController = navController) + } +} + +@Composable +fun WelcomeScreenContent(viewModel: LoginViewModel, navController: NavHostController) { val isGoogleAuthAvailable: Boolean = GoogleApiAvailability .getInstance() .isGooglePlayServicesAvailable(LocalContext.current) == 0 - Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) { Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier - .background(MaterialTheme.colorScheme.background) + .background(Color(0xFFFBEAA8 )) .fillMaxSize() .navigationBarsPadding() ) { @@ -46,7 +54,7 @@ fun WelcomeScreen(viewModel: LoginViewModel, navController: NavHostController) { ContinueWithEmailButton(navController) } - } + } @Composable diff --git a/apple/OmnivoreKit/Sources/Views/Colors/Colors.xcassets/_background.colorset/Contents.json b/apple/OmnivoreKit/Sources/Views/Colors/Colors.xcassets/_background.colorset/Contents.json index eddecb30f..24677965e 100644 --- a/apple/OmnivoreKit/Sources/Views/Colors/Colors.xcassets/_background.colorset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Colors/Colors.xcassets/_background.colorset/Contents.json @@ -6,7 +6,7 @@ "components" : { "alpha" : "1.000", "blue" : "0xA8", - "green" : "0xEB", + "green" : "0xEA", "red" : "0xFB" } },