Add minSize to the Button

riggaroo · riggaroo · commit bf00df62c535 · 2026-03-18T17:43:56.000Z
diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Button.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Button.kt
@@ -27,6 +27,7 @@ import androidx.compose.foundation.style.ExperimentalFoundationStyleApi
 import androidx.compose.foundation.style.Style
 import androidx.compose.foundation.style.rememberUpdatedStyleState
 import androidx.compose.foundation.style.styleable
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -61,7 +62,7 @@ fun Button(
                 enabled = enabled,
                 onClick = onClick,
                 interactionSource = interactionSource,
-                indication = null,
+                indication = ripple(),
             )
             .styleable(styleState, JetsnackTheme.styles.buttonStyle, style),
         content = content,
diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Styles.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Styles.kt
@@ -14,27 +14,55 @@
  * limitations under the License.
  */
 
-@file:OptIn(ExperimentalFoundationStyleApi::class)
+@file:OptIn(ExperimentalFoundationStyleApi::class, ExperimentalMediaQueryApi::class)
 
 package com.example.jetsnack.ui.theme
 
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.style.ExperimentalFoundationStyleApi
 import androidx.compose.foundation.style.Style
+import androidx.compose.foundation.style.StyleScope
 import androidx.compose.foundation.style.disabled
 import androidx.compose.foundation.style.fillWidth
+import androidx.compose.foundation.style.hovered
 import androidx.compose.foundation.style.pressed
 import androidx.compose.foundation.style.selected
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.runtime.Immutable
+import androidx.compose.ui.ExperimentalMediaQueryApi
+import androidx.compose.ui.LocalUiMediaScope
+import androidx.compose.ui.UiMediaScope
+import androidx.compose.ui.UiMediaScope.ViewingDistance
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.mediaQuery
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import com.example.jetsnack.ui.components.textStyleWithFontFamilyFix
 
+fun StyleScope.adaptiveFontSize(fontSize: TextUnit) {
+    var scaleFactor = when (LocalUiMediaScope.currentValue.viewingDistance) {
+        ViewingDistance.Near -> 1f
+        ViewingDistance.Medium -> 1.72f
+        ViewingDistance.Far -> 1.5f
+        else -> 1f
+    }
+    scaleFactor = when (LocalUiMediaScope.currentValue.pointerPrecision) {
+        UiMediaScope.PointerPrecision.Coarse -> scaleFactor * 1f
+        UiMediaScope.PointerPrecision.Blunt -> scaleFactor * 0.66f
+        UiMediaScope.PointerPrecision.Fine -> scaleFactor * 1f
+        UiMediaScope.PointerPrecision.None -> scaleFactor
+        else -> {
+            scaleFactor
+        }
+    }
+    fontSize(fontSize * scaleFactor)
+}
+
 @Immutable
 data class Styles(
     val buttonStyle: Style = Style {
@@ -43,6 +71,7 @@ data class Styles(
         contentColor(colors.textInteractive)
         contentPaddingVertical(8.dp)
         contentPaddingHorizontal(24.dp)
+        minSize(58.dp, 48.dp)
         textStyleWithFontFamilyFix(typography.labelLarge)
         disabled {
             animate {
