diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-04-22 12:56:28 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-04-22 12:56:28 +0200 |
| commit | 47a32b6f2fc304396dcf047e4732145786e75bda (patch) | |
| tree | 0d617ba220171a1b97dc58f3a4f46824be042f46 | |
| parent | eced1187524fb2d56341fa17749002cf9ed0df1c (diff) | |
| parent | a15d3738fb7e82f7466f560da9dc3265c8b91ac9 (diff) | |
| download | mullvadvpn-47a32b6f2fc304396dcf047e4732145786e75bda.tar.xz mullvadvpn-47a32b6f2fc304396dcf047e4732145786e75bda.zip | |
Merge branch 'top-bar-color-on-welcome-screen-droid-837'
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt index aef6602ab6..8dcbea0350 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt @@ -176,19 +176,8 @@ fun WelcomeScreen( val snackbarHostState = remember { SnackbarHostState() } ScaffoldWithTopBar( - topBarColor = - if (state.tunnelState.isSecured()) { - MaterialTheme.colorScheme.inversePrimary - } else { - MaterialTheme.colorScheme.error - }, - iconTintColor = - if (state.tunnelState.isSecured()) { - MaterialTheme.colorScheme.onPrimary - } else { - MaterialTheme.colorScheme.onError - } - .copy(alpha = AlphaTopBar), + topBarColor = MaterialTheme.colorScheme.primary, + iconTintColor = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaTopBar), onSettingsClicked = onSettingsClick, onAccountClicked = onAccountClick, snackbarHostState = snackbarHostState, |