change wear tag chip size

Razeeman · Mar 9, 2024 · f75bf17 · f75bf17
1 parent 2a08f37
commit f75bf17
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/app/src/main/java/com/example/util/simpletimetracker/navigation/RouterImpl.kt b/app/src/main/java/com/example/util/simpletimetracker/navigation/RouterImpl.kt
@@ -6,7 +6,6 @@ import android.content.Intent
 import androidx.activity.ComponentActivity
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
-import com.example.util.simpletimetracker.feature_widget.universal.activity.view.WidgetUniversalActivity
 import com.example.util.simpletimetracker.navigation.params.action.ActionParams
 import com.example.util.simpletimetracker.navigation.params.notification.NotificationParams
 import com.example.util.simpletimetracker.navigation.params.screen.ScreenParams

diff --git a/.../src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityChip.kt b/.../src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityChip.kt
@@ -43,15 +43,19 @@ fun ActivityChip(
     onClick: () -> Unit = {},
 ) {
     val isRunning = state.startedAt != null
-    val height = if (isRunning) 56 else 44
+    val height = if (isRunning) {
+        ACTIVITY_RUNNING_VIEW_HEIGHT
+    } else {
+        ACTIVITY_VIEW_HEIGHT
+    }
     Chip(
         modifier = Modifier
             .height(height.dp)
             .fillMaxWidth(),
         icon = {
             ActivityIcon(
                 modifier = Modifier.height(20.dp),
-                activityIcon = state.icon
+                activityIcon = state.icon,
             )
         },
         label = {

diff --git a/.../src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityIcon.kt b/.../src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityIcon.kt
@@ -9,8 +9,6 @@ import android.util.TypedValue
 import android.view.Gravity
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

diff --git a/...ain/java/com/example/util/simpletimetracker/presentation/components/PresentationConsts.kt b/...ain/java/com/example/util/simpletimetracker/presentation/components/PresentationConsts.kt
@@ -0,0 +1,4 @@
+package com.example.util.simpletimetracker.presentation.components
+
+internal const val ACTIVITY_VIEW_HEIGHT = 44
+internal const val ACTIVITY_RUNNING_VIEW_HEIGHT = 56
diff --git a/...src/main/java/com/example/util/simpletimetracker/presentation/components/RefreshButton.kt b/...src/main/java/com/example/util/simpletimetracker/presentation/components/RefreshButton.kt
@@ -42,7 +42,7 @@ fun RefreshButton(
         },
         modifier = Modifier
             .rotate(targetRotation)
-            .size(44.dp),
+            .size(ACTIVITY_VIEW_HEIGHT.dp),
     )
 }
 

diff --git a/wear/src/main/java/com/example/util/simpletimetracker/presentation/components/TagChip.kt b/wear/src/main/java/com/example/util/simpletimetracker/presentation/components/TagChip.kt
@@ -6,11 +6,13 @@
 package com.example.util.simpletimetracker.presentation.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.Checkbox
 import androidx.wear.compose.material.CheckboxDefaults
 import androidx.wear.compose.material.Chip
@@ -57,7 +59,9 @@ private fun SingleSelectTagChip(
     onClick: (WearTag) -> Unit,
 ) {
     Chip(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .height(ACTIVITY_VIEW_HEIGHT.dp)
+            .fillMaxWidth(),
         onClick = {
             onClick(tag)
         },
@@ -81,7 +85,9 @@ private fun MultiSelectTagChip(
     checked: Boolean,
 ) {
     SplitToggleChip(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .height(ACTIVITY_VIEW_HEIGHT.dp)
+            .fillMaxWidth(),
         checked = checked,
         onCheckedChange = {
             onClick(tag)

diff --git a/...ain/java/com/example/util/simpletimetracker/presentation/components/TagSelectionButton.kt b/...ain/java/com/example/util/simpletimetracker/presentation/components/TagSelectionButton.kt
@@ -6,12 +6,14 @@
 package com.example.util.simpletimetracker.presentation.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.Chip
 import androidx.wear.compose.material.ChipDefaults
 import androidx.wear.compose.material.Text
@@ -26,6 +28,9 @@ fun TagSelectionButton(
     onClick: () -> Unit = {},
 ) {
     Chip(
+        modifier = Modifier
+            .height(ACTIVITY_VIEW_HEIGHT.dp)
+            .fillMaxWidth(),
         onClick = onClick,
         label = {
             Text(
@@ -39,7 +44,6 @@ fun TagSelectionButton(
         colors = ChipDefaults.chipColors(
             backgroundColor = color,
         ),
-        modifier = Modifier.fillMaxWidth(),
     )
 }