add ability to swipe between last days range

Author: Razeeman

core/src/main/java/com/example/util/simpletimetracker/core/mapper/RangeViewDataMapper.kt

@@ -60,7 +60,7 @@ class RangeViewDataMapper @Inject constructor(
             is RangeLength.Month -> timeMapper.toMonthTitle(position, startOfDayShift)
             is RangeLength.Year -> timeMapper.toYearTitle(position, startOfDayShift)
             is RangeLength.All -> resourceRepo.getString(R.string.range_overall)
-            is RangeLength.Last -> mapToLastDaysTitle(rangeLength.days)
+            is RangeLength.Last -> mapToLastDaysTitle(rangeLength.days, position, startOfDayShift, firstDayOfWeek)
             is RangeLength.Custom -> if (useShortCustomRange) {
                 mapToSelectRangeName()
             } else {
@@ -142,6 +142,24 @@ class RangeViewDataMapper @Inject constructor(
         return resourceRepo.getQuantityString(R.plurals.range_last, days, days)
     }
 
+    private fun mapToLastDaysTitle(
+        days: Int,
+        position: Int,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
+    ): String {
+        return if (position == 0) {
+            mapToLastDaysTitle(days)
+        } else {
+            timeMapper.getRangeStartAndEnd(
+                rangeLength = RangeLength.Last(days),
+                shift = position,
+                firstDayOfWeek = firstDayOfWeek,
+                startOfDayShift = startOfDayShift,
+            ).let(::mapToCustomRangeTitle)
+        }
+    }
+
     companion object {
         private val ranges: List<RangeLength> = listOf(
             RangeLength.All,

core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt

@@ -436,6 +436,7 @@ class TimeMapper @Inject constructor(
             }
 
             is RangeLength.Last -> {
+                calendar.add(Calendar.DATE, shift * rangeLength.days)
                 rangeEnd = calendar.apply { add(Calendar.DATE, 1) }.timeInMillis
                 rangeStart = calendar.apply { add(Calendar.DATE, -rangeLength.days) }.timeInMillis
             }

domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/extension/StatisticsExtensions.kt

@@ -0,0 +1,12 @@
+package com.example.util.simpletimetracker.domain.statistics.extension
+
+import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
+
+fun RangeLength.canBeSwiped(): Boolean {
+    return when (this) {
+        is RangeLength.All,
+        is RangeLength.Custom,
+        -> false
+        else -> true
+    }
+}

domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/RangeLength.kt

@@ -3,11 +3,11 @@ package com.example.util.simpletimetracker.domain.statistics.model
 import com.example.util.simpletimetracker.domain.record.model.Range
 
 sealed class RangeLength {
-    object Day : RangeLength()
-    object Week : RangeLength()
-    object Month : RangeLength()
-    object Year : RangeLength()
-    object All : RangeLength()
+    data object Day : RangeLength()
+    data object Week : RangeLength()
+    data object Month : RangeLength()
+    data object Year : RangeLength()
+    data object All : RangeLength()
     data class Custom(val range: Range) : RangeLength()
     data class Last(val days: Int) : RangeLength()
 }

features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsContainerViewModel.kt

@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.core.viewData.SelectLastDaysViewData
 import com.example.util.simpletimetracker.core.viewData.SelectRangeViewData
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.statistics.extension.canBeSwiped
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.feature_views.spinner.CustomSpinner
 import com.example.util.simpletimetracker.navigation.Router
@@ -196,10 +197,7 @@ class StatisticsContainerViewModel @Inject constructor(
     }
 
     private suspend fun loadNavButtonsVisibility(): Boolean {
-        return when (getRangeLength()) {
-            is RangeLength.All, is RangeLength.Custom, is RangeLength.Last -> false
-            else -> true
-        }
+        return getRangeLength().canBeSwiped()
     }
 
     companion object {

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailRangeViewModelDelegate.kt

@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteracto
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.domain.statistics.extension.canBeSwiped
 import com.example.util.simpletimetracker.feature_views.spinner.CustomSpinner
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.CustomRangeSelectionParams
@@ -217,13 +218,7 @@ class StatisticsDetailRangeViewModelDelegate @Inject constructor(
     }
 
     private fun loadButtonsVisibility(): Boolean {
-        return when (rangeLength) {
-            is RangeLength.All,
-            is RangeLength.Custom,
-            is RangeLength.Last,
-            -> false
-            else -> true
-        }
+        return rangeLength.canBeSwiped()
     }
 
     companion object {