diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-30 13:35:26 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-30 13:35:26 +0200 |
| commit | a0a6d92fad5058ebc3b7ffe2b707770d27bf7cf9 (patch) | |
| tree | 20f9769dfa38f50fde2f2df3a974e6d8cff4e9f0 /android/lib/ui | |
| parent | f821c46c737259d6410bee6988e26f405d2f039a (diff) | |
| parent | e5628f5bc0f233a358ea56aa8d8502ebe1174b2a (diff) | |
| download | mullvadvpn-a0a6d92fad5058ebc3b7ffe2b707770d27bf7cf9.tar.xz mullvadvpn-a0a6d92fad5058ebc3b7ffe2b707770d27bf7cf9.zip | |
Merge branch 'change-grid-spacings-droid-717'
Diffstat (limited to 'android/lib/ui')
2 files changed, 3 insertions, 4 deletions
diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt index 8889a37399..94a935db74 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt @@ -223,7 +223,7 @@ private fun NotificationAction( onClick = onClick, ) { Icon( - modifier = Modifier.padding(Dimens.notificationIconPadding), + modifier = Modifier.padding(Dimens.smallPadding), imageVector = imageVector, contentDescription = contentDescription, tint = MaterialTheme.colorScheme.onSurface, diff --git a/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListHeader.kt b/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListHeader.kt index 3dc20ff0e7..51a3d01b92 100644 --- a/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListHeader.kt +++ b/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListHeader.kt @@ -32,12 +32,11 @@ fun RelayListHeader( ) { ProvideContentColorTextStyle( MaterialTheme.colorScheme.onBackground, - MaterialTheme.typography.bodyLarge, + MaterialTheme.typography.labelLarge, ) { Row( modifier = - Modifier.padding(horizontal = Dimens.tinyPadding) - .defaultMinSize(minHeight = LIST_HEADER_MIN_HEIGHT) + Modifier.defaultMinSize(minHeight = LIST_HEADER_MIN_HEIGHT) .height(IntrinsicSize.Min) .then(modifier), verticalAlignment = Alignment.CenterVertically, |