add swipe to filter to stat detail data distribution

Razeeman · Razeeman · commit 9a1f13de5708 · 2025-06-08T16:10:56.000+03:00
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/extension/RecyclerExtensions.kt b/core/src/main/java/com/example/util/simpletimetracker/core/extension/RecyclerExtensions.kt
@@ -1,10 +1,20 @@
 package com.example.util.simpletimetracker.core.extension
 
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+import android.graphics.drawable.ColorDrawable
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import java.util.Collections
+import com.example.util.simpletimetracker.domain.extension.orZero
+import com.example.util.simpletimetracker.feature_views.extension.dpToPx
 
 fun RecyclerView.onItemMoved(
     getIsSelectable: (RecyclerView.ViewHolder?) -> Boolean = { true },
@@ -42,11 +52,7 @@ fun RecyclerView.onItemMoved(
             recyclerView: RecyclerView,
             viewHolder: RecyclerView.ViewHolder,
         ): Int {
-            return if (getIsSelectable(viewHolder)) {
-                dragDirections
-            } else {
-                0
-            }
+            return if (getIsSelectable(viewHolder)) dragDirections else 0
         }
 
         override fun onMove(
@@ -86,5 +92,96 @@ fun RecyclerView.onItemMoved(
         }
     }
 
+    (ItemTouchHelper(helper)).attachToRecyclerView(this)
+}
+
+fun RecyclerView.onItemSwiped(
+    @DrawableRes iconRes: Int,
+    @ColorInt iconColor: Int,
+    @ColorInt backgroundColor: Int,
+    getIsSelectable: (RecyclerView.ViewHolder?) -> Boolean = { true },
+    onSwiped: (RecyclerView.ViewHolder?) -> Unit,
+) {
+
+    val swipeDirections = ItemTouchHelper.START
+    val deleteIcon by lazy {
+        ContextCompat.getDrawable(context, iconRes)?.mutate()?.apply { setTint(iconColor) }
+    }
+    val intrinsicWidth = deleteIcon?.intrinsicWidth.orZero()
+    val intrinsicHeight = deleteIcon?.intrinsicHeight.orZero()
+    val background = ColorDrawable()
+    val clearPaint = Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) }
+
+    val helper = object : ItemTouchHelper.SimpleCallback(0, 0) {
+
+        override fun getSwipeDirs(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+        ): Int {
+            return if (getIsSelectable(viewHolder)) swipeDirections else 0
+        }
+
+        override fun onMove(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+            target: RecyclerView.ViewHolder,
+        ): Boolean {
+            return false
+        }
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+            onSwiped(viewHolder)
+        }
+
+        override fun onChildDraw(
+            canvas: Canvas,
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+            dX: Float,
+            dY: Float,
+            actionState: Int,
+            isCurrentlyActive: Boolean,
+        ) {
+            val itemView = viewHolder.itemView
+            val isCanceled = dX == 0f
+
+            if (isCanceled) {
+                canvas.drawRect(
+                    itemView.right + dX,
+                    itemView.top.toFloat(),
+                    itemView.right.toFloat(),
+                    itemView.bottom.toFloat(),
+                    clearPaint,
+                )
+                super.onChildDraw(canvas, recyclerView, viewHolder, dX, dY, actionState, false)
+                return
+            }
+
+            // Draw the red delete background
+            background.color = backgroundColor
+            background.setBounds(
+                itemView.right + dX.toInt(),
+                itemView.top,
+                itemView.right,
+                itemView.bottom,
+            )
+            background.draw(canvas)
+
+            // Calculate position of delete icon
+            val itemHeight = itemView.bottom - itemView.top
+            val iconMargin = 16.dpToPx()
+            val iconTop = itemView.top + (itemHeight - intrinsicHeight) / 2
+            val iconLeft = itemView.right - iconMargin - intrinsicWidth
+            val iconRight = itemView.right - iconMargin
+            val iconBottom = iconTop + intrinsicHeight
+
+            // Draw the delete icon
+            deleteIcon?.setBounds(iconLeft, iconTop, iconRight, iconBottom)
+            deleteIcon?.draw(canvas)
+
+            super.onChildDraw(canvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+        }
+    }
+
     (ItemTouchHelper(helper)).attachToRecyclerView(this)
 }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt
@@ -10,16 +10,21 @@ import com.example.util.simpletimetracker.core.dialog.DateTimeDialogListener
 import com.example.util.simpletimetracker.core.dialog.DurationDialogListener
 import com.example.util.simpletimetracker.core.dialog.OptionsListDialogListener
 import com.example.util.simpletimetracker.core.dialog.RecordsFilterListener
