diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-27 09:06:50 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-27 09:06:50 +0200 |
| commit | 0377ffd3fb9e0710559b6bddc8de2f180e890504 (patch) | |
| tree | f96e38bcdf11d73a31a78908f72ad2780cf4503c /android/lib | |
| parent | 24acf70d47b15e3d4ece53b8f0cd8c3dffcf52fd (diff) | |
| parent | 1ede00280c0042c6402778d5bb7c1f01ba5823b2 (diff) | |
| download | mullvadvpn-0377ffd3fb9e0710559b6bddc8de2f180e890504.tar.xz mullvadvpn-0377ffd3fb9e0710559b6bddc8de2f180e890504.zip | |
Merge branch 'migrate-the-login-view-to-compose-droid-53'
Diffstat (limited to 'android/lib')
3 files changed, 13 insertions, 27 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountToken.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountToken.kt new file mode 100644 index 0000000000..2aeca352d0 --- /dev/null +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountToken.kt @@ -0,0 +1,3 @@ +package net.mullvad.mullvadvpn.model + +@JvmInline value class AccountToken(val value: String) 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 7e48417168..e9490d31d4 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 @@ -22,32 +22,13 @@ import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale private val MullvadTypography = Typography( headlineLarge = TextStyle(fontSize = TypeScale.TextHuge, fontWeight = FontWeight.Bold), - headlineSmall = - TextStyle( - color = MullvadWhite, - fontSize = TypeScale.TextBig, - fontWeight = FontWeight.Bold - ), + headlineSmall = TextStyle(fontSize = TypeScale.TextBig, fontWeight = FontWeight.Bold), + bodySmall = TextStyle(fontSize = TypeScale.TextSmall), + titleSmall = TextStyle(fontSize = TypeScale.TextMedium, fontWeight = FontWeight.SemiBold), bodyMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.Bold), - bodySmall = TextStyle(color = MullvadWhite, fontSize = TypeScale.TextSmall), - titleSmall = - TextStyle( - color = MullvadWhite, - fontSize = TypeScale.TextMedium, - fontWeight = FontWeight.SemiBold - ), titleMedium = - TextStyle( - color = MullvadWhite, - fontSize = TypeScale.TextMediumPlus, - fontWeight = FontWeight.SemiBold - ), - labelMedium = - TextStyle( - color = MullvadWhite60, - fontSize = TypeScale.TextSmall, - fontWeight = FontWeight.SemiBold - ), + TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.SemiBold), + labelMedium = TextStyle(fontSize = TypeScale.TextSmall, fontWeight = FontWeight.SemiBold), labelLarge = TextStyle( fontWeight = FontWeight.Normal, 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 aeee6593da..23e9910735 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 @@ -29,13 +29,16 @@ data class Dimensions( val loadingSpinnerPadding: Dp = 12.dp, val loadingSpinnerSize: Dp = 24.dp, val loadingSpinnerSizeMedium: Dp = 28.dp, - val loadingSpinnerStrokeWidth: Dp = 3.dp, + val loadingSpinnerStrokeWidth: Dp = 6.dp, + val loginIconContainerSize: Dp = 60.dp, + val smallPadding: Dp = 8.dp, val mediumPadding: Dp = 16.dp, + val largePadding: Dp = 32.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 progressIndicatorSize: Dp = 48.dp, val relayCircleSize: Dp = 16.dp, val relayRowPadding: Dp = 50.dp, val screenVerticalMargin: Dp = 22.dp, @@ -46,7 +49,6 @@ data class Dimensions( val selectLocationTitlePadding: Dp = 12.dp, val selectableCellTextMargin: Dp = 12.dp, 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, |