Merge pull request #1582 from omnivore-app/fix/android-login-form-colors

Login/Welcome Screen Theme Fix - Android
This commit is contained in:
Satindar Dhillon 2022-12-29 09:17:58 -08:00 committed by GitHub
commit 1da8125dd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -10,7 +10,6 @@ import androidx.compose.foundation.text.ClickableText
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@ -23,13 +22,16 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.dp
import app.omnivore.omnivore.R
import app.omnivore.omnivore.ui.theme.OmnivoreTheme
import com.google.android.gms.common.GoogleApiAvailability
import kotlinx.coroutines.launch
@Composable
fun WelcomeScreen(viewModel: LoginViewModel) {
Surface(modifier = Modifier.fillMaxSize(), color = Color(0xFFFCEBA8)) {
WelcomeScreenContent(viewModel = viewModel)
OmnivoreTheme(darkTheme = false) {
Surface(modifier = Modifier.fillMaxSize(), color = Color(0xFFFCEBA8)) {
WelcomeScreenContent(viewModel = viewModel)
}
}
}