add selected day title to wear statistics

Author: Razeeman

app/src/main/java/com/example/util/simpletimetracker/di/AppModuleBinds.kt

@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker.di
 
-import com.example.util.simpletimetracker.core.common.repo.BaseResourceRepo
+import com.example.util.simpletimetracker.core.repo.BaseResourceRepo
 import com.example.util.simpletimetracker.core.interactor.GetCurrentDayInteractorImpl
 import com.example.util.simpletimetracker.core.interactor.IsSystemInDarkModeInteractorImpl
 import com.example.util.simpletimetracker.core.interactor.GetUntrackedRecordsInteractorImpl

core/common/build.gradle.kts

@@ -14,6 +14,7 @@ android {
 }
 
 dependencies {
+    api(project(":domain:common"))
     implementation(project(":resources"))
 
     implementation(libs.google.dagger)

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

@@ -0,0 +1,45 @@
+package com.example.util.simpletimetracker.core.extension
+
+import java.util.Calendar
+
+fun Calendar.setToStartOfDay() {
+    set(Calendar.HOUR_OF_DAY, 0)
+    set(Calendar.MINUTE, 0)
+    set(Calendar.SECOND, 0)
+    set(Calendar.MILLISECOND, 0)
+}
+
+fun Calendar.setWeekToFirstDay() {
+    val another = Calendar.getInstance()
+    another.timeInMillis = timeInMillis
+
+    val currentTime = another.timeInMillis
+    // Setting DAY_OF_WEEK have a weird behaviour so as if after that another field is set -
+    // it would reset to current day. Use another calendar to manipulate day of week and get its time.
+    another.set(Calendar.DAY_OF_WEEK, firstDayOfWeek)
+    // If went to future - go back a week
+    if (another.timeInMillis > currentTime) {
+        another.add(Calendar.DATE, -7)
+    }
+
+    timeInMillis = another.timeInMillis
+}
+
+fun Calendar.shift(shift: Long): Calendar {
+    // Example
+    // shift 6h
+    // before 2023-03-26T00:00+01:00[Europe/Amsterdam] DST_OFFSET = 0
+    // after 2023-03-26T07:00+02:00[Europe/Amsterdam] DST_OFFSET = 3600000
+    // need to compensate one hour.
+    val dstOffsetBefore = get(Calendar.DST_OFFSET)
+    timeInMillis += shift
+    val dstOffsetAfter = get(Calendar.DST_OFFSET)
+    timeInMillis += (dstOffsetBefore - dstOffsetAfter)
+    return this
+}
+
+fun Calendar.shiftTimeStamp(timestamp: Long, shift: Long): Long {
+    timeInMillis = timestamp
+    shift(shift)
+    return timeInMillis
+}

core/common/src/main/java/com/example/util/simpletimetracker/core/common/repo/BaseResourceRepo.kt

@@ -0,0 +1,84 @@
+package com.example.util.simpletimetracker.core.mapper
+
+import com.example.util.simpletimetracker.core.common.R
+import com.example.util.simpletimetracker.core.repo.BaseResourceRepo
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.record.model.Range
+import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
+import javax.inject.Inject
+
+class RangeTitleMapper @Inject constructor(
+    private val resourceRepo: BaseResourceRepo,
+    private val timeMapper: TimeMapper,
+) {
+
+    fun mapToTitle(
+        rangeLength: RangeLength,
+        position: Int,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
+        useShortCustomRange: Boolean = false,
+    ): String {
+        return when (rangeLength) {
+            is RangeLength.Day -> timeMapper.toDayTitle(position, startOfDayShift)
+            is RangeLength.Week -> timeMapper.toWeekTitle(position, startOfDayShift, firstDayOfWeek)
+            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, position, startOfDayShift, firstDayOfWeek)
+            is RangeLength.Custom -> if (useShortCustomRange) {
+                mapToSelectRangeName()
+            } else {
+                mapToCustomRangeTitle(rangeLength.range, position, startOfDayShift, firstDayOfWeek)
+            }
+        }
+    }
+
+    fun mapToSelectRangeName(): String {
+        return resourceRepo.getString(R.string.range_custom)
+    }
+
+    private fun mapToCustomRangeTitle(range: Range): String {
+        // Time ended is the end of selected day, meaning the beginning on the next day.
+        return timeMapper.formatDate(range.timeStarted) +
+            " - " +
+            timeMapper.formatDate(range.timeEnded - 1)
+    }
+
+    private fun mapToCustomRangeTitle(
+        range: Range,
+        position: Int,
+        startOfDayShift: Long,
+        firstDayOfWeek: DayOfWeek,
+    ): String {
+        val shiftedRange = timeMapper.getRangeStartAndEnd(
+            rangeLength = RangeLength.Custom(range),
+            shift = position,
+            firstDayOfWeek = firstDayOfWeek,
+            startOfDayShift = startOfDayShift,
+        )
+        return mapToCustomRangeTitle(shiftedRange)
+    }
+
+    fun mapToLastDaysTitle(days: Int): String {
+        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)
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.core.common.mapper
+package com.example.util.simpletimetracker.core.mapper
 
 import javax.inject.Inject
 import kotlin.math.roundToLong

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

@@ -1,12 +1,11 @@
 package com.example.util.simpletimetracker.core.mapper
 
-import com.example.util.simpletimetracker.core.R
-import com.example.util.simpletimetracker.core.common.mapper.CommonTimeMapper
+import com.example.util.simpletimetracker.core.common.R
 import com.example.util.simpletimetracker.core.extension.setToStartOfDay
 import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.extension.shift
 import com.example.util.simpletimetracker.core.provider.LocaleProvider
-import com.example.util.simpletimetracker.core.repo.ResourceRepo
+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.padDuration
@@ -17,12 +16,12 @@ import java.util.Calendar
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import kotlin.math.abs
 
 class TimeMapper @Inject constructor(
     localeProvider: LocaleProvider,
-    private val resourceRepo: ResourceRepo,
+    private val resourceRepo: BaseResourceRepo,
     private val currentTimestampProvider: CurrentTimestampProvider,
-    private val commonTimeMapper: CommonTimeMapper,
 ) {
 
     private val locale: Locale by lazy { localeProvider.get() }
@@ -468,16 +467,56 @@ class TimeMapper @Inject constructor(
             .getActualMaximum(field)
     }
 
+    /**
+     * @param forceSeconds - true 1h 7m 21s, false 1h 7m
+     * @param useProportionalMinutes - true 1.25h
+     */
     fun formatInterval(
         interval: Long,
         forceSeconds: Boolean,
         useProportionalMinutes: Boolean,
     ): String {
-        return commonTimeMapper.formatInterval(
-            interval = interval,
-            forceSeconds = forceSeconds,
-            useProportionalMinutes = useProportionalMinutes,
+        val hourString = resourceRepo.getString(R.string.time_hour)
+        val minuteString = resourceRepo.getString(R.string.time_minute)
+        val secondString = resourceRepo.getString(R.string.time_second)
+
+        val hr: Long = TimeUnit.MILLISECONDS.toHours(
+            abs(interval),
+        )
+        val min: Long = TimeUnit.MILLISECONDS.toMinutes(
+            abs(interval) - TimeUnit.HOURS.toMillis(hr),
+        )
+        val sec: Long = TimeUnit.MILLISECONDS.toSeconds(
+            abs(interval) - TimeUnit.HOURS.toMillis(hr) - TimeUnit.MINUTES.toMillis(min),
         )
+
+        if (useProportionalMinutes) {
+            return formatIntervalProportional(hr, min)
+        }
+
+        val willShowHours: Boolean
+        val willShowMinutes: Boolean
+        val willShowSeconds: Boolean
+
+        if (forceSeconds) {
+            willShowHours = hr != 0L
+            willShowMinutes = willShowHours || min != 0L
+            willShowSeconds = true
+        } else {
+            willShowHours = hr != 0L
+            willShowMinutes = true
+            willShowSeconds = false
+        }
+
+        var res = ""
+        if (willShowHours) res += "$hr$hourString "
+        if (willShowMinutes) res += "$min$minuteString"
+        if (willShowMinutes && willShowSeconds) res += " "
+        if (willShowSeconds) res += "$sec$secondString"
+
+        res = if (interval < 0) "-$res" else res
+
+        return res
     }
 
     @Suppress("unused")
@@ -516,6 +555,15 @@ class TimeMapper @Inject constructor(
         }
     }
 
+    private fun formatIntervalProportional(hr: Long, min: Long): String {
+        val hourString = resourceRepo.getString(R.string.time_hour)
+        val minutesProportion = min / 60f
+        val proportional = hr + minutesProportion
+        val proportionalString = "%.2f".format(proportional)
+
+        return "$proportionalString$hourString"
+    }
+
     fun toDayDateTitle(
         daysFromToday: Int,
         startOfDayShift: Long,