add value tag selection to notifications

Author: Razeeman

domain/src/main/java/com/example/util/simpletimetracker/domain/notifications/interactor/NotificationTypeInteractor.kt

@@ -7,6 +7,8 @@ interface NotificationTypeInteractor {
         typesShift: Int = 0,
         tagsShift: Int = 0,
         selectedTypeId: Long = 0,
+        selectedTagId: Long = 0,
+        autoCancel: Boolean = false,
     )
 
     suspend fun checkAndHide(typeId: Long)

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

@@ -38,6 +38,8 @@ class GetNotificationActivitySwitchControlsInteractor @Inject constructor(
         tags: List<RecordTag> = emptyList(),
         tagsShift: Int = 0,
         selectedTypeId: Long? = null,
+        selectedTagId: Long? = null,
+        autoCancel: Boolean = false,
         goals: Map<Long, List<RecordTypeGoal>>,
         allDailyCurrents: Map<Long, GetCurrentRecordsDurationInteractor.Result>,
     ): NotificationControlsParams {
@@ -136,6 +138,8 @@ class GetNotificationActivitySwitchControlsInteractor @Inject constructor(
             controlIconColor = colorMapper.toInactiveColor(isDarkTheme),
             filteredTypeColor = colorMapper.toInactiveColor(isDarkTheme),
             selectedTypeId = selectedTypeId,
+            selectedTagId = selectedTagId,
+            autoCancel = autoCancel,
         )
     }
 

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

@@ -7,6 +7,8 @@ import android.graphics.Bitmap
 import android.view.ContextThemeWrapper
 import android.view.View
 import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat.Action
+import androidx.core.app.RemoteInput
 import com.example.util.simpletimetracker.core.extension.allowVmViolations
 import com.example.util.simpletimetracker.core.utils.PendingIntents
 import com.example.util.simpletimetracker.domain.extension.ifNull
@@ -64,6 +66,40 @@ class NotificationControlsManager @Inject constructor(
         }
     }
 
