Skip to content

Commit 0a935ae

Browse files
committed
add number of pages to notification controls
1 parent 0ade41e commit 0a935ae

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,18 @@ class GetNotificationActivitySwitchControlsInteractor @Inject constructor(
106106
) + repeatButtonViewData +
107107
typesViewData
108108

109+
val total = allTypesViewData.size
110+
val totalPages = total / TYPES_LIST_SIZE
111+
val currentPage = (typesShift / TYPES_LIST_SIZE) + 1
112+
val pagesHint = if (total != 0 && totalPages > 1) {
113+
"($currentPage/$totalPages)"
114+
} else {
115+
""
116+
}
117+
109118
return NotificationControlsParams.Enabled(
110119
hint = hint,
120+
pagesHint = pagesHint,
111121
types = populateWithEmpty(
112122
data = allTypesViewData,
113123
pageSize = TYPES_LIST_SIZE,

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,14 @@ class NotificationControlsManager @Inject constructor(
4545
val tagsControlsVisible: Boolean = controls.tags.isNotEmpty()
4646

4747
return RemoteViews(context.packageName, R.layout.notification_switch_controls_layout).apply {
48-
val hintVisibility = if (controls.hint.isNotEmpty()) View.VISIBLE else View.GONE
48+
val hintVisibility = View.VISIBLE
4949
setViewVisibility(R.id.tvNotificationControlsHint, hintVisibility)
50-
setTextViewText(R.id.tvNotificationControlsHint, controls.hint)
50+
val fullHint = if (controls.hint.isNotEmpty()) {
51+
controls.hint + " " + controls.pagesHint
52+
} else {
53+
controls.pagesHint
54+
}
55+
setTextViewText(R.id.tvNotificationControlsHint, fullHint)
5156

5257
addTypeControls(from, controls)
5358
if (tagsControlsVisible) addTagControls(from, controls)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ sealed interface NotificationControlsParams {
88

99
data class Enabled(
1010
val hint: String,
11+
val pagesHint: String,
1112
val types: List<Type>,
1213
val typesShift: Int,
1314
val tags: List<Tag>,

0 commit comments

Comments
 (0)