diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-09-22 09:14:44 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson90@gmail.com> | 2023-09-27 08:23:26 +0200 |
| commit | 08a74bc5857076e7dc2eb3963c49ec775cedb688 (patch) | |
| tree | 46f9c584818d908332f7830c0eff2e3c7e82f038 /android/lib/theme | |
| parent | 24acf70d47b15e3d4ece53b8f0cd8c3dffcf52fd (diff) | |
| download | mullvadvpn-08a74bc5857076e7dc2eb3963c49ec775cedb688.tar.xz mullvadvpn-08a74bc5857076e7dc2eb3963c49ec775cedb688.zip | |
Migrate login screen to compose
Fixes removed and fixes some of the compose colors, recreates login states
Diffstat (limited to 'android/lib/theme')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt | 29 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt | 8 |
2 files changed, 10 insertions, 27 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 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, |