A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
feat: Add `icon` and `color` to Activities
Needed for nicer rendering in the WearOS UI.
Joseph Hale
(Feb 26, 2024, 10:23 PM -0700)
065eb123
1f323d81
+6
-2
+5
-1
app/src/main/java/com/example/util/simpletimetracker/wear/DomainAPI.kt
+5
-1
app/src/main/java/com/example/util/simpletimetracker/wear/DomainAPI.kt
···
25
25
override suspend fun queryActivities(): Array<Activity> {
26
26
return recordTypeInteractor.getAll()
27
27
.filter { recordType -> !recordType.hidden }
28
-
.map { recordType -> Activity(recordType.id, recordType.name) }
28
+
.map { recordType ->
29
+
val color = appColorMapper.mapToColorInt(recordType.color)
30
+
val hex = String.format("#%06X", (0xFFFFFF and color))
31
+
Activity(recordType.id, recordType.name, recordType.icon, hex)
32
+
}
29
33
.toTypedArray()
30
34
}
31
35
+1
-1
wearrpc/src/main/java/com/example/util/simpletimetracker/wearrpc/DTO.kt
+1
-1
wearrpc/src/main/java/com/example/util/simpletimetracker/wearrpc/DTO.kt
···
13
13
14
14
import java.util.Date
15
15
16
-
data class Activity(val id: Long, val name: String /* , val color: String, val icon: ByteArray */)
16
+
data class Activity(val id: Long, val name: String, val icon: String, val color: String)
17
17
18
18
data class CurrentActivity(val id: Long, val name: String, val startedAt: Date, val tags: Array<Tag>) {
19
19
override fun equals(other: Any?): Boolean {