add slider to split record action

Razeeman · Oct 26, 2024 · f45288b · f45288b
1 parent fee6ed3
commit f45288b
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 23 deletions.
diff --git a/...util/simpletimetracker/feature_change_record/adapter/ChangeRecordSliderAdapterDelegate.kt b/...util/simpletimetracker/feature_change_record/adapter/ChangeRecordSliderAdapterDelegate.kt
@@ -0,0 +1,47 @@
+package com.example.util.simpletimetracker.feature_change_record.adapter
+
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
+import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordActionsBlock
+import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordSliderViewData as ViewData
+import com.example.util.simpletimetracker.feature_change_record.databinding.ChangeRecordSliderItemBinding as Binding
+
+fun createChangeRecordSliderAdapterDelegate(
+    onValueChanged: (ViewData, Float) -> Unit,
+) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
+    Binding::inflate,
+) { binding, item, _ ->
+
+    with(binding) {
+        item as ViewData
+        // To avoid illegal state exception.
+        val actualMax = item.max.coerceAtLeast(item.min + 1)
+
+        root.tag = item.block
+        if (item.min != sliderChangeRecordItem.valueFrom) {
+            sliderChangeRecordItem.valueFrom = item.min
+        }
+        if (item.max != sliderChangeRecordItem.valueTo) {
+            sliderChangeRecordItem.valueTo = actualMax
+        }
+        if (item.value != sliderChangeRecordItem.value) {
+            sliderChangeRecordItem.value = item.value
+        }
+        sliderChangeRecordItem.addOnChangeListener { _, value, fromUser ->
+            if (fromUser) onValueChanged(item, value)
+        }
+    }
+}
+
+data class ChangeRecordSliderViewData(
+    val block: ChangeRecordActionsBlock,
+    val min: Float,
+    val max: Float,
+    val value: Float,
+) : ViewHolderType {
+
+    override fun getUniqueId(): Long = block.ordinal.toLong()
+
+    override fun isValidType(other: ViewHolderType): Boolean =
+        other is ViewData
+}
diff --git a/...om/example/util/simpletimetracker/feature_change_record/model/ChangeRecordActionsBlock.kt b/...om/example/util/simpletimetracker/feature_change_record/model/ChangeRecordActionsBlock.kt
@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_change_record.model
 enum class ChangeRecordActionsBlock {
     SplitTimePreview,
     SplitTimeAdjustment,
+    SplitSlider,
     SplitButton,
 
     AdjustTimePreview,

diff --git a/...in/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt b/...in/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
@@ -34,6 +34,7 @@ import com.example.util.simpletimetracker.feature_change_record.adapter.createCh
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordChangePreviewAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordCommentAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordCommentFieldAdapterDelegate
+import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordSliderAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordTimeAdjustmentAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordTimeDoublePreviewAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordTimePreviewAdapterDelegate
@@ -114,6 +115,7 @@ class ChangeRecordCore(
             ),
             createChangeRecordTimeAdjustmentAdapterDelegate(viewModel::onTimeAdjustmentClick),
             createChangeRecordButtonAdapterDelegate(viewModel::onItemButtonClick),
+            createChangeRecordSliderAdapterDelegate(viewModel::onSliderValueChanged)
         )
     }
 

