add widget update on goal change

Razeeman · Oct 28, 2023 · c9d27d0 · c9d27d0
1 parent 174896d
commit c9d27d0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/...n/src/main/java/com/example/util/simpletimetracker/domain/interactor/AddRecordMediator.kt b/...n/src/main/java/com/example/util/simpletimetracker/domain/interactor/AddRecordMediator.kt
@@ -21,6 +21,11 @@ class AddRecordMediator @Inject constructor(
     suspend fun doAfterAdd(typeId: Long) {
         notificationTypeInteractor.checkAndShow(typeId)
         notificationGoalTimeInteractor.checkAndReschedule(typeId)
-        widgetInteractor.updateWidgets(listOf(WidgetType.STATISTICS_CHART))
+        widgetInteractor.updateWidgets(
+            listOf(
+                WidgetType.STATISTICS_CHART,
+                WidgetType.RECORD_TYPE,
+            ),
+        )
     }
 }
diff --git a/...rc/main/java/com/example/util/simpletimetracker/domain/interactor/RemoveRecordMediator.kt b/...rc/main/java/com/example/util/simpletimetracker/domain/interactor/RemoveRecordMediator.kt
@@ -18,6 +18,11 @@ class RemoveRecordMediator @Inject constructor(
     suspend fun doAfterRemove(typeId: Long) {
         notificationTypeInteractor.checkAndShow(typeId)
         notificationGoalTimeInteractor.checkAndReschedule(typeId)
-        widgetInteractor.updateWidgets(listOf(WidgetType.STATISTICS_CHART))
+        widgetInteractor.updateWidgets(
+            listOf(
+                WidgetType.STATISTICS_CHART,
+                WidgetType.RECORD_TYPE,
+            ),
+        )
     }
 }
diff --git a/...m/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt b/...m/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt
@@ -107,11 +107,11 @@ class ChangeRecordViewModel @Inject constructor(
             comment = newComment,
             tagIds = newCategoryIds
         ).let {
+            addRecordMediator.add(it)
             if (newTypeId != originalTypeId) {
                 notificationTypeInteractor.checkAndShow(originalTypeId)
                 notificationGoalTimeInteractor.checkAndReschedule(originalTypeId)
             }
-            addRecordMediator.add(it)
             router.back()
         }
     }

diff --git a/...imetracker/feature_notification/goalTime/interactor/NotificationGoalTimeInteractorImpl.kt b/...imetracker/feature_notification/goalTime/interactor/NotificationGoalTimeInteractorImpl.kt
@@ -10,7 +10,9 @@ import com.example.util.simpletimetracker.domain.interactor.NotificationGoalTime
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeGoalInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.domain.interactor.RunningRecordInteractor
+import com.example.util.simpletimetracker.domain.interactor.WidgetInteractor
 import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
+import com.example.util.simpletimetracker.domain.model.WidgetType
 import com.example.util.simpletimetracker.feature_notification.goalTime.manager.NotificationGoalTimeManager
 import com.example.util.simpletimetracker.feature_notification.goalTime.scheduler.NotificationGoalTimeScheduler
 import com.example.util.simpletimetracker.feature_notification.goalTime.scheduler.NotificationRangeEndScheduler
@@ -27,6 +29,7 @@ class NotificationGoalTimeInteractorImpl @Inject constructor(
     private val scheduler: NotificationGoalTimeScheduler,
     private val rangeEndScheduler: NotificationRangeEndScheduler,
     private val notificationGoalParamsInteractor: NotificationGoalParamsInteractor,
+    private val widgetInteractor: WidgetInteractor,
 ) : NotificationGoalTimeInteractor {
 
     override suspend fun checkAndReschedule() {
@@ -134,6 +137,8 @@ class NotificationGoalTimeInteractorImpl @Inject constructor(
                 range = goalRange,
                 type = NotificationGoalParamsInteractor.Type.Duration,
             )?.let(manager::show)
+            // TODO update only by typeId, not all widgets.
+            widgetInteractor.updateWidgets(listOf(WidgetType.RECORD_TYPE))
         }
     }
 }
diff --git a/...pletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt b/...pletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt
@@ -106,7 +106,12 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
         delegateScope.launch {
             val newValue = prefsInteractor.getStartOfDayShift() * -1
             prefsInteractor.setStartOfDayShift(newValue)
-            widgetInteractor.updateWidgets(listOf(WidgetType.STATISTICS_CHART))
+            widgetInteractor.updateWidgets(
+                listOf(
+                    WidgetType.STATISTICS_CHART,
+                    WidgetType.RECORD_TYPE,
+                ),
+            )
             notificationTypeInteractor.updateNotifications()
             notificationGoalTimeInteractor.checkAndReschedule()
             updateStartOfDayViewData()
@@ -193,7 +198,12 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
                 val wasPositive = prefsInteractor.getStartOfDayShift() >= 0
                 val newValue = settingsMapper.toStartOfDayShift(timestamp, wasPositive)
                 prefsInteractor.setStartOfDayShift(newValue)
-                widgetInteractor.updateWidgets(listOf(WidgetType.STATISTICS_CHART))
+                widgetInteractor.updateWidgets(
+                    listOf(
+                        WidgetType.STATISTICS_CHART,
+                        WidgetType.RECORD_TYPE,
+                    ),
+                )
                 notificationTypeInteractor.updateNotifications()
                 notificationGoalTimeInteractor.checkAndReschedule()
                 updateStartOfDayViewData()