diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-06 10:52:30 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-06 10:52:30 +0200 |
| commit | cfc1aa9b12de7accc86e7e65606058d11ab76102 (patch) | |
| tree | 3660af744574f9dfc59c0f5098ed9132a5be4bbc /android/lib | |
| parent | 0447c6013428e386fbbfe619318dfd605246bd43 (diff) | |
| parent | ed325f028e55232f6aa86c7a2bc1d271f5ba0e93 (diff) | |
| download | mullvadvpn-cfc1aa9b12de7accc86e7e65606058d11ab76102.tar.xz mullvadvpn-cfc1aa9b12de7accc86e7e65606058d11ab76102.zip | |
Merge branch 'migrate-notificationbanner-to-compose-droid-187'
Diffstat (limited to 'android/lib')
3 files changed, 5 insertions, 4 deletions
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt index 639b183e86..e55bdc605a 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt @@ -33,10 +33,6 @@ val MullvadRed = Color(0xFFE34039) @Deprecated( "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." ) -val MullvadHelmetYellow = Color(0xFFFFD524) -@Deprecated( - "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." -) val MullvadWhite = Color(0xFFFFFFFF) @Deprecated( "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." 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 cad213e548..132f2f9dc3 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 @@ -72,6 +72,7 @@ private val MullvadColorPalette = onSurface = MullvadWhite, inversePrimary = MullvadGreen, error = MullvadRed, + errorContainer = MullvadYellow, outlineVariant = Color.Transparent, // Used by divider inverseSurface = MullvadWhite ) 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 9013fb6a28..aeee6593da 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 @@ -31,6 +31,10 @@ data class Dimensions( val loadingSpinnerSizeMedium: Dp = 28.dp, val loadingSpinnerStrokeWidth: Dp = 3.dp, val mediumPadding: Dp = 16.dp, + val notificationBannerStartPadding: Dp = 16.dp, + val notificationBannerEndPadding: Dp = 12.dp, + val notificationEndIconPadding: Dp = 4.dp, + val notificationStatusIconSize: Dp = 10.dp, val progressIndicatorSize: Dp = 60.dp, val relayCircleSize: Dp = 16.dp, val relayRowPadding: Dp = 50.dp, |