+    // TODO TAG also add to notif switch.
+    fun getTagValueInputAction(
+        from: From,
+        controls: NotificationControlsParams,
+    ): Action? {
+        if (controls !is NotificationControlsParams.Enabled) return null
+        if (controls.selectedTagId.orZero() == 0L) return null
+
+        val replyPendingIntent = getPendingSelfIntent(
+            context = context,
+            action = ACTION_NOTIFICATION_CONTROLS_TAG_VALUE_INPUT,
+            requestCode = getRequestCode(from),
+            from = from,
+            selectedTypeId = controls.selectedTypeId,
+            recordTagId = controls.selectedTagId,
+            recordTypesShift = controls.typesShift,
+        )
+        val remoteInput = RemoteInput
+            .Builder(ARGS_TAG_VALUE_INPUT)
+            // .setChoices(arrayOf("1", "2.3", "3.45")) // TODO TAG this or show instead of tags?
+            .setLabel("Enter new value") // TODO TAG
+            .build()
+
+        // Create the reply action and add the remote input.
+        return Action
+            .Builder(
+                R.drawable.icon_category_emoji_emotions, // TODO TAG
+                "Enter value (steps)", // TODO TAG add suffix
+                replyPendingIntent,
+            )
+            .addRemoteInput(remoteInput)
+            .build()
+    }
+
     private fun RemoteViews.addTypeControls(
         from: From,
         params: NotificationControlsParams.Enabled,
@@ -357,7 +393,7 @@ class NotificationControlsManager @Inject constructor(
 
     sealed interface From {
         data class ActivityNotification(val recordTypeId: Long) : From
-        object ActivitySwitch : From
+        data object ActivitySwitch : From
     }
 
     private data class RequestCode(
@@ -378,6 +414,8 @@ class NotificationControlsManager @Inject constructor(
             "com.example.util.simpletimetracker.feature_notification.activitySwitch.onTypeClick"
         const val ACTION_NOTIFICATION_CONTROLS_TAG_CLICK =
             "com.example.util.simpletimetracker.feature_notification.activitySwitch.onTagClick"
+        const val ACTION_NOTIFICATION_CONTROLS_TAG_VALUE_INPUT =
+            "com.example.util.simpletimetracker.feature_notification.activitySwitch.tagValueInput"
 
         const val ACTION_NOTIFICATION_CONTROLS_TYPES_PREV =
             "com.example.util.simpletimetracker.feature_notification.activitySwitch.onTypesPrevClick"
@@ -394,6 +432,7 @@ class NotificationControlsManager @Inject constructor(
         const val ARGS_TAG_ID = "tagId"
         const val ARGS_TYPES_SHIFT = "typesShift"
         const val ARGS_TAGS_SHIFT = "tagsShift"
+        const val ARGS_TAG_VALUE_INPUT = "tagValueInput"
 
         const val TYPES_LIST_SIZE = 6
         const val TAGS_LIST_SIZE = 4

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

@@ -18,6 +18,8 @@ sealed interface NotificationControlsParams {
         val controlIconColor: Int,
         val filteredTypeColor: Int,
         val selectedTypeId: Long?,
+        val selectedTagId: Long?,
+        val autoCancel: Boolean,
     ) : NotificationControlsParams
 
     sealed interface Type {

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recevier/NotificationReceiver.kt

@@ -4,6 +4,7 @@ import android.app.AlarmManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import androidx.core.app.RemoteInput
 import com.example.util.simpletimetracker.core.extension.goAsync
 import com.example.util.simpletimetracker.core.utils.ACTION_EXTERNAL_ADD_RECORD
 import com.example.util.simpletimetracker.core.utils.ACTION_EXTERNAL_CHANGE_RECORD
@@ -27,6 +28,7 @@ import com.example.util.simpletimetracker.feature_notification.activitySwitch.ma
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TAGS_NEXT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TAGS_PREV
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TAG_CLICK
+import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TAG_VALUE_INPUT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TYPES_NEXT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TYPES_PREV
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TYPE_CLICK
@@ -40,6 +42,7 @@ import com.example.util.simpletimetracker.feature_notification.recordType.contro
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_SELECTED_TYPE_ID
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TAGS_SHIFT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TAG_ID
+import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TAG_VALUE_INPUT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TYPES_SHIFT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TYPE_ID
 import com.example.util.simpletimetracker.feature_notification.external.NotificationExternalBroadcastController
@@ -254,6 +257,24 @@ class NotificationReceiver : BroadcastReceiver() {
                     typesShift = typesShift,
                 )
             }
+            ACTION_NOTIFICATION_CONTROLS_TAG_VALUE_INPUT -> {
+                val from = intent.getIntExtra(ARGS_CONTROLS_FROM, 0)
+                val typeId = intent.getLongExtra(ARGS_TYPE_ID, 0)
+                val selectedTypeId = intent.getLongExtra(ARGS_SELECTED_TYPE_ID, 0)
+                val tagId = intent.getLongExtra(ARGS_TAG_ID, 0)
+                val tagValue = RemoteInput.getResultsFromIntent(intent)
+                    ?.getCharSequence(ARGS_TAG_VALUE_INPUT)
+                    ?.toString()?.toDoubleOrNull()
+                val typesShift = intent.getIntExtra(ARGS_TYPES_SHIFT, 0)
+                typeController.onActionTagValueSelected(
+                    from = from,
+                    typeId = typeId,
+                    selectedTypeId = selectedTypeId,
+                    tagId = tagId,
+                    tagValue = tagValue,
+                    typesShift = typesShift,
+                )
+            }
             Intent.ACTION_BOOT_COMPLETED -> {
                 onBootCompleted()
             }

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/controller/NotificationTypeBroadcastController.kt

@@ -67,6 +67,28 @@ class NotificationTypeBroadcastController @Inject constructor(
         }
     }
 
+    fun onActionTagValueSelected(
+        from: Int,
+        typeId: Long,
+        selectedTypeId: Long,
+        tagId: Long,
+        tagValue: Double?,
+        typesShift: Int,
+    ) {
+        allowDiskRead { MainScope() }.launch {
+            activityStartStopFromBroadcastInteractor.onActionTagValueSelected(
+                from = notificationControlsMapper.mapExtraToFrom(
+                    extra = from,
+                    recordTypeId = typeId,
+                ) ?: return@launch,
+                selectedTypeId = selectedTypeId,
+                tagId = tagId,
+                tagValue = tagValue,
+                typesShift = typesShift,
+            )
+        }
+    }
+
     fun onRequestUpdate(
         from: Int,
         typeId: Long,

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/interactor/ActivityStartStopFromBroadcastInteractor.kt

@@ -11,6 +11,7 @@ import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTyp
 import com.example.util.simpletimetracker.domain.record.interactor.RemoveRunningRecordMediator
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
+import com.example.util.simpletimetracker.domain.recordTag.interactor.NeedTagValueSelectionInteractor
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager
 import kotlinx.coroutines.delay
 import javax.inject.Inject
@@ -24,6 +25,7 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
     private val notificationActivitySwitchInteractor: NotificationActivitySwitchInteractor,
     private val recordRepeatInteractor: RecordRepeatInteractor,
     private val completeTypesStateInteractor: CompleteTypesStateInteractor,
+    private val needTagValueSelectionInteractor: NeedTagValueSelectionInteractor,
 ) {
 
     suspend fun onActionActivityStop(
@@ -54,7 +56,7 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
             // Switch controls are updated separately right from here,
             // so no need to update after record change.
             updateNotificationSwitch = false,
-            commentInputAvailable = false, // TODO open activity?
+            commentInputAvailable = false, // TODO open activity? Or RemoteInput?
         ) {
             // Update to show tag selection.
             update(
@@ -84,23 +86,49 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
         tagId: Long,
         typesShift: Int,
     ) {
-        addRunningRecordMediator.startTimer(
-            typeId = selectedTypeId,
-            comment = "",
-            tags = listOfNotNull(tagId.takeUnless { it == 0L }).map {
-                RecordBase.Tag(
-                    tagId = it,
-                    numericValue = null, // TODO TAG add value selection
-                )
-            },
+        // id = 0 is untagged.
+        val needValueSelection = tagId != 0L && needTagValueSelectionInteractor.execute(
+            selectedTagIds = emptyList(),
+            clickedTagId = tagId,
         )
-        if (from !is NotificationControlsManager.From.ActivitySwitch) {
-            // Hide tag selection on current notification.
-            // Switch would be hidden on start timer.
-            update(from, typesShift)
+        if (needValueSelection) {
+            update(
+                from = from,
+                typesShift = typesShift,
+                selectedTypeId = selectedTypeId,
+                selectedTagId = tagId,
+            )
+        } else {
+            startFromTagSelection(
+                from = from,
+                selectedTypeId = selectedTypeId,
+                tagId = tagId,
+                tagValue = null,
+                typesShift = typesShift,
+                needDelay = false,
+                autoCancel = false,
+            )
         }
     }
 
+    suspend fun onActionTagValueSelected(
+        from: NotificationControlsManager.From,
+        selectedTypeId: Long,
+        tagId: Long,
+        tagValue: Double?,
+        typesShift: Int,
+    ) {
+        startFromTagSelection(
+            from = from,
+            selectedTypeId = selectedTypeId,
+            tagId = tagId,
+            tagValue = tagValue,
+            typesShift = typesShift,
+            needDelay = true,
+            autoCancel = true,
+        )
+    }
+
     suspend fun onRequestUpdate(
         from: NotificationControlsManager.From,
         selectedTypeId: Long,
@@ -115,11 +143,43 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
         )
     }
 
+    private suspend fun startFromTagSelection(
+        from: NotificationControlsManager.From,
+        selectedTypeId: Long,
+        tagId: Long,
+        tagValue: Double?,
+        typesShift: Int,
+        needDelay: Boolean,
+        autoCancel: Boolean,
+    ) {
+        delay(1000)
+        if (from !is NotificationControlsManager.From.ActivitySwitch) {
+            // Hide tag selection on current notification.
+            // Switch would be hidden on start timer.
+            update(from, typesShift, autoCancel = true)
+        }
+        // Need delay after sending from RemoteInput before cancelling,
+        // otherwise it will not cancel.
+        if (needDelay) delay(1000)
+        addRunningRecordMediator.startTimer(
+            typeId = selectedTypeId,
+            comment = "",
+            tags = listOfNotNull(tagId.takeUnless { it == 0L }).map {
+                RecordBase.Tag(
+                    tagId = it,
+                    numericValue = tagValue,
+                )
+            },
+        )
+    }
+
     private suspend fun update(
         from: NotificationControlsManager.From,
         typesShift: Int,
         tagsShift: Int = 0,
         selectedTypeId: Long = 0,
+        selectedTagId: Long = 0,
+        autoCancel: Boolean = false,
     ) {
         when (from) {
             is NotificationControlsManager.From.ActivityNotification -> {
@@ -130,6 +190,8 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
                     typesShift = typesShift,
                     tagsShift = tagsShift,
                     selectedTypeId = selectedTypeId,
+                    selectedTagId = selectedTagId,
+                    autoCancel = autoCancel,
                 )
             }
             is NotificationControlsManager.From.ActivitySwitch -> {

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/interactor/NotificationTypeInteractorImpl.kt

@@ -56,11 +56,20 @@ class NotificationTypeInteractorImpl @Inject constructor(
         typesShift: Int,
         tagsShift: Int,
         selectedTypeId: Long,
+        selectedTagId: Long,
+        autoCancel: Boolean,
     ) {
-        if (!prefsInteractor.getShowNotifications()) return
+        if (!prefsInteractor.getShowNotifications()) {
+            hide(typeId)
+            return
+        }
 
         val recordType = recordTypeInteractor.get(typeId)
         val runningRecord = runningRecordInteractor.get(typeId)
+        if (runningRecord == null) {
+            hide(typeId)
+            return
+        }
         val recordTags = recordTagInteractor.getAll()
         val isDarkTheme = prefsInteractor.getDarkMode()
         val useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat()
@@ -122,6 +131,8 @@ class NotificationTypeInteractorImpl @Inject constructor(
                 tags = viewedTags,
                 tagsShift = tagsShift,
                 selectedTypeId = selectedTypeId,
+                selectedTagId = selectedTagId,
+                autoCancel = autoCancel,
                 goals = goals,
                 allDailyCurrents = allDailyCurrents,
             )
@@ -132,7 +143,7 @@ class NotificationTypeInteractorImpl @Inject constructor(
         show(
             recordType = recordType,
             goal = goalTime,
-            runningRecord = runningRecord ?: return,
+            runningRecord = runningRecord,
             recordTags = recordTags.filter { it.id in runningRecord.tagIds },
             dailyCurrent = getCurrentRecordsDurationInteractor.getDailyCurrent(runningRecord),
             isDarkTheme = isDarkTheme,