add records calendar click color change

Razeeman · Jul 6, 2024 · e4bea8d · e4bea8d
1 parent c4e4a8e
commit e4bea8d
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 20 deletions.
diff --git a/...java/com/example/util/simpletimetracker/feature_records/customView/RecordsCalendarView.kt b/...java/com/example/util/simpletimetracker/feature_records/customView/RecordsCalendarView.kt
@@ -1,5 +1,7 @@
 package com.example.util.simpletimetracker.feature_records.customView
 
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Canvas
@@ -31,6 +33,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.record.RecordViewData
 import com.example.util.simpletimetracker.feature_base_adapter.runningRecord.RunningRecordViewData
 import com.example.util.simpletimetracker.feature_records.R
+import com.example.util.simpletimetracker.feature_views.ColorUtils
 import com.example.util.simpletimetracker.feature_views.IconView
 import com.example.util.simpletimetracker.feature_views.extension.dpToPx
 import com.example.util.simpletimetracker.feature_views.extension.getBitmapFromView
@@ -89,6 +92,8 @@ class RecordsCalendarView @JvmOverloads constructor(
     private val paddingBetweenDays: Float = 1.dpToPx().toFloat()
     private val dayInMillis = TimeUnit.DAYS.toMillis(1)
     private val hourInMillis = TimeUnit.HOURS.toMillis(1)
+    private var selectedRecord: RecordsCalendarViewData.Point.Data? = null
+    private var selectedRecordColor: Int = 0
 
     private val recordPaint: Paint = Paint()
     private val legendTextPaint: Paint = Paint()
@@ -151,18 +156,18 @@ class RecordsCalendarView @JvmOverloads constructor(
 
     private val singleTapDetector = SingleTapDetector(
         context = context,
-        onSingleTap = ::onTouch,
+        onSingleTap = ::onEventTouch,
     )
     private val scaleDetector = ScaleDetector(
         context = context,
-        onScaleStart = ::onScaleStart,
-        onScaleChanged = ::onScaleChanged,
-        onScaleStop = ::onScaleStop,
+        onScaleStart = ::onEventScaleStart,
+        onScaleChanged = ::onEventScaleChanged,
+        onScaleStop = ::onEventScaleStop,
     )
     private val swipeDetector = SwipeDetector(
         context = context,
-        onSlide = ::onSwipe,
-        onSlideStop = ::onSwipeStop,
+        onSlide = ::onEventSwipe,
+        onSlideStop = ::onEventSwipeStop,
     )
 
     init {
@@ -397,7 +402,13 @@ class RecordsCalendarView @JvmOverloads constructor(
             /************
              * Draw box *
              ************/
-            recordPaint.color = item.point.data.color
+            recordPaint.color = item.point.data.color.let {
+                if (selectedRecord == item.point.data) {
+                    selectedRecordColor
+                } else {
+                    it
+                }
+            }
             boxHeight = chartHeight * (item.point.end - item.point.start) / dayInMillis
             boxShift = chartHeight * item.point.start / dayInMillis
             boxWidth = columnWidth / item.columnCount
@@ -890,20 +901,18 @@ class RecordsCalendarView @JvmOverloads constructor(
         }
     }
 
-    private fun onTouch(event: MotionEvent) {
-        val x = event.x
-        val y = event.y
-
-        data.map(Column::data).flatten().firstOrNull {
-            it.boxLeft < x && it.boxTop < y && it.boxRight > x && it.boxBottom > y
-        }?.point?.data?.value?.let(listener)
+    private fun onEventTouch(event: MotionEvent) {
+        val selected = findDataPoint(x = event.x, y = event.y)?.point?.data
+        selectedRecord = selected
+        selected?.let(::animateSelectedRecord)
+        selected?.value?.let(listener)
     }
 
-    private fun onScaleStart() {
+    private fun onEventScaleStart() {
         isScaling = true
     }
 
-    private fun onScaleChanged(newScale: Float) {
+    private fun onEventScaleChanged(newScale: Float) {
         parent.requestDisallowInterceptTouchEvent(true)
         scaleFactor *= newScale
         scaleFactor = scaleFactor.coerceAtLeast(1f)
@@ -913,15 +922,19 @@ class RecordsCalendarView @JvmOverloads constructor(
         invalidate()
     }
 
-    private fun onScaleStop() {
+    private fun onEventScaleStop() {
         parent.requestDisallowInterceptTouchEvent(false)
         lastScaleFactor = scaleFactor
         lastPanFactor = panFactor
         isScaling = false
     }
 
     @Suppress("UNUSED_PARAMETER")
-    private fun onSwipe(offset: Float, direction: SwipeDetector.Direction, event: MotionEvent) {
+    private fun onEventSwipe(
+        offset: Float,
+        direction: SwipeDetector.Direction,
+        event: MotionEvent,
+    ) {
         if (!direction.isHorizontal() && !isScaling) {
             parent.requestDisallowInterceptTouchEvent(true)
             panFactor = lastPanFactor + offset
@@ -930,7 +943,7 @@ class RecordsCalendarView @JvmOverloads constructor(
         }
     }
 
-    private fun onSwipeStop() {
+    private fun onEventSwipeStop() {
         if (isScaling) return
         parent.requestDisallowInterceptTouchEvent(false)
         lastPanFactor = panFactor
@@ -941,6 +954,15 @@ class RecordsCalendarView @JvmOverloads constructor(
         panFactor = panFactor.coerceIn(-maxPanAvailable, 0f)
     }
 
+    private fun findDataPoint(
+        x: Float,
+        y: Float,
+    ): Data? {
+        return data.map(Column::data).flatten().firstOrNull {
+            it.boxLeft < x && it.boxTop < y && it.boxRight > x && it.boxBottom > y
+        }
+    }
+
     private fun getTextView(
         textColor: Int,
         typeface: Typeface,
@@ -958,6 +980,24 @@ class RecordsCalendarView @JvmOverloads constructor(
         }
     }
 
+    private fun animateSelectedRecord(
+        selectedRecord: RecordsCalendarViewData.Point.Data,
+    ) {
+        val from = selectedRecord.color
+        val to = ColorUtils.normalizeLightness(selectedRecord.color)
+        val animator = ValueAnimator.ofObject(ArgbEvaluator(), from, to)
+
+        animator.duration = CLICK_ANIMATION_DURATION_MS
+        animator.repeatCount = 1
+        animator.repeatMode = ValueAnimator.REVERSE
+        animator.addUpdateListener {
+            selectedRecordColor = it.animatedValue as? Int
+                ?: return@addUpdateListener
+            invalidate()
+        }
+        animator.start()
+    }
+
     private fun View.measureText(
         width: Int,
         widthSpec: Int,
@@ -994,4 +1034,8 @@ class RecordsCalendarView @JvmOverloads constructor(
         val panFactor: Float,
         val lastPanFactor: Float,
     ) : BaseSavedState(superSavedState)
+
+    companion object {
+        private const val CLICK_ANIMATION_DURATION_MS: Long = 250L
+    }
 }
diff --git a/...e/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt b/...e/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt
@@ -135,7 +135,6 @@ class SettingsDisplayViewDataInteractor @Inject constructor(
                     dividerIsVisible = true,
                 )
             }
-            // TODO POM add translations
             val enablePomodoroMode = prefsInteractor.getEnablePomodoroMode()
             result += SettingsCheckboxWithButtonViewData(
                 data = SettingsCheckboxViewData(