diff --git a/...util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDelegateImpl.kt b/...util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDelegateImpl.kt
@@ -10,6 +10,7 @@ import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRe
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimeDoublePreviewViewData
 import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordActionsBlock
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -22,6 +23,7 @@ class ChangeRecordActionsDelegateImpl @Inject constructor(
     val timeChangeAdjustmentState get() = delegateHolder.adjustDelegate.timeChangeAdjustmentState
 
     private var parent: ChangeRecordActionsDelegate.Parent? = null
+    private var updateJob: Job? = null
 
     fun attach(parent: ChangeRecordActionsDelegate.Parent) {
         this.parent = parent
@@ -36,8 +38,11 @@ class ChangeRecordActionsDelegateImpl @Inject constructor(
     }
 
     fun updateData() {
-        delegateHolder.delegatesList.forEach { delegate ->
-            delegateScope.launch { delegate.updateViewData() }
+        updateJob?.cancel()
+        updateJob = delegateScope.launch {
+            delegateHolder.delegatesList.forEach { delegate ->
+                launch { delegate.updateViewData() }
+            }
         }
     }
 

diff --git a/...til/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsSplitDelegate.kt b/...til/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsSplitDelegate.kt
@@ -8,14 +8,18 @@ import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
 import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordButtonViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData
+import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordSliderViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimeAdjustmentViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimePreviewViewData
 import com.example.util.simpletimetracker.feature_change_record.interactor.ChangeRecordViewDataInteractor
 import com.example.util.simpletimetracker.feature_change_record.mapper.ChangeRecordViewDataMapper
 import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordActionsBlock
 import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordDateTimeFieldsState
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordPreview
+import kotlinx.coroutines.coroutineScope
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import kotlinx.coroutines.ensureActive
 
 class ChangeRecordActionsSplitDelegate @Inject constructor(
     private val resourceRepo: ResourceRepo,
@@ -36,8 +40,11 @@ class ChangeRecordActionsSplitDelegate @Inject constructor(
     }
 
     override suspend fun updateViewData() {
-        viewData = loadViewData()
-        parent?.update()
+        coroutineScope {
+            viewData = loadViewData()
+            ensureActive()
+            parent?.update()
+        }
     }
 
     suspend fun onSplitClickDelegate() {
@@ -76,6 +83,12 @@ class ChangeRecordActionsSplitDelegate @Inject constructor(
             block = ChangeRecordActionsBlock.SplitTimeAdjustment,
             items = loadTimeSplitAdjustmentItems(),
         )
+        result += ChangeRecordSliderViewData(
+            block = ChangeRecordActionsBlock.SplitSlider,
+            min = 0f,
+            max = TimeUnit.MILLISECONDS.toSeconds(newTimeEnded - newTimeStarted).toFloat(),
+            value = TimeUnit.MILLISECONDS.toSeconds(newTimeSplit - newTimeStarted).toFloat(),
+        )
         val previewData = loadSplitPreviewViewData(
             newTypeId = newTypeId,
             newTimeStarted = newTimeStarted,

diff --git a/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
@@ -25,6 +25,7 @@ import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordButtonViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordCommentViewData
+import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordSliderViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimeAdjustmentViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimeDoublePreviewViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimePreviewViewData
@@ -460,6 +461,16 @@ abstract class ChangeRecordBaseViewModel(
         }
     }
 
+    fun onSliderValueChanged(viewData: ChangeRecordSliderViewData, value: Float) {
+        when (viewData.block) {
+            ChangeRecordActionsBlock.SplitSlider ->
+                onSliderSplitValueChanged(value)
+            else -> {
+                // Do nothing.
+            }
+        }
+    }
+
     fun onAdjustTimeStartedItemClick(viewData: TimeAdjustmentView.ViewData) {
         onAdjustTimeItemClick(TimeAdjustmentState.TIME_STARTED, viewData)
     }
@@ -501,23 +512,26 @@ abstract class ChangeRecordBaseViewModel(
     }
 
     private fun onAdjustTimeSplitItemClick(viewData: TimeAdjustmentView.ViewData) {
-        viewModelScope.launch {
-            when (viewData) {
-                is TimeAdjustmentView.ViewData.Now -> {
-                    newTimeSplit = System.currentTimeMillis()
-                    onTimeSplitChanged()
-                }
-                is TimeAdjustmentView.ViewData.Zero -> {
-                    // Do nothing, shouldn't be there.
-                }
-                is TimeAdjustmentView.ViewData.Adjust -> {
-                    newTimeSplit += TimeUnit.MINUTES.toMillis(viewData.value)
-                    onTimeSplitChanged()
-                }
+        when (viewData) {
+            is TimeAdjustmentView.ViewData.Now -> {
+                newTimeSplit = System.currentTimeMillis()
+                onTimeSplitChanged()
+            }
+            is TimeAdjustmentView.ViewData.Zero -> {
+                // Do nothing, shouldn't be there.
+            }
+            is TimeAdjustmentView.ViewData.Adjust -> {
+                newTimeSplit += TimeUnit.MINUTES.toMillis(viewData.value)
+                onTimeSplitChanged()
             }
         }
     }
 
+    private fun onSliderSplitValueChanged(value: Float) {
+        newTimeSplit = newTimeStarted + TimeUnit.SECONDS.toMillis(value.toLong())
+        onTimeSplitChanged()
+    }
+
     private fun onRecordChangeButtonClick(
         onProceed: suspend () -> Unit,
         checkTypeSelected: Boolean = true,

diff --git a/features/feature_change_record/src/main/res/layout/change_record_slider_item.xml b/features/feature_change_record/src/main/res/layout/change_record_slider_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.slider.Slider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sliderChangeRecordItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:labelBehavior="gone"
+    tools:value="33"
+    tools:valueFrom="0"
+    tools:valueTo="100" />
+
diff --git a/...til/simpletimetracker/feature_dialogs/colorSelection/view/ColorSelectionDialogFragment.kt b/...til/simpletimetracker/feature_dialogs/colorSelection/view/ColorSelectionDialogFragment.kt
@@ -68,9 +68,7 @@ class ColorSelectionDialogFragment : BaseBottomSheetFragment<Binding>() {
 
     override fun initUx() = with(binding) {
         sliderColorSelectionHue.addOnChangeListener { _, value, fromUser ->
-            if (fromUser) {
-                viewModel.onHueChanged(value)
-            }
+            if (fromUser) viewModel.onHueChanged(value)
         }
         viewColorSelectionView.setListener(
             object : ColorSelectionView.ColorSelectedListener {

diff --git a/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml b/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
@@ -32,7 +32,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        android:layout_marginEnd="8dp"
         android:valueFrom="0"
         android:valueTo="360"
         app:labelBehavior="gone"

diff --git a/features/feature_pomodoro/src/main/res/layout/pomodoro_fragment.xml b/features/feature_pomodoro/src/main/res/layout/pomodoro_fragment.xml
@@ -122,7 +122,7 @@
             android:paddingHorizontal="2dp"
             android:text=":"
             android:textColor="?appTextPrimaryColor"
-            android:textSize="32sp"
+            android:textSize="36sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/tvPomodoroTimerSeconds"
             app:layout_constraintStart_toEndOf="@id/tvPomodoroTimerMinutes"
@@ -149,7 +149,7 @@
             android:fontFamily="sans-serif-condensed"
             android:includeFontPadding="false"
             android:textColor="?appTextPrimaryColor"
-            android:textSize="32sp"
+            android:textSize="36sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvPomodoroTimerMinutesDelimiter"