Merge branch 'investigate-reconnect-button-size-droid-1172'

mullvad · Jul 2, 2024 · 1e9a18a · 1e9a18a
2 parents 706c0e8 + 3529386
commit 1e9a18a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -56,13 +56,15 @@ 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,
     val notificationEndIconPadding: Dp = 4.dp,
     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,