diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-29 17:04:17 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-18 08:54:17 +0200 |
| commit | 4bdd28f8de9850df69c541586c60cf5e114b7fb0 (patch) | |
| tree | 19b44631334897712a1bf6564f0569be348a977b /android/lib/theme/src | |
| parent | dd18767b98f4650ae130492db71e70cf8556b805 (diff) | |
| download | mullvadvpn-4bdd28f8de9850df69c541586c60cf5e114b7fb0.tar.xz mullvadvpn-4bdd28f8de9850df69c541586c60cf5e114b7fb0.zip | |
Unify button appearance
- Make almost all button depend on 3 standard buttons
- Replace surface and onSurface with our own custom theme color
- Set button standard height to material design default
- Support bigger font sizes for buttons
Diffstat (limited to 'android/lib/theme/src')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt | 12 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt | 3 |
2 files changed, 13 insertions, 2 deletions
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 f81c0b4409..e2cb7da499 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 @@ -1,5 +1,8 @@ package net.mullvad.mullvadvpn.lib.theme.color +import androidx.compose.material3.ColorScheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color internal val MullvadBlue20 = Color(0x33294D73) @@ -48,3 +51,12 @@ const val AlphaDisconnectButton = 0.6f const val AlphaScrollbar = 0.6f const val AlphaTopBar = 0.8f const val AlphaInvisible = 0f + +// Custom colors, they only link to normal material 3 colors for now +val ColorScheme.variant: Color + @Composable get() = MaterialTheme.colorScheme.surface +val ColorScheme.onVariant: Color + @Composable get() = MaterialTheme.colorScheme.onSurface + +val ColorScheme.selected: Color + @Composable get() = MaterialTheme.colorScheme.surface diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt index bb56f7df48..1307b2fae2 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt @@ -7,6 +7,7 @@ data class Dimensions( val backButtonSideMargin: Dp = 30.dp, val buttonHeight: Dp = 44.dp, val buttonSeparation: Dp = 18.dp, + val buttonVerticalPadding: Dp = 8.dp, val cellEndPadding: Dp = 16.dp, val cellFooterTopPadding: Dp = 6.dp, val cellHeight: Dp = 52.dp, @@ -16,7 +17,6 @@ data class Dimensions( val cellVerticalSpacing: Dp = 14.dp, val chevronMargin: Dp = 4.dp, val cityRowPadding: Dp = 34.dp, - val connectButtonHeight: Dp = 50.dp, val countryRowPadding: Dp = 18.dp, val customPortBoxMinWidth: Dp = 80.dp, val dialogIconHeight: Dp = 44.dp, @@ -49,7 +49,6 @@ data class Dimensions( val searchFieldHeight: Dp = 42.dp, val searchFieldHorizontalPadding: Dp = 22.dp, val searchIconSize: Dp = 24.dp, - val selectLocationButtonHeight: Dp = 50.dp, val selectLocationTitlePadding: Dp = 12.dp, val selectableCellTextMargin: Dp = 12.dp, val sideMargin: Dp = 22.dp, |