add week to records calendar range

Author: Razeeman

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

@@ -8,7 +8,9 @@ import com.example.util.simpletimetracker.core.provider.LocaleProvider
 import com.example.util.simpletimetracker.core.repo.BaseResourceRepo
 import com.example.util.simpletimetracker.domain.base.CurrentTimestampProvider
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.extension.padDuration
+import com.example.util.simpletimetracker.domain.extension.rotateLeft
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import java.text.SimpleDateFormat
@@ -680,6 +682,24 @@ class TimeMapper @Inject constructor(
             .let(::toDayOfWeek)
     }
 
+    fun getWeekOrder(
+        firstDayOfWeek: DayOfWeek,
+    ): List<DayOfWeek> {
+        return listOf(
+            DayOfWeek.MONDAY,
+            DayOfWeek.TUESDAY,
+            DayOfWeek.WEDNESDAY,
+            DayOfWeek.THURSDAY,
+            DayOfWeek.FRIDAY,
+            DayOfWeek.SATURDAY,
+            DayOfWeek.SUNDAY,
+        ).let { list ->
+            list.indexOf(firstDayOfWeek)
+                .takeUnless { it == -1 }.orZero()
+                .let(list::rotateLeft)
+        }
+    }
+
     fun getFormattedDateTime(
         time: Long,
         useMilitaryTime: Boolean,

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

@@ -1,40 +1,81 @@
 package com.example.util.simpletimetracker.core.mapper
 
+import com.example.util.simpletimetracker.domain.base.CurrentTimestampProvider
+import com.example.util.simpletimetracker.domain.daysOfWeek.mapper.DaysInCalendarMapper
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DaysInCalendar
+import com.example.util.simpletimetracker.domain.extension.orZero
+import java.util.Calendar
 import javax.inject.Inject
 import kotlin.math.ceil
 
-class CalendarToListShiftMapper @Inject constructor() {
+class CalendarToListShiftMapper @Inject constructor(
+    private val timeMapper: TimeMapper,
+    private val daysInCalendarMapper: DaysInCalendarMapper,
+    private val currentTimestampProvider: CurrentTimestampProvider,
+) {
 
-    fun mapCalendarToListShift(calendarShift: Int, calendarDayCount: Int): CalendarRange {
+    fun mapCalendarToListShift(
+        calendarShift: Int,
+        daysInCalendar: DaysInCalendar,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
+    ): CalendarRange {
+        val calendarDayCount = daysInCalendarMapper.mapDaysCount(daysInCalendar)
         if (calendarDayCount == 0) return CalendarRange(0, 0)
 
-        val end = calendarShift * calendarDayCount
+        val weekShift = getWeekShift(
+            daysInCalendar = daysInCalendar,
+            startOfDayShift = startOfDayShift,
+            firstDayOfWeek = firstDayOfWeek,
+        )
+
+        val end = calendarShift * calendarDayCount + weekShift
         val start = end - (calendarDayCount - 1)
 
         return CalendarRange(start, end)
     }
 
-    fun mapListToCalendarShift(listShift: Int, calendarDayCount: Int): Int {
+    fun mapListToCalendarShift(
+        listShift: Int,
+        daysInCalendar: DaysInCalendar,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
+    ): Int {
+        val calendarDayCount = daysInCalendarMapper.mapDaysCount(daysInCalendar)
         if (calendarDayCount == 0) return 0
 
-        return ceil(listShift.toFloat() / calendarDayCount).toInt()
+        val weekShift = getWeekShift(
+            daysInCalendar = daysInCalendar,
+            startOfDayShift = startOfDayShift,
+            firstDayOfWeek = firstDayOfWeek,
+        )
+        val actualListShift = listShift - weekShift
+
+        return ceil(actualListShift.toFloat() / calendarDayCount).toInt()
     }
 
     fun recalculateRangeOnCalendarViewSwitched(
         currentPosition: Int,
         lastListPosition: Int,
         showCalendar: Boolean,
-        daysInCalendar: Int,
+        daysInCalendar: DaysInCalendar,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
     ): Int {
         return if (showCalendar) {
             mapListToCalendarShift(
                 listShift = currentPosition,
-                calendarDayCount = daysInCalendar,
+                daysInCalendar = daysInCalendar,
+                startOfDayShift = startOfDayShift,
+                firstDayOfWeek = firstDayOfWeek,
             )
         } else {
             val calendarRange = mapCalendarToListShift(
                 calendarShift = currentPosition,
-                calendarDayCount = daysInCalendar,
+                daysInCalendar = daysInCalendar,
+                startOfDayShift = startOfDayShift,
+                firstDayOfWeek = firstDayOfWeek,
             )
             if (lastListPosition in (calendarRange.start..calendarRange.end)) {
                 lastListPosition
@@ -46,20 +87,50 @@ class CalendarToListShiftMapper @Inject constructor() {
 
     fun recalculateRangeOnCalendarDaysChanged(
         currentPosition: Int,
-        currentDaysInCalendar: Int,
-        newDaysInCalendar: Int,
+        currentDaysInCalendar: DaysInCalendar,
+        newDaysInCalendar: DaysInCalendar,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
     ): Int {
         // Find another range that contains last day of current range.
         val listPosition = mapCalendarToListShift(
             calendarShift = currentPosition,
-            calendarDayCount = currentDaysInCalendar,
+            daysInCalendar = currentDaysInCalendar,
+            startOfDayShift = startOfDayShift,
+            firstDayOfWeek = firstDayOfWeek,
         ).end
         return mapListToCalendarShift(
             listShift = listPosition,
-            calendarDayCount = newDaysInCalendar,
+            daysInCalendar = newDaysInCalendar,
+            startOfDayShift = startOfDayShift,
+            firstDayOfWeek = firstDayOfWeek,
         )
     }
 
+    // How many days until week end.
+    // Week starts on Monday, today Tuesday, result 5.
+    // Week starts on Monday, today Monday, result 6.
+    // Week starts on Monday, today Sunday, result 0.
+    private fun getWeekShift(
+        daysInCalendar: DaysInCalendar,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
+    ): Int {
+        return if (daysInCalendar == DaysInCalendar.WEEK) {
+            val weekOrder = timeMapper.getWeekOrder(firstDayOfWeek)
+            val currentDayOfWeek = timeMapper.getDayOfWeek(
+                timestamp = currentTimestampProvider.get(),
+                calendar = Calendar.getInstance(),
+                startOfDayShift = startOfDayShift,
+            )
+            weekOrder.size - weekOrder.indexOf(currentDayOfWeek).takeUnless { it == -1 }.orZero() - 1
+        } else {
+            0
+        }
+    }
+
+    // Values are days from today.
+    // -6:0 last 7 days, 1:7 next 7 days.
     data class CalendarRange(
         val start: Int,
         val end: Int,