Skip to content

Commit c571c25

Browse files
committed
add tag highlight on type notification
1 parent 4ccc935 commit c571c25

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Base {
55
const val namespace = "com.example.util.simpletimetracker"
66

77
// Raise by 2 to account for wear version code.
8-
const val versionCode = 87
8+
const val versionCode = 89
99
const val versionName = "1.47"
1010
const val minSDK = 21
1111
const val currentSDK = 34

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/activitySwitch/interactor/NotificationActivitySwitchInteractorImpl.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.example.util.simpletimetracker.feature_notification.activitySwitch.interactor
22

3+
import androidx.core.text.buildSpannedString
34
import com.example.util.simpletimetracker.core.interactor.FilterGoalsByDayOfWeekInteractor
45
import com.example.util.simpletimetracker.core.interactor.GetCurrentRecordsDurationInteractor
56
import com.example.util.simpletimetracker.core.mapper.ColorMapper
@@ -132,7 +133,7 @@ class NotificationActivitySwitchInteractorImpl @Inject constructor(
132133
val hint: String
133134
val icon: RecordTypeIcon?
134135
val color: Int?
135-
val title: String
136+
val title: CharSequence
136137
val subtitle: String
137138
val untrackedTimeStarted: Long?
138139
val prevRecordDuration: Long?
@@ -146,7 +147,11 @@ class NotificationActivitySwitchInteractorImpl @Inject constructor(
146147
recordType = prevRecordType,
147148
recordTags = recordTags.filter { it.id in prevRecord.tagIds },
148149
)
149-
title = "$namePrefix - $fullName"
150+
title = buildSpannedString {
151+
append(namePrefix)
152+
append(" - ")
153+
append(fullName)
154+
}
150155
subtitle = timeMapper.formatTime(
151156
time = prevRecord.timeEnded,
152157
useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat(),

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/activitySwitch/manager/NotificationActivitySwitchParams.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
55
data class NotificationActivitySwitchParams(
66
val icon: RecordTypeIcon,
77
val color: Int,
8-
val title: String,
8+
val title: CharSequence,
99
val subtitle: String,
1010
val untrackedStartedTimeStamp: Long?,
1111
val prevRecordDuration: Long?,
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.example.util.simpletimetracker.feature_notification.core
22

3+
import androidx.core.text.bold
4+
import androidx.core.text.buildSpannedString
35
import com.example.util.simpletimetracker.domain.extension.getFullName
46
import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
57
import com.example.util.simpletimetracker.domain.recordType.model.RecordType
@@ -10,13 +12,15 @@ class NotificationCommonMapper @Inject constructor() {
1012
fun getNotificationText(
1113
recordType: RecordType,
1214
recordTags: List<RecordTag>,
13-
): String {
15+
): CharSequence {
1416
val tag = recordTags.getFullName()
1517

16-
return if (tag.isEmpty()) {
17-
recordType.name
18-
} else {
19-
"${recordType.name} - $tag"
18+
return buildSpannedString {
19+
bold { append(recordType.name) }
20+
if (tag.isNotEmpty()) {
21+
append(" - ")
22+
append(tag)
23+
}
2024
}
2125
}
2226
}

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/manager/NotificationTypeParams.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data class NotificationTypeParams(
77
val id: Long,
88
val icon: RecordTypeIcon,
99
val color: Int,
10-
val text: String,
10+
val text: CharSequence,
1111
val timeStarted: String,
1212
val startedTimeStamp: Long,
1313
val totalDuration: Long?,

0 commit comments

Comments
 (0)