+import com.example.util.simpletimetracker.core.extension.onItemSwiped
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.viewData.RangesViewData
+import com.example.util.simpletimetracker.domain.extension.orFalse
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
+import com.example.util.simpletimetracker.feature_base_adapter.statistics.StatisticsSelectableViewData
 import com.example.util.simpletimetracker.feature_base_adapter.statistics.createStatisticsAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.statistics.createStatisticsSelectableAdapterDelegate
+import com.example.util.simpletimetracker.feature_statistics_detail.R
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsDetailBarChartAdapterDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsDetailButtonAdapterDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsDetailButtonsRowAdapterDelegate
@@ -35,6 +40,8 @@ import com.example.util.simpletimetracker.feature_statistics_detail.adapter.crea
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.StatisticsDetailViewModel
+import com.example.util.simpletimetracker.feature_views.ColorUtils
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_views.extension.setOnLongClick
 import com.example.util.simpletimetracker.feature_views.extension.visible
@@ -125,6 +132,7 @@ class StatisticsDetailFragment :
         btnStatisticsDetailNext.setOnClick(viewModel::onNextClick)
         btnStatisticsDetailToday.setOnClick { spinnerStatisticsDetail.performClick() }
         btnStatisticsDetailToday.setOnLongClick(viewModel::onTodayClick)
+        initOnItemSwiped()
     }
 
     override fun onDateTimeSet(timestamp: Long, tag: String?) {
@@ -211,6 +219,30 @@ class StatisticsDetailFragment :
         binding.rvStatisticsDetailContent.apply { post { smoothScrollToPosition(0) } }
     }
 
+    private fun initOnItemSwiped() = with(binding) {
+        fun ViewHolderType.canBeSwiped(): Boolean {
+            return this is StatisticsSelectableViewData
+        }
+
+        val context = rvStatisticsDetailContent.context
+        rvStatisticsDetailContent.onItemSwiped(
+            iconRes = R.drawable.delete, // TODO
+            iconColor = context.getThemedAttr(R.attr.appContrastColor),
+            backgroundColor = ColorUtils.changeAlpha(
+                context.getThemedAttr(R.attr.appContrastColor), 0.10f,
+            ),
+            getIsSelectable = { viewHolder ->
+                viewHolder?.adapterPosition
+                    ?.let { contentAdapter.getItemByPosition(it) }
+                    ?.canBeSwiped()
+                    .orFalse()
+            },
+            onSwiped = { viewHolder ->
+                viewModel.onSwiped(viewHolder as? ViewHolderType)
+            },
+        )
+    }
+
     companion object {
         private const val ARGS_PARAMS = "args_params"
 
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt
@@ -22,6 +22,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.adapter.Stat
 import com.example.util.simpletimetracker.feature_statistics_detail.customView.SeriesCalendarView
 import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailContentInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailOptionsListMapper
+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode
 import com.example.util.simpletimetracker.feature_statistics_detail.model.StatisticsDetailOptionsListItem
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailCardInternalViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailClickableLongest
@@ -208,6 +209,11 @@ class StatisticsDetailViewModel @Inject constructor(
         }
     }
 
+    fun onSwiped(item: ViewHolderType?) {
+        item ?: return
+        dataDistributionDelegate.onStatisticsItemSwiped(item)
+    }
+
     fun onPreviousClick() {
         rangeDelegate.onPreviousClick()
     }
@@ -360,6 +366,10 @@ class StatisticsDetailViewModel @Inject constructor(
                 streaksDelegate.updateStreaksGoalViewData()
                 updateViewData()
             }
+
+            override fun onStatisticsHidden(id: Long, mode: DataDistributionMode) {
+                filterDelegate.onStatisticsHidden(id, mode)
+            }
         }
     }
 }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailDataDistributionViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailDataDistributionViewModelDelegate.kt
@@ -5,6 +5,8 @@ import androidx.lifecycle.MutableLiveData
 import com.example.util.simpletimetracker.core.base.ViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+import com.example.util.simpletimetracker.feature_base_adapter.statistics.StatisticsSelectableViewData
 import com.example.util.simpletimetracker.feature_base_adapter.statistics.StatisticsViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailDataDistributionInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode
@@ -57,6 +59,14 @@ class StatisticsDetailDataDistributionViewModelDelegate @Inject constructor(
         updateViewData(animate = false)
     }
 
