diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-08-24 17:15:01 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-08-24 17:15:01 +0200 |
| commit | 6aa85f643c08cd8409b2136fcc4673941c130730 (patch) | |
| tree | 329c2e664dc222c4ba69b815fbed8415e9a20a69 /android/lib | |
| parent | 3966954c5fbe487abd0863832afbeeaff54f19c0 (diff) | |
| parent | c1fa38ad2d36783c620de95fc2da08e2566ebf2b (diff) | |
| download | mullvadvpn-6aa85f643c08cd8409b2136fcc4673941c130730.tar.xz mullvadvpn-6aa85f643c08cd8409b2136fcc4673941c130730.zip | |
Merge branch 'migrate-welcome-view-to-compose-droid-54'
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt | 1 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt | 1 |
2 files changed, 2 insertions, 0 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 391189c406..639b183e86 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 @@ -61,4 +61,5 @@ const val Alpha20 = 0.2f const val AlphaInactive = 0.4f const val AlphaDescription = 0.6f const val AlphaDisconnectButton = 0.6f +const val AlphaTopBar = 0.8f const val AlphaInvisible = 0f 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 fa922eac9e..9013fb6a28 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 @@ -44,6 +44,7 @@ data class Dimensions( val sideMargin: Dp = 22.dp, val smallPadding: Dp = 8.dp, val titleIconSize: Dp = 24.dp, + val topBarHeight: Dp = 64.dp, val verticalSpace: Dp = 20.dp, val verticalSpacer: Dp = 1.dp ) |