add goal navigation keeping range and shift

Author: Razeeman

app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt

@@ -34,8 +34,6 @@ import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
 import com.example.util.simpletimetracker.utils.clickOnCurrentDate
 import com.example.util.simpletimetracker.utils.clickOnCurrentSelectedDate
-import com.example.util.simpletimetracker.utils.clickOnNextDate
-import com.example.util.simpletimetracker.utils.clickOnPrevDate
 import com.example.util.simpletimetracker.utils.clickOnView
 import com.example.util.simpletimetracker.utils.clickOnViewWithId
 import com.example.util.simpletimetracker.utils.clickOnViewWithText

core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetStatisticsDetailRangeInteractor.kt

@@ -10,15 +10,13 @@ class GetStatisticsDetailRangeInteractor @Inject constructor(
     private val prefsInteractor: PrefsInteractor,
 ) {
 
-    suspend fun execute(): RangeLengthParams {
-        return getRangeLength().toParams()
-    }
-
-    private suspend fun getRangeLength(): RangeLength {
+    suspend fun execute(
+        overrideStatisticsRange: RangeLength? = null,
+    ): RangeLengthParams {
         return if (prefsInteractor.getKeepStatisticsRange()) {
-            prefsInteractor.getStatisticsRange()
+            overrideStatisticsRange ?: prefsInteractor.getStatisticsRange()
         } else {
             prefsInteractor.getStatisticsDetailRange()
-        }
+        }.toParams()
     }
 }

core/src/main/java/com/example/util/simpletimetracker/core/interactor/StatisticsDetailNavigationInteractor.kt

@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterTyp
 import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
 import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
