fix first day of week

Author: Razeeman

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

@@ -16,6 +16,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
 import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import com.example.util.simpletimetracker.utils.BaseUiTest
@@ -571,7 +572,7 @@ class SettingsTest : BaseUiTest() {
             .apply {
                 val recordDay = if (isTodaySunday) Calendar.MONDAY else Calendar.SUNDAY
                 firstDayOfWeek = recordDay
-                set(Calendar.DAY_OF_WEEK, recordDay)
+                setWeekToFirstDay()
                 set(Calendar.HOUR_OF_DAY, 15)
             }
         testUtils.addRecord(

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

@@ -9,6 +9,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils
@@ -695,7 +696,7 @@ class StatisticsRangesTest : BaseUiTest() {
             set(Calendar.MINUTE, 0)
             set(Calendar.SECOND, 0)
             set(Calendar.MILLISECOND, 0)
-            set(Calendar.DAY_OF_WEEK, firstDayOfWeek)
+            setWeekToFirstDay()
         }
         val rangeStart = calendar.timeInMillis
         val rangeEnd = calendar.apply { add(Calendar.DATE, 6) }.timeInMillis

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

@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.core.extension
 import android.os.StrictMode
 import com.example.util.simpletimetracker.domain.model.Record
 import com.example.util.simpletimetracker.navigation.params.TypesFilterParams
+import java.util.Calendar
 
 inline fun <T, R> T.allowDiskWrite(block: T.() -> R): R {
     val oldPolicy = StrictMode.allowThreadDiskWrites()
@@ -18,4 +19,13 @@ fun Record.isNotFiltered(filter: TypesFilterParams): Boolean {
         .filterIsInstance<TypesFilterParams.FilteredRecordTag.Tagged>().map { it.id }) ||
         (tagId == 0L && typeId !in filter.filteredRecordTags
             .filterIsInstance<TypesFilterParams.FilteredRecordTag.Untagged>().map { it.typeId })
+}
+
+fun Calendar.setWeekToFirstDay() {
+    val currentTime = timeInMillis
+    set(Calendar.DAY_OF_WEEK, firstDayOfWeek)
+    // If went to future - go back a week
+    if (timeInMillis > currentTime) {
+        add(Calendar.DATE, -7)
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.core.mapper
 
 import com.example.util.simpletimetracker.core.R
+import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.model.RangeLength
@@ -308,7 +309,7 @@ class TimeMapper @Inject constructor(
                 rangeEnd = calendar.apply { add(Calendar.DATE, 1) }.timeInMillis
             }
             RangeLength.WEEK -> {
-                calendar.set(Calendar.DAY_OF_WEEK, calendar.firstDayOfWeek)
+                calendar.setWeekToFirstDay()
                 calendar.add(Calendar.DATE, shift * 7)
                 rangeStart = calendar.timeInMillis
                 rangeEnd = calendar.apply { add(Calendar.DATE, 7) }.timeInMillis
@@ -386,7 +387,7 @@ class TimeMapper @Inject constructor(
             set(Calendar.MINUTE, 0)
             set(Calendar.SECOND, 0)
             set(Calendar.MILLISECOND, 0)
-            set(Calendar.DAY_OF_WEEK, this.firstDayOfWeek)
+            calendar.setWeekToFirstDay()
             add(Calendar.DATE, weeksFromToday * 7)
         }
         val rangeStart = calendar.timeInMillis

feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailChartInteractor.kt

@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.feature_statistics_detail.interactor
 
 import com.example.util.simpletimetracker.core.extension.isNotFiltered
+import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.interactor.TypesFilterInteractor
 import com.example.util.simpletimetracker.core.mapper.RangeMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
@@ -208,7 +209,7 @@ class StatisticsDetailChartInteractor @Inject constructor(
                 set(Calendar.SECOND, 0)
                 set(Calendar.MILLISECOND, 0)
             }
-            calendar.set(Calendar.DAY_OF_WEEK, calendar.firstDayOfWeek)
+            calendar.setWeekToFirstDay()
             calendar.add(Calendar.DATE, -shift * 7)
 
             val legend = timeMapper.formatShortMonth(calendar.timeInMillis)