diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-07-02 14:46:57 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-07-02 14:46:57 +0200 |
| commit | 3529386dee71c45f546ca0fb23a2056c063bd314 (patch) | |
| tree | 4ebb34055c8a598b46f297dcaa13831cef6262a5 | |
| parent | 706c0e85ec5e3dac8ced707f1f89b587ee357e09 (diff) | |
| download | mullvadvpn-3529386dee71c45f546ca0fb23a2056c063bd314.tar.xz mullvadvpn-3529386dee71c45f546ca0fb23a2056c063bd314.zip | |
Fix reconnect button size
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt | 5 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt index 8ca896cd73..209a7f19bc 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt @@ -10,7 +10,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilledIconButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButtonDefaults -import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement +import androidx.compose.material3.LocalMinimumInteractiveComponentSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -146,7 +146,8 @@ private fun ConnectionButton( val (connectionButton, reconnectButton) = createRefs() CompositionLocalProvider( - LocalMinimumInteractiveComponentEnforcement provides false, + LocalMinimumInteractiveComponentSize provides + Dimens.reconnectButtonMinInteractiveComponentSize, ) { val dividerSize = Dimens.listItemDivider 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 ef3564951f..d4e5e4803d 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 @@ -56,6 +56,7 @@ data class Dimensions( val loadingSpinnerSize: Dp = 24.dp, val loadingSpinnerSizeMedium: Dp = 28.dp, val loginIconContainerSize: Dp = 44.dp, + val miniPadding: Dp = 4.dp, val mediumPadding: Dp = 16.dp, val notificationBannerEndPadding: Dp = 8.dp, val notificationBannerStartPadding: Dp = 16.dp, @@ -63,6 +64,7 @@ data class Dimensions( val notificationStatusIconSize: Dp = 10.dp, val problemReportIconToTitlePadding: Dp = 60.dp, val progressIndicatorSize: Dp = 48.dp, + val reconnectButtonMinInteractiveComponentSize: Dp = 40.dp, val relayCircleSize: Dp = 16.dp, val relayRowPadding: Dp = 50.dp, val relayRowPaddingExtra: Dp = 66.dp, @@ -73,7 +75,6 @@ data class Dimensions( val selectFilterTitlePadding: Dp = 12.dp, val selectLocationTitlePadding: Dp = 12.dp, val selectableCellTextMargin: Dp = 12.dp, - val miniPadding: Dp = 4.dp, val sideMargin: Dp = 22.dp, val smallIconSize: Dp = 16.dp, val smallPadding: Dp = 8.dp, |