diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-31 13:58:54 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-31 15:29:54 +0100 |
| commit | 1cdda00a033f13b83f6db227835a5ac0b40602ec (patch) | |
| tree | 592727a7b135f4bddb32f9b5fae01c29871dae1b /android/lib/theme/src | |
| parent | d64b92c30aeca95752bb5f35249c8e227b49da44 (diff) | |
| download | mullvadvpn-1cdda00a033f13b83f6db227835a5ac0b40602ec.tar.xz mullvadvpn-1cdda00a033f13b83f6db227835a5ac0b40602ec.zip | |
Replace secondary container color with new solid color
Diffstat (limited to 'android/lib/theme/src')
3 files changed, 4 insertions, 9 deletions
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt index 33a6081099..8342591343 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt @@ -15,7 +15,6 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp -import net.mullvad.mullvadvpn.lib.theme.color.MullvadBlue20 import net.mullvad.mullvadvpn.lib.theme.color.MullvadDarkBlue import net.mullvad.mullvadvpn.lib.theme.color.MullvadGreen import net.mullvad.mullvadvpn.lib.theme.color.MullvadRed @@ -27,6 +26,7 @@ import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onError import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onPrimary import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onSurfaceVariant import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_primary +import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_secondaryContainer import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceVariant import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions import net.mullvad.mullvadvpn.lib.theme.dimensions.defaultDimensions @@ -60,8 +60,7 @@ private val darkColorScheme = // onPrimaryContainer = md_theme_dark_onPrimaryContainer, secondary = MullvadDarkBlue, onSecondary = MullvadWhite60, - secondaryContainer = MullvadBlue20, - // onSecondaryContainer = md_theme_dark_onSecondaryContainer, + secondaryContainer = md_theme_dark_secondaryContainer, tertiary = MullvadRed, // onTertiary = md_theme_dark_onTertiary, // tertiaryContainer = md_theme_dark_tertiaryContainer, diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt index 75d8517e23..0369ca8700 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt @@ -5,7 +5,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -internal val MullvadBlue20 = Color(0x33294D73) internal val MullvadYellow = Color(0xFFFFD524) @Deprecated( @@ -35,10 +34,6 @@ val MullvadWhite10 = Color(0x1AFFFFFF) @Deprecated( "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." ) -val MullvadWhite20 = Color(0x33FFFFFF) -@Deprecated( - "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." -) val MullvadWhite60 = Color(0x99FFFFFF) const val AlphaVisible = 1f diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt index 31dd7a6c6f..f0145653e5 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt @@ -38,7 +38,8 @@ internal val md_theme_dark_primaryContainer = Color(0xFF1C344E) // Sub-container internal val md_theme_dark_onPrimaryContainer = Color(0xFFFFFFFF) // MullvadWhite internal val md_theme_dark_secondary = Color(0xFF44AD4D) // MullvadGreen internal val md_theme_dark_onSecondary = Color(0xFFFFFFFF) // MullvadWhite -internal val md_theme_dark_secondaryContainer = Color(0xFF47AC4C) // Text in connection fragment +internal val md_theme_dark_secondaryContainer = + Color(0xFF1c344e) // MullvadBlue Alpha 20 composite over MullvadDarkBlue internal val md_theme_dark_onSecondaryContainer = Color(0xFFD9EEDB) // Text in titlebar internal val md_theme_dark_tertiary = Color(0xFF99454F) // Disconnect button internal val md_theme_dark_onTertiary = Color(0xFFFFFFFF) // MullvadWhite/Text on disconnect button |