Skip to content

Commit f75bf17

Browse files
committed
change wear tag chip size
1 parent 2a08f37 commit f75bf17

File tree

7 files changed

+24
-9
lines changed

7 files changed

+24
-9
lines changed

app/src/main/java/com/example/util/simpletimetracker/navigation/RouterImpl.kt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.content.Intent
66
import androidx.activity.ComponentActivity
77
import androidx.navigation.NavController
88
import androidx.navigation.findNavController
9-
import com.example.util.simpletimetracker.feature_widget.universal.activity.view.WidgetUniversalActivity
109
import com.example.util.simpletimetracker.navigation.params.action.ActionParams
1110
import com.example.util.simpletimetracker.navigation.params.notification.NotificationParams
1211
import com.example.util.simpletimetracker.navigation.params.screen.ScreenParams

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityChip.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,19 @@ fun ActivityChip(
4343
onClick: () -> Unit = {},
4444
) {
4545
val isRunning = state.startedAt != null
46-
val height = if (isRunning) 56 else 44
46+
val height = if (isRunning) {
47+
ACTIVITY_RUNNING_VIEW_HEIGHT
48+
} else {
49+
ACTIVITY_VIEW_HEIGHT
50+
}
4751
Chip(
4852
modifier = Modifier
4953
.height(height.dp)
5054
.fillMaxWidth(),
5155
icon = {
5256
ActivityIcon(
5357
modifier = Modifier.height(20.dp),
54-
activityIcon = state.icon
58+
activityIcon = state.icon,
5559
)
5660
},
5761
label = {

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityIcon.kt

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import android.util.TypedValue
99
import android.view.Gravity
1010
import androidx.appcompat.widget.AppCompatTextView
1111
import androidx.compose.foundation.layout.aspectRatio
12-
import androidx.compose.foundation.layout.fillMaxHeight
13-
import androidx.compose.foundation.layout.height
1412
import androidx.compose.foundation.layout.width
1513
import androidx.compose.runtime.Composable
1614
import androidx.compose.ui.Modifier
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.example.util.simpletimetracker.presentation.components
2+
3+
internal const val ACTIVITY_VIEW_HEIGHT = 44
4+
internal const val ACTIVITY_RUNNING_VIEW_HEIGHT = 56

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/RefreshButton.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fun RefreshButton(
4242
},
4343
modifier = Modifier
4444
.rotate(targetRotation)
45-
.size(44.dp),
45+
.size(ACTIVITY_VIEW_HEIGHT.dp),
4646
)
4747
}
4848

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/TagChip.kt

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
package com.example.util.simpletimetracker.presentation.components
77

88
import androidx.compose.foundation.layout.fillMaxWidth
9+
import androidx.compose.foundation.layout.height
910
import androidx.compose.runtime.Composable
1011
import androidx.compose.ui.Modifier
1112
import androidx.compose.ui.graphics.Color
1213
import androidx.compose.ui.text.style.TextOverflow
1314
import androidx.compose.ui.tooling.preview.Preview
15+
import androidx.compose.ui.unit.dp
1416
import androidx.wear.compose.material.Checkbox
1517
import androidx.wear.compose.material.CheckboxDefaults
1618
import androidx.wear.compose.material.Chip
@@ -57,7 +59,9 @@ private fun SingleSelectTagChip(
5759
onClick: (WearTag) -> Unit,
5860
) {
5961
Chip(
60-
modifier = Modifier.fillMaxWidth(),
62+
modifier = Modifier
63+
.height(ACTIVITY_VIEW_HEIGHT.dp)
64+
.fillMaxWidth(),
6165
onClick = {
6266
onClick(tag)
6367
},
@@ -81,7 +85,9 @@ private fun MultiSelectTagChip(
8185
checked: Boolean,
8286
) {
8387
SplitToggleChip(
84-
modifier = Modifier.fillMaxWidth(),
88+
modifier = Modifier
89+
.height(ACTIVITY_VIEW_HEIGHT.dp)
90+
.fillMaxWidth(),
8591
checked = checked,
8692
onCheckedChange = {
8793
onClick(tag)

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/TagSelectionButton.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
package com.example.util.simpletimetracker.presentation.components
77

88
import androidx.compose.foundation.layout.fillMaxWidth
9+
import androidx.compose.foundation.layout.height
910
import androidx.compose.runtime.Composable
1011
import androidx.compose.ui.Modifier
1112
import androidx.compose.ui.graphics.Color
1213
import androidx.compose.ui.text.style.TextAlign
1314
import androidx.compose.ui.text.style.TextOverflow
1415
import androidx.compose.ui.tooling.preview.Preview
16+
import androidx.compose.ui.unit.dp
1517
import androidx.wear.compose.material.Chip
1618
import androidx.wear.compose.material.ChipDefaults
1719
import androidx.wear.compose.material.Text
@@ -26,6 +28,9 @@ fun TagSelectionButton(
2628
onClick: () -> Unit = {},
2729
) {
2830
Chip(
31+
modifier = Modifier
32+
.height(ACTIVITY_VIEW_HEIGHT.dp)
33+
.fillMaxWidth(),
2934
onClick = onClick,
3035
label = {
3136
Text(
@@ -39,7 +44,6 @@ fun TagSelectionButton(
3944
colors = ChipDefaults.chipColors(
4045
backgroundColor = color,
4146
),
42-
modifier = Modifier.fillMaxWidth(),
4347
)
4448
}
4549

0 commit comments

Comments
 (0)