+    fun onStatisticsItemSwiped(item: ViewHolderType) {
+        val id = (item as? StatisticsSelectableViewData)?.data?.id ?: return
+        parent?.onStatisticsHidden(
+            id = id,
+            mode = dataDistributionMode,
+        )
+    }
+
     fun updateViewData(
         animate: Boolean = true,
     ) {
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailFilterViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailFilterViewModelDelegate.kt
@@ -9,6 +9,7 @@ import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteracto
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
 import com.example.util.simpletimetracker.feature_statistics_detail.R
+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParam
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParams
@@ -83,12 +84,15 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
 
     fun onTypesFilterDismissed(tag: String) {
         if (tag !in listOf(FILTER_TAG, COMPARE_TAG)) return
+        onFiltersChanged()
+    }
 
-        loadJob?.cancel()
-        loadJob = delegateScope.launch {
-            loadRecordsCache()
-            parent?.onTypesFilterDismissed()
-        }
+    fun onStatisticsHidden(id: Long, mode: DataDistributionMode) {
+        // TODO change filter
+        // TODO check tag consistency
+        // TODO multitask?
+        // TODO untracked?
+        onFiltersChanged()
     }
 
     fun provideRecords(): List<RecordBase> {
@@ -107,6 +111,14 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
         return comparisonFilter.filter { it !is RecordsFilter.Date }
     }
 
+    private fun onFiltersChanged() {
+        loadJob?.cancel()
+        loadJob = delegateScope.launch {
+            loadRecordsCache()
+            parent?.onTypesFilterDismissed()
+        }
+    }
+
     private suspend fun openFilter(
         tag: String,
         title: String,
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailViewModelDelegate.kt
@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_statistics_detail.viewModel.d
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode
 import com.example.util.simpletimetracker.navigation.params.screen.StatisticsDetailParams
 
 interface StatisticsDetailViewModelDelegate {
@@ -23,5 +24,6 @@ interface StatisticsDetailViewModelDelegate {
         fun updateViewData()
         fun getDateFilter(): List<RecordsFilter>
         suspend fun onTypesFilterDismissed()
+        fun onStatisticsHidden(id: Long, mode: DataDistributionMode)
     }
 }
diff --git a/features/feature_statistics_detail/src/main/res/layout/statistics_detail_preview_more_item.xml b/features/feature_statistics_detail/src/main/res/layout/statistics_detail_preview_more_item.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?appBackgroundColor"
+    app:cardBackgroundColor="?appCardBackgroundColor"
     app:cardCornerRadius="8dp"
     app:cardElevation="4dp"
     app:cardPreventCornerOverlap="false"

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.adapter.Stat`
`22`	`22`	`import com.example.util.simpletimetracker.feature_statistics_detail.customView.SeriesCalendarView`
`23`	`23`	`import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailContentInteractor`
`24`	`24`	`import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailOptionsListMapper`
	`25`	`+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode`
`25`	`26`	`import com.example.util.simpletimetracker.feature_statistics_detail.model.StatisticsDetailOptionsListItem`
`26`	`27`	`import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailCardInternalViewData`
`27`	`28`	`import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailClickableLongest`
`@@ -208,6 +209,11 @@ class StatisticsDetailViewModel @Inject constructor(`
`208`	`209`	`}`
`209`	`210`	`}`
`210`	`211`
	`212`	`+ fun onSwiped(item: ViewHolderType?) {`
	`213`	`+ item ?: return`
	`214`	`+ dataDistributionDelegate.onStatisticsItemSwiped(item)`
	`215`	`+ }`
	`216`	`+`
`211`	`217`	`fun onPreviousClick() {`
`212`	`218`	`rangeDelegate.onPreviousClick()`
`213`	`219`	`}`
`@@ -360,6 +366,10 @@ class StatisticsDetailViewModel @Inject constructor(`
`360`	`366`	`streaksDelegate.updateStreaksGoalViewData()`
`361`	`367`	`updateViewData()`
`362`	`368`	`}`
	`369`	`+`
	`370`	`+ override fun onStatisticsHidden(id: Long, mode: DataDistributionMode) {`
	`371`	`+ filterDelegate.onStatisticsHidden(id, mode)`
	`372`	`+ }`
`363`	`373`	`}`
`364`	`374`	`}`
`365`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_statistics_detail.viewModel.d`
`3`	`3`	`import com.example.util.simpletimetracker.domain.statistics.model.RangeLength`
`4`	`4`	`import com.example.util.simpletimetracker.domain.record.model.RecordBase`
`5`	`5`	`import com.example.util.simpletimetracker.domain.record.model.RecordsFilter`
	`6`	`+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode`
`6`	`7`	`import com.example.util.simpletimetracker.navigation.params.screen.StatisticsDetailParams`
`7`	`8`
`8`	`9`	`interface StatisticsDetailViewModelDelegate {`
`@@ -23,5 +24,6 @@ interface StatisticsDetailViewModelDelegate {`
`23`	`24`	`fun updateViewData()`
`24`	`25`	`fun getDateFilter(): List<RecordsFilter>`
`25`	`26`	`suspend fun onTypesFilterDismissed()`
	`27`	`+ fun onStatisticsHidden(id: Long, mode: DataDistributionMode)`
`26`	`28`	`}`
`27`	`29`	`}`