+import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.StatisticsDetailParams
@@ -36,6 +37,7 @@ class StatisticsDetailNavigationInteractor @Inject constructor(
         transitionName: String,
         filterType: ChartFilterType,
         shift: Int,
+        overrideStatisticsRange: RangeLength?,
         sharedElements: Map<Any, String>,
         itemId: Long,
         itemName: String,
@@ -49,7 +51,7 @@ class StatisticsDetailNavigationInteractor @Inject constructor(
                     filterType = filterType,
                     selectedId = itemId,
                 ).let(::listOf).map(RecordsFilter::toParams),
-                range = getStatisticsDetailRangeInteractor.execute(),
+                range = getStatisticsDetailRangeInteractor.execute(overrideStatisticsRange),
                 shift = shift,
                 preview = StatisticsDetailParams.Preview(
                     name = itemName,
@@ -64,6 +66,7 @@ class StatisticsDetailNavigationInteractor @Inject constructor(
     suspend fun navigateByGoal(
         goalId: Long,
         shift: Int,
+        range: RangeLength?,
     ) {
         val goal = recordTypeGoalInteractor.get(goalId) ?: return
         val isDarkTheme = prefsInteractor.getDarkMode()
@@ -75,6 +78,7 @@ class StatisticsDetailNavigationInteractor @Inject constructor(
                     transitionName = "",
                     filterType = ChartFilterType.ACTIVITY,
                     shift = shift,
+                    overrideStatisticsRange = range,
                     sharedElements = emptyMap(),
                     itemId = type.id,
                     itemName = type.name,
@@ -91,6 +95,7 @@ class StatisticsDetailNavigationInteractor @Inject constructor(
                     transitionName = "",
                     filterType = ChartFilterType.CATEGORY,
                     shift = shift,
+                    overrideStatisticsRange = range,
                     sharedElements = emptyMap(),
                     itemId = category.id,
                     itemName = category.name,
@@ -108,6 +113,7 @@ class StatisticsDetailNavigationInteractor @Inject constructor(
                     transitionName = "",
                     filterType = ChartFilterType.RECORD_TAG,
                     shift = shift,
+                    overrideStatisticsRange = range,
                     sharedElements = emptyMap(),
                     itemId = tag.id,
                     itemName = tag.name,

features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt

@@ -185,6 +185,7 @@ class ChangeCategoryViewModel @Inject constructor(
             transitionName = "",
             filterType = ChartFilterType.CATEGORY,
             shift = 0,
+            overrideStatisticsRange = null,
             sharedElements = emptyMap(),
             itemId = categoryId,
             itemName = preview.name,

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt

@@ -127,6 +127,7 @@ class ChangeRecordViewModel @Inject constructor(
             transitionName = "",
             filterType = ChartFilterType.ACTIVITY,
             shift = 0,
+            overrideStatisticsRange = null,
             sharedElements = emptyMap(),
             itemId = itemId,
             itemName = preview.recordPreview.name,

features/feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/viewModel/ChangeRecordTagViewModel.kt

@@ -309,6 +309,7 @@ class ChangeRecordTagViewModel @Inject constructor(
             transitionName = "",
             filterType = ChartFilterType.RECORD_TAG,
             shift = 0,
+            overrideStatisticsRange = null,
             sharedElements = emptyMap(),
             itemId = recordTagId,
             itemName = preview.name,

features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt

@@ -266,6 +266,7 @@ class ChangeRecordTypeViewModel @Inject constructor(
             transitionName = "",
             filterType = ChartFilterType.ACTIVITY,
             shift = 0,
+            overrideStatisticsRange = null,
             sharedElements = emptyMap(),
             itemId = recordTypeId,
             itemName = preview.name,

features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt

@@ -131,6 +131,7 @@ class ChangeRunningRecordViewModel @Inject constructor(
             transitionName = "",
             filterType = ChartFilterType.ACTIVITY,
             shift = 0,
+            overrideStatisticsRange = null,
             sharedElements = emptyMap(),
             itemId = newTypeId,
             itemName = preview.name,

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/viewModel/RecordQuickActionsViewModel.kt

@@ -123,6 +123,7 @@ class RecordQuickActionsViewModel @Inject constructor(
             transitionName = "",
             filterType = ChartFilterType.ACTIVITY,
             shift = 0,
+            overrideStatisticsRange = null,
             sharedElements = emptyMap(),
             itemId = itemId,
             itemName = preview.name,

features/feature_goals/src/main/java/com/example/util/simpletimetracker/feature_goals/viewModel/GoalsViewModel.kt

@@ -12,12 +12,14 @@ import com.example.util.simpletimetracker.core.extension.shiftTimeStamp
 import com.example.util.simpletimetracker.core.interactor.StatisticsDetailNavigationInteractor
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.model.NavigationTab
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.recordType.extension.toRangeLength
+import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeGoalInteractor
+import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData
 import com.example.util.simpletimetracker.feature_base_adapter.statisticsGoal.StatisticsGoalViewData
 import com.example.util.simpletimetracker.feature_goals.interactor.GoalsViewDataInteractor
-import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialogType
@@ -36,6 +38,7 @@ class GoalsViewModel @Inject constructor(
     private val router: Router,
     private val prefsInteractor: PrefsInteractor,
     private val timeMapper: TimeMapper,
+    private val recordTypeGoalInteractor: RecordTypeGoalInteractor,
     val dateSelectorViewModelDelegate: DateSelectorViewModelDelegate,
 ) : ViewModel() {
 
@@ -76,9 +79,19 @@ class GoalsViewModel @Inject constructor(
     }
 
     fun onGoalClick(item: StatisticsGoalViewData) = viewModelScope.launch {
+        val goal = recordTypeGoalInteractor.get(item.id) ?: return@launch
+        val rangeShift = if (prefsInteractor.getKeepStatisticsRange()) {
+            goalsViewDataInteractor.getRangeShift(
+                dayShift = currentShift,
+                goalRange = goal.range,
+            )
+        } else {
+            0
+        }
         statisticsDetailNavigationInteractor.navigateByGoal(
             goalId = item.id,
-            shift = 0, // TODO GOAL pass correct shift and range?
+            shift = rangeShift,
+            range = goal.range.toRangeLength() ?: return@launch,
         )
     }