feat: delete indicator when dismissing videos/items

Bnyro · Oct 28, 2024 · a8d7fbc · a8d7fbc
1 parent e8af75a
commit a8d7fbc
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 10 deletions.
diff --git a/app/src/main/java/com/github/libretube/extensions/RecyclerViewAdapter.kt b/app/src/main/java/com/github/libretube/extensions/RecyclerViewAdapter.kt
@@ -1,39 +1,47 @@
 package com.github.libretube.extensions
 
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+import android.graphics.drawable.ColorDrawable
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.R
+import com.github.libretube.helpers.ThemeHelper
 
 fun RecyclerView.setOnDismissListener(onDismissedListener: (position: Int) -> Unit) {
     setActionListener(
-        swipeDirections = arrayOf(ItemTouchHelper.LEFT),
+        allowSwipe = true,
         onDismissedListener = onDismissedListener
     )
 }
 
 fun RecyclerView.setOnDraggedListener(onDragListener: (from: Int, to: Int) -> Unit) {
     setActionListener(
-        dragDirections = arrayOf(ItemTouchHelper.DOWN, ItemTouchHelper.UP),
+        allowDrag = true,
         onDragListener = onDragListener
     )
 }
 
 fun RecyclerView.setActionListener(
-    swipeDirections: Array<Int> = arrayOf(),
-    dragDirections: Array<Int> = arrayOf(),
+    allowSwipe: Boolean = false,
+    allowDrag: Boolean = false,
     onDragListener: (from: Int, to: Int) -> Unit = { _, _ -> },
     onDismissedListener: (position: Int) -> Unit = {}
 ) {
     val itemTouchCallback =
         object : ItemTouchHelper.SimpleCallback(
-            dragDirections.fold(0) { a, b -> a or b },
-            swipeDirections.fold(0) { a, b -> a or b }
+            if (allowDrag) ItemTouchHelper.UP or ItemTouchHelper.DOWN else 0,
+            if (allowSwipe) ItemTouchHelper.LEFT else 0
         ) {
             override fun onMove(
                 recyclerView: RecyclerView,
                 viewHolder: RecyclerView.ViewHolder,
                 target: RecyclerView.ViewHolder
             ): Boolean {
-                if (dragDirections.isEmpty()) return false
+                if (!allowDrag) return false
 
                 onDragListener.invoke(viewHolder.absoluteAdapterPosition, target.absoluteAdapterPosition)
                 return true
@@ -42,6 +50,61 @@ fun RecyclerView.setActionListener(
             override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
                 onDismissedListener.invoke(viewHolder.absoluteAdapterPosition)
             }
+
+            override fun onChildDraw(
+                c: Canvas,
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                dX: Float,
+                dY: Float,
+                actionState: Int,
+                isCurrentlyActive: Boolean
+            ) {
+                val itemView = viewHolder.itemView
+
+                if (dX == 0f && !isCurrentlyActive) {
+                    clearCanvas(c, itemView.right + dX, itemView.top.toFloat(), itemView.right.toFloat(), itemView.bottom.toFloat())
+                    super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, false)
+                    return
+                }
+
+                // Get the background colors from the theme (should be a tone of red for most themes)
+                val backgroundColor = ThemeHelper.getThemeColor(context, androidx.appcompat.R.attr.colorError)
+                val onBackgroundColor = ThemeHelper.getThemeColor(context, com.google.android.material.R.attr.colorOnError)
+
+                val itemViewEndWithOffset = itemView.right + dX.toInt()
+                // Draw the red delete background
+                val background = ColorDrawable().apply {
+                    color = backgroundColor
+                    setBounds(itemViewEndWithOffset, itemView.top, itemView.right, itemView.bottom)
+                }
+                background.draw(c)
+
+                val deleteIcon = ContextCompat.getDrawable(context, R.drawable.ic_delete)!!.apply {
+                    setTint(onBackgroundColor)
+                }
+
+                // Calculate position of the delete icon
+                val itemHeight = itemView.bottom - itemView.top
+                val deleteIconTop = itemView.top + (itemHeight - deleteIcon.intrinsicHeight) / 2
+                val deleteIconMargin = (itemHeight - deleteIcon.intrinsicHeight) / 2
+                val deleteIconLeft = itemView.right - deleteIconMargin - deleteIcon.intrinsicWidth
+                val deleteIconRight = itemView.right - deleteIconMargin
+                val deleteIconBottom = deleteIconTop + deleteIcon.intrinsicHeight
+
+                // Draw the delete icon if it wouldn't overlap the recycler view item
+                if (itemViewEndWithOffset < deleteIconLeft) {
+                    deleteIcon.setBounds(deleteIconLeft, deleteIconTop, deleteIconRight, deleteIconBottom)
+                    deleteIcon.draw(c)
+                }
+
+                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+            }
+
+            private fun clearCanvas(c: Canvas?, left: Float, top: Float, right: Float, bottom: Float) {
+                val clearPaint = Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) }
+                c?.drawRect(left, top, right, bottom, clearPaint)
+            }
         }
 
     ItemTouchHelper(itemTouchCallback).attachToRecyclerView(this)

diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.media3.common.Player
-import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
 import com.github.libretube.databinding.QueueBottomSheetBinding
@@ -85,8 +84,8 @@ class PlayingQueueSheet : ExpandedBottomSheet() {
         }
 
         binding.optionsRecycler.setActionListener(
-            swipeDirections = arrayOf(ItemTouchHelper.LEFT),
-            dragDirections = arrayOf(ItemTouchHelper.UP, ItemTouchHelper.DOWN),
+            allowSwipe = true,
+            allowDrag = true,
             onDismissedListener = { position ->
                 if (position == PlayingQueue.currentIndex()) {
                     adapter.notifyItemChanged(position)