fix date selection opening on wrong day when current time is shifted to another day

Author: Razeeman

core/common/src/main/java/com/example/util/simpletimetracker/core/extension/CalendarExtensions.kt

@@ -54,7 +54,13 @@ fun Calendar.shift(shift: Long): Calendar {
 }
 
 fun Calendar.shiftTimeStamp(timestamp: Long, shift: Long): Long {
+    if (shift == 0L) return timestamp
     timeInMillis = timestamp
     shift(shift)
     return timeInMillis
+}
+
+fun Long.shiftTimeStamp(shift: Long): Long {
+    if (shift == 0L) return this
+    return Calendar.getInstance().shiftTimeStamp(timestamp = this, shift = shift)
 }

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

@@ -129,7 +129,11 @@ class TimeMapper @Inject constructor(
         return shortYearFormat.format(time)
     }
 
-    fun toTimestampShifted(rangesFromToday: Int, range: RangeLength): Long {
+    fun toTimestampShifted(
+        rangesFromToday: Int,
+        range: RangeLength,
+        startOfDayShift: Long = 0,
+    ): Long {
         val calendarStep = when (range) {
             is RangeLength.Day -> Calendar.DAY_OF_YEAR
             is RangeLength.Week -> Calendar.WEEK_OF_YEAR
@@ -140,16 +144,13 @@ class TimeMapper @Inject constructor(
             is RangeLength.Last -> return 0
         }
 
-        return if (rangesFromToday != 0) {
-            Calendar.getInstance()
-                .apply {
-                    timeInMillis = System.currentTimeMillis()
-                    add(calendarStep, rangesFromToday)
-                }
-                .timeInMillis
-        } else {
-            return System.currentTimeMillis()
-        }
+        return Calendar.getInstance()
+            .apply {
+                timeInMillis = System.currentTimeMillis()
+                shift(-startOfDayShift)
+                add(calendarStep, rangesFromToday)
+            }
+            .timeInMillis
     }
 
     fun toTimestampShift(

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsContainerViewModel.kt

@@ -7,6 +7,7 @@ import com.example.util.simpletimetracker.core.delegates.dateSelector.mapper.Dat
 import com.example.util.simpletimetracker.core.delegates.dateSelector.viewModelDelegate.DateSelectorViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.lazySuspend
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.shiftTimeStamp
 import com.example.util.simpletimetracker.core.mapper.CalendarToListShiftMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
@@ -82,11 +83,12 @@ class RecordsContainerViewModel @Inject constructor(
     }
 
     fun onDateTimeSet(timestamp: Long, tag: String?) = viewModelScope.launch {
+        val startOfDayShift = prefsInteractor.getStartOfDayShift()
         when (tag) {
             DATE_TAG -> {
                 timeMapper
                     .toTimestampShift(
-                        toTime = timestamp,
+                        toTime = timestamp.shiftTimeStamp(startOfDayShift),
                         range = RangeLength.Day,
                         firstDayOfWeek = prefsInteractor.getFirstDayOfWeek(),
                     )
@@ -123,9 +125,11 @@ class RecordsContainerViewModel @Inject constructor(
         viewModelScope.launch {
             val useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat()
             val firstDayOfWeek = prefsInteractor.getFirstDayOfWeek()
+            val startOfDayShift = prefsInteractor.getStartOfDayShift()
             val current = timeMapper.toTimestampShifted(
                 rangesFromToday = getActualShift(),
                 range = RangeLength.Day,
+                startOfDayShift = startOfDayShift,
             )
 
             router.navigate(

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

@@ -7,6 +7,7 @@ import androidx.lifecycle.viewModelScope
 import com.example.util.simpletimetracker.core.delegates.dateSelector.mapper.DateSelectorMapper
 import com.example.util.simpletimetracker.core.delegates.dateSelector.viewModelDelegate.DateSelectorViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.shiftTimeStamp
 import com.example.util.simpletimetracker.core.extension.toModel
 import com.example.util.simpletimetracker.core.mapper.RangeViewDataMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
@@ -95,10 +96,11 @@ class StatisticsContainerViewModel @Inject constructor(
     }
 
     fun onDateTimeSet(timestamp: Long, tag: String?) = viewModelScope.launch {
+        val startOfDayShift = prefsInteractor.getStartOfDayShift()
         when (tag) {
             DATE_TAG -> {
                 timeMapper.toTimestampShift(
-                    toTime = timestamp,
+                    toTime = timestamp.shiftTimeStamp(startOfDayShift),
                     range = prefsInteractor.getStatisticsRange(),
                     firstDayOfWeek = prefsInteractor.getFirstDayOfWeek(),
                 ).toInt().let(::updatePosition)
@@ -167,9 +169,11 @@ class StatisticsContainerViewModel @Inject constructor(
     private fun onSelectDateClick() = viewModelScope.launch {
         val useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat()
         val firstDayOfWeek = prefsInteractor.getFirstDayOfWeek()
+        val startOfDayShift = prefsInteractor.getStartOfDayShift()
         val current = timeMapper.toTimestampShifted(
             rangesFromToday = currentPosition,
             range = prefsInteractor.getStatisticsRange(),
+            startOfDayShift = startOfDayShift,
         )
 
         router.navigate(

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

@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate
 
 import com.example.util.simpletimetracker.core.base.ViewModelDelegate
+import com.example.util.simpletimetracker.core.extension.shiftTimeStamp
 import com.example.util.simpletimetracker.core.extension.toModel
 import com.example.util.simpletimetracker.core.interactor.RecordFilterInteractor
 import com.example.util.simpletimetracker.core.mapper.RangeViewDataMapper
@@ -64,10 +65,11 @@ class StatisticsDetailRangeViewModelDelegate @Inject constructor(
     }
 
     fun onDateTimeSet(timestamp: Long, tag: String?) = delegateScope.launch {
+        val startOfDayShift = prefsInteractor.getStartOfDayShift()
         when (tag) {
             DATE_TAG -> {
                 timeMapper.toTimestampShift(
-                    toTime = timestamp,
+                    toTime = timestamp.shiftTimeStamp(startOfDayShift),
                     range = rangeLength,
                     firstDayOfWeek = prefsInteractor.getFirstDayOfWeek(),
                 ).toInt().let(::updatePosition)
@@ -89,9 +91,11 @@ class StatisticsDetailRangeViewModelDelegate @Inject constructor(
     fun onSelectDateClick() = delegateScope.launch {
         val useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat()
         val firstDayOfWeek = prefsInteractor.getFirstDayOfWeek()
+        val startOfDayShift = prefsInteractor.getStartOfDayShift()
         val current = timeMapper.toTimestampShifted(
             rangesFromToday = rangePosition,
             range = rangeLength,
+            startOfDayShift = startOfDayShift,
         )
 
         router.navigate(

wear/src/main/java/com/example/util/simpletimetracker/features/statistics/viewModel/StatisticsViewModel.kt

@@ -68,6 +68,7 @@ class StatisticsViewModel @Inject constructor(
         val timestamp = timeMapper.toTimestampShifted(
             rangesFromToday = shift,
             range = rangeLength,
+            // TODO start of day shift?
         )
         _effects.emit(Effect.OnOpenDatePicker(timestamp))
     }