add prev next buttons to wear statistics

Author: Razeeman

…tracker/core/common/mapper/TimeMapper.kt …r/core/common/mapper/CommonTimeMapper.ktcore/common/src/main/java/com/example/util/simpletimetracker/core/common/mapper/TimeMapper.kt renamed to core/common/src/main/java/com/example/util/simpletimetracker/core/common/mapper/CommonTimeMapper.kt core/common/src/main/java/com/example/util/simpletimetracker/core/common/mapper/TimeMapper.kt renamed to core/common/src/main/java/com/example/util/simpletimetracker/core/common/mapper/CommonTimeMapper.kt

@@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.abs
 
-class TimeMapper @Inject constructor(
+class CommonTimeMapper @Inject constructor(
     private val resourceRepo: BaseResourceRepo,
 ) {
 

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

@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.core.mapper
 
 import com.example.util.simpletimetracker.core.R
-import com.example.util.simpletimetracker.core.common.mapper.TimeMapper
+import com.example.util.simpletimetracker.core.common.mapper.CommonTimeMapper
 import com.example.util.simpletimetracker.core.extension.setToStartOfDay
 import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.extension.shift
@@ -22,7 +22,7 @@ class TimeMapper @Inject constructor(
     localeProvider: LocaleProvider,
     private val resourceRepo: ResourceRepo,
     private val currentTimestampProvider: CurrentTimestampProvider,
-    private val commonTimeMapper: TimeMapper,
+    private val commonTimeMapper: CommonTimeMapper,
 ) {
 
     private val locale: Locale by lazy { localeProvider.get() }

core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperGetRangeStartAndEndTest.kt

@@ -1,5 +1,6 @@
 package com.example.util.simpletimetracker.core.mapper
 
+import com.example.util.simpletimetracker.core.common.mapper.CommonTimeMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.commonTimeMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.currentTimestampProvider
 import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.hourInMs
@@ -23,7 +24,6 @@ import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import java.util.TimeZone
 import java.util.concurrent.TimeUnit
-import com.example.util.simpletimetracker.core.common.mapper.TimeMapper as CommonTimeMapper
 
 @RunWith(Enclosed::class)
 class TimeMapperGetRangeStartAndEndTest {

core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperTest.kt

@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.core.mapper
 
 import com.example.util.simpletimetracker.core.R
-import com.example.util.simpletimetracker.core.common.mapper.TimeMapper
+import com.example.util.simpletimetracker.core.common.mapper.CommonTimeMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.hourInMs
 import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.localeProvider
 import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.minuteInMs
@@ -51,7 +51,7 @@ class TimeMapperTest {
         fun formatInterval() {
             `when`(localeProvider.get()).thenReturn(Locale.getDefault())
 
-            val subject = TimeMapper(
+            val subject = CommonTimeMapper(
                 resourceRepo = resourceRepo,
             )
 
@@ -103,7 +103,7 @@ class TimeMapperTest {
         fun formatInterval() {
             `when`(localeProvider.get()).thenReturn(Locale.getDefault())
 
-            val subject = TimeMapper(
+            val subject = CommonTimeMapper(
                 resourceRepo = resourceRepo,
             )
 
@@ -169,7 +169,7 @@ class TimeMapperTest {
         fun formatInterval() {
             `when`(localeProvider.get()).thenReturn(Locale.getDefault())
 
-            val subject = TimeMapper(
+            val subject = CommonTimeMapper(
                 resourceRepo = resourceRepo,
             )
 

core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperTitleTest.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.common.mapper.CommonTimeMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.commonTimeMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.currentTimestampProvider
 import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.hourInMs
@@ -23,7 +24,6 @@ import org.mockito.Mockito.`when`
 import java.util.Locale
 import java.util.TimeZone
 import java.util.concurrent.TimeUnit
-import com.example.util.simpletimetracker.core.common.mapper.TimeMapper as CommonTimeMapper
 
 @RunWith(Enclosed::class)
 class TimeMapperTitleTest {

wear/src/main/java/com/example/util/simpletimetracker/features/statistics/mapper/StatisticsViewDataMapper.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.toArgb
 import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.core.ErrorStateMapper
 import com.example.util.simpletimetracker.core.common.mapper.StatisticsMapper
-import com.example.util.simpletimetracker.core.common.mapper.TimeMapper
+import com.example.util.simpletimetracker.core.common.mapper.CommonTimeMapper
 import com.example.util.simpletimetracker.data.WearIconMapper
 import com.example.util.simpletimetracker.data.WearResourceRepo
 import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID
@@ -25,7 +25,7 @@ import javax.inject.Inject
 class StatisticsViewDataMapper @Inject constructor(
     private val wearIconMapper: WearIconMapper,
     private val resourceRepo: WearResourceRepo,
-    private val timeMapper: TimeMapper,
+    private val timeMapper: CommonTimeMapper,
     private val statisticsMapper: StatisticsMapper,
     private val errorStateMapper: ErrorStateMapper,
 ) {

wear/src/main/java/com/example/util/simpletimetracker/features/statistics/screen/StatisticsList.kt

@@ -17,6 +17,7 @@ import androidx.wear.compose.material.Text
 import androidx.wear.tooling.preview.devices.WearDevices
 import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.domain.model.WearActivityIcon
+import com.example.util.simpletimetracker.features.statistics.ui.StatisticsButtons
 import com.example.util.simpletimetracker.features.statistics.ui.StatisticsChip
 import com.example.util.simpletimetracker.features.statistics.ui.StatisticsChipState
 import com.example.util.simpletimetracker.presentation.layout.ScaffoldedScrollingColumn
@@ -53,6 +54,8 @@ sealed interface StatisticsListState {
 fun StatisticsList(
     state: StatisticsListState,
     onRefresh: () -> Unit = {},
+    onPrevClick: () -> Unit = {},
+    onNextClick: () -> Unit = {},
 ) {
     ScaffoldedScrollingColumn {
         when (state) {
@@ -65,30 +68,56 @@ fun StatisticsList(
                     onRefresh = onRefresh,
                 )
             }
-            is StatisticsListState.Empty -> item {
-                RenderEmptyState(state)
+            is StatisticsListState.Empty -> {
+                renderEmptyState(
+                    state = state,
+                    onPrevClick = onPrevClick,
+                    onNextClick = onNextClick,
+                )
             }
             is StatisticsListState.Content -> {
-                renderContent(state)
+                renderContent(
+                    state = state,
+                    onPrevClick = onPrevClick,
+                    onNextClick = onNextClick,
+                )
             }
         }
     }
 }
 
-@Composable
-private fun RenderEmptyState(
+private fun ScalingLazyListScope.renderEmptyState(
     state: StatisticsListState.Empty,
+    onPrevClick: () -> Unit,
+    onNextClick: () -> Unit,
 ) {
-    Text(
-        text = getString(state.messageResId),
-        modifier = Modifier.padding(8.dp),
-    )
+    item { Spacer(Modifier) }
+    item {
+        StatisticsButtons(
+            onPrevClick = onPrevClick,
+            onNextClick = onNextClick,
+        )
+    }
+    item {
+        Text(
+            text = getString(state.messageResId),
+            modifier = Modifier.padding(8.dp),
+        )
+    }
 }
 
 private fun ScalingLazyListScope.renderContent(
     state: StatisticsListState.Content,
+    onPrevClick: () -> Unit,
+    onNextClick: () -> Unit,
 ) {
     item { Spacer(Modifier) }
+    item {
+        StatisticsButtons(
+            onPrevClick = onPrevClick,
+            onNextClick = onNextClick,
+        )
+    }
     for (itemState in state.items) {
         when (itemState) {
             is StatisticsListState.Content.Item.Statistics -> {

wear/src/main/java/com/example/util/simpletimetracker/features/statistics/screen/StatisticsScreen.kt

@@ -20,5 +20,7 @@ fun StatisticsScreen() {
     StatisticsList(
         state = state,
         onRefresh = viewModel::onRefresh,
+        onPrevClick = viewModel::onPrevClick,
+        onNextClick = viewModel::onNextClick,
     )
 }

wear/src/main/java/com/example/util/simpletimetracker/features/statistics/ui/StatisticsButtons.kt

@@ -0,0 +1,71 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+package com.example.util.simpletimetracker.features.statistics.ui
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.layout.Row
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.wear.compose.material.Button
+import androidx.wear.compose.material.ButtonDefaults
+import androidx.wear.compose.material.Icon
+import androidx.wear.tooling.preview.devices.WearDevices
+import com.example.util.simpletimetracker.R
+import com.example.util.simpletimetracker.presentation.theme.ColorInactive
+
+@Composable
+fun StatisticsButtons(
+    onPrevClick: () -> Unit = {},
+    onNextClick: () -> Unit = {},
+) {
+    Row {
+        StatisticsButton(
+            modifier = Modifier.weight(1f),
+            iconResId = R.drawable.wear_arrow_left,
+            onClick = onPrevClick,
+        )
+        StatisticsButton(
+            modifier = Modifier.weight(1f),
+            iconResId = R.drawable.wear_arrow_right,
+            onClick = onNextClick,
+        )
+    }
+}
+
+@Composable
+private fun StatisticsButton(
+    modifier: Modifier,
+    @DrawableRes iconResId: Int,
+    onClick: () -> Unit = {},
+) {
+    Button(
+        modifier = modifier,
+        onClick = onClick,
+        content = {
+            Icon(
+                painter = painterResource(iconResId),
+                contentDescription = null,
+            )
+        },
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = ColorInactive,
+        ),
+    )
+}
+
+@Preview(device = WearDevices.LARGE_ROUND)
+@Composable
+private fun Preview() {
+    StatisticsButtons()
+}
+
+@Preview(device = WearDevices.LARGE_ROUND, fontScale = 2f)
+@Composable
+private fun PreviewFontScale() {
+    StatisticsButtons()
+}

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

@@ -28,6 +28,7 @@ class StatisticsViewModel @Inject constructor(
     private val _state: MutableStateFlow<StatisticsListState> = MutableStateFlow(StatisticsListState.Loading)
 
     private var isInitialized = false
+    private var shift: Int = 0
 
     fun init() {
         if (isInitialized) return
@@ -39,11 +40,21 @@ class StatisticsViewModel @Inject constructor(
         loadData()
     }
 
+    fun onPrevClick() = viewModelScope.launch {
+        shift -= 1
+        loadData()
+    }
+
+    fun onNextClick() = viewModelScope.launch {
+        shift += 1
+        loadData()
+    }
+
     private suspend fun loadData() {
         val filterType = WearChartFilterType.ACTIVITY
         val statistics = wearDataRepo.loadStatistics(
             forceReload = true,
-            shift = 0,
+            shift = shift,
             filterType = filterType,
         )