diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-27 14:17:11 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-27 14:17:11 +0100 |
| commit | 7bba2ddf76faa89386a0acf461a313f4dbb46e65 (patch) | |
| tree | 8880073a7d71ed3e535a10efe0a7dce17dadddca /android/lib | |
| parent | 7af87eace216b562fb510dc5b760c4d4453f42c2 (diff) | |
| parent | f7d52b77f6d913bd10ccbc7fd22cba0c9458e2ec (diff) | |
| download | mullvadvpn-7bba2ddf76faa89386a0acf461a313f4dbb46e65.tar.xz mullvadvpn-7bba2ddf76faa89386a0acf461a313f4dbb46e65.zip | |
Merge branch 'fix-privacy-policy-title-and-spacings-droid-1818'
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt | 3 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt | 4 |
2 files changed, 4 insertions, 3 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 9eb0aae4b2..3625c8ed0a 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 @@ -36,7 +36,8 @@ private val MullvadTypography = lineHeight = TypeScale.HeadlineMediumLineHeight, ), headlineSmall = TextStyle(fontSize = TypeScale.TextBig, fontWeight = FontWeight.Bold), - bodySmall = TextStyle(fontSize = TypeScale.TextSmall), + bodySmall = + TextStyle(fontSize = TypeScale.TextSmall, lineHeight = TypeScale.TextMediumPlus), titleSmall = TextStyle(fontSize = TypeScale.TextMedium, fontWeight = FontWeight.SemiBold), titleMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.SemiBold), 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 51b4f5efb8..dde3d9c7cb 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 @@ -53,7 +53,7 @@ data class Dimensions( val problemReportIconToTitlePadding: Dp = 60.dp, val reconnectButtonMinInteractiveComponentSize: Dp = 40.dp, val relayCircleSize: Dp = 16.dp, - val screenVerticalMargin: Dp = 22.dp, + val screenVerticalMargin: Dp = 24.dp, val searchFieldHeight: Dp = 42.dp, // Search view full screen header container height (material design guidelines) val searchFieldHeightExpanded: Dp = 72.dp, @@ -62,7 +62,7 @@ data class Dimensions( val selectLocationTitlePadding: Dp = 12.dp, val selectableCellTextMargin: Dp = 12.dp, val settingsDetailsImageMaxWidth: Dp = 480.dp, - val sideMargin: Dp = 22.dp, + val sideMargin: Dp = 24.dp, val smallIconSize: Dp = 16.dp, val smallPadding: Dp = 8.dp, val smallSpacer: Dp = 8.dp, |