A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
style: Apply IDE recommended improvements
Joseph Hale
(Feb 26, 2024, 10:27 PM -0700)
a7c1e038
4e72792a
+13
-12
+13
-12
wear/src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityChip.kt
+13
-12
wear/src/main/java/com/example/util/simpletimetracker/presentation/components/ActivityChip.kt
···
50
50
} else {
51
51
""
52
52
}
53
-
var switchChecked = startedAt != null
53
+
val switchChecked = startedAt != null
54
54
SplitToggleChip(
55
55
modifier = Modifier
56
56
.fillMaxWidth(0.9f)
57
57
.padding(top = 10.dp),
58
58
label = {
59
-
Row(
60
-
modifier = Modifier
61
-
.height(IntrinsicSize.Min),
62
-
) {
63
-
ActivityIcon(
64
-
activityIcon = activity.icon,
65
-
)
59
+
Row(modifier = Modifier.height(IntrinsicSize.Min)) {
60
+
ActivityIcon(activityIcon = activity.icon)
66
61
Text(
67
62
text = activity.name + tagString,
68
63
maxLines = 1,
69
64
overflow = TextOverflow.Ellipsis,
70
-
modifier = Modifier.padding(start = 2.dp)
65
+
modifier = Modifier.padding(start = 4.dp),
71
66
)
72
67
}
73
68
},
···
120
115
Instant.ofEpochMilli(epochMillis),
121
116
ZoneId.systemDefault(),
122
117
)
123
-
if (time > LocalDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()).minusDays(1)) {
124
-
return time.format(DateTimeFormatter.ISO_LOCAL_TIME)
118
+
return if (time > LocalDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()).minusDays(1)) {
119
+
time.format(DateTimeFormatter.ISO_LOCAL_TIME)
125
120
} else {
126
-
return time.format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ")
121
+
time.format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ")
127
122
}
128
123
}
129
124
···
149
144
@Composable
150
145
fun SampleIcon() {
151
146
ActivityChip(Activity(456, "Sleeping", "ic_hotel_24px", 0xFFABCDEF))
147
+
}
148
+
149
+
@Preview(device = WearDevices.LARGE_ROUND)
150
+
@Composable
151
+
fun InvalidIcon() {
152
+
ActivityChip(Activity(456, "Sleeping", "ic_gobbldeegoock_24px", 0xFFABCDEF))
152
153
}
153
154
154
155
@Preview(device = WearDevices.LARGE_ROUND)