implemented properties to control view and animations. implemented listeners.

st235 · st235 · commit 80d9152b582b · 2021-01-15T23:23:00.000+02:00
diff --git a/app/src/main/java/github/com/st235/swipetoactionlayout/MainActivity.kt b/app/src/main/java/github/com/st235/swipetoactionlayout/MainActivity.kt
@@ -3,7 +3,10 @@ package github.com.st235.swipetoactionlayout
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
+import android.view.View
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import github.com.st235.lib_swipetoactionlayout.MenuListener
 import github.com.st235.lib_swipetoactionlayout.SwipeAction
 import github.com.st235.lib_swipetoactionlayout.SwipeToActionLayout
 
@@ -16,14 +19,38 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         deprecatedSwipeToActionLayout = findViewById(R.id.swipeToActionLayout)
+        deprecatedSwipeToActionLayout.gravity = SwipeToActionLayout.MenuGravity.END
         deprecatedSwipeToActionLayout.isFullActionSupported = true
-//        deprecatedSwipeToActionLayout.thresholdToOpenView = 0.0F
+        deprecatedSwipeToActionLayout.shouldVibrateOnQuickAction = true
+        deprecatedSwipeToActionLayout.menuListener = MenuListener()
 
         deprecatedSwipeToActionLayout.actions =
                 listOf(
                         SwipeAction(0, ColorDrawable(0xFFFBDAEE.toInt()), R.drawable.baseline_call_24, getString(R.string.action_call), Color.BLACK, Color.BLACK),
                         SwipeAction(1, ColorDrawable(0xFFFFF7A4.toInt()), R.drawable.baseline_email_24, getString(R.string.action_email), Color.BLACK, Color.BLACK),
                         SwipeAction(3, ColorDrawable(0xFFC0E7F6.toInt()), R.drawable.baseline_duo_24, getString(R.string.action_duo), Color.BLACK, Color.BLACK)
                 )
+
+
+    }
+
+    private inner class MenuListener: github.com.st235.lib_swipetoactionlayout.MenuListener {
+
+        override fun onClosed(view: View) {
+        }
+
+        override fun onOpened(view: View) {
+        }
+
+        override fun onFullyOpened(view: View) {
+            deprecatedSwipeToActionLayout.postDelayed({
+                deprecatedSwipeToActionLayout.close()
+            }, 1_000)
+        }
+
+        override fun onActionClicked(view: View, action: SwipeAction) {
+            Toast.makeText(this@MainActivity, "On clicked on: ${action.text}", Toast.LENGTH_SHORT).show()
+            deprecatedSwipeToActionLayout.close()
+        }
     }
 }
diff --git a/lib-swipetoactionlayout/src/main/AndroidManifest.xml b/lib-swipetoactionlayout/src/main/AndroidManifest.xml
@@ -1,2 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="github.com.st235.lib_swipetoactionlayout"/>
+          package="github.com.st235.lib_swipetoactionlayout">
+    <uses-permission android:name="android.permission.VIBRATE" />
+</manifest>
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/MenuListener.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/MenuListener.kt
@@ -2,8 +2,10 @@ package github.com.st235.lib_swipetoactionlayout
 
 import android.view.View
 
-interface OnSwipeListener {
+interface MenuListener {
     fun onClosed(view: View)
     fun onOpened(view: View)
-    fun onSlide(view: View, slideOffset: Float)
+    fun onFullyOpened(view: View)
+
+    fun onActionClicked(view: View, action: SwipeAction)
 }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/QuickActionsStates.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/QuickActionsStates.kt
@@ -0,0 +1,5 @@
+package github.com.st235.lib_swipetoactionlayout
+
+internal enum class QuickActionsStates {
+    OPENED, CLOSED, FULL_OPENED
+}
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/SwipeToActionLayout.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/SwipeToActionLayout.kt
@@ -8,6 +8,7 @@ import androidx.customview.widget.ViewDragHelper
 import github.com.st235.lib_swipetoactionlayout.behaviour.BehaviourDelegate
 import github.com.st235.lib_swipetoactionlayout.behaviour.BehaviourDelegatesFactory
 import github.com.st235.lib_swipetoactionlayout.behaviour.NoOpBehaviourDelegate
+import github.com.st235.lib_swipetoactionlayout.events.QuickActionsMenuStateProcessor
 import github.com.st235.lib_swipetoactionlayout.utils.isLtr
 import github.com.st235.lib_swipetoactionlayout.utils.max
 import github.com.st235.lib_swipetoactionlayout.utils.min
@@ -65,25 +66,78 @@ class SwipeToActionLayout @JvmOverloads constructor(
         }
 
     var gravity: MenuGravity = MenuGravity.RIGHT
-    set(value) {
-        field = value
-        reloadActions()
-    }
+        set(value) {
+            field = value
+            reloadActions()
+        }
 
     var isFullActionSupported: Boolean = false
-    set(value) {
-        field = value
-        reloadActions()
-    }
+        set(value) {
+            field = value
+            reloadActions()
+        }
+
+    var shouldVibrateOnQuickAction: Boolean = false
 
     private val actionFactory = ActionFactory(context)
     private val behaviourDelegateFactory = BehaviourDelegatesFactory(context)
 
+    private var inProgressStateProcessor = QuickActionsMenuStateProcessor()
+
     private var actionSize = 0
 
     private var delegate: BehaviourDelegate = NoOpBehaviourDelegate()
     private val viewDragHelper = ViewDragHelper.create(this, ViewDragHelperCallback())
 
+    var menuListener: MenuListener? = null
+
+    init {
+        inProgressStateProcessor.onReleaseStateChanged = { state ->
+            when (state) {
+                QuickActionsStates.FULL_OPENED -> {
+                    menuListener?.onFullyOpened(this)
+                }
+                QuickActionsStates.OPENED -> {
+                    menuListener?.onOpened(this)
+                }
+                QuickActionsStates.CLOSED -> {
+                    menuListener?.onClosed(this)
+                }
+            }
+
+        }
+
+        inProgressStateProcessor.onProgressiveStateChanged = { state ->
+            when (state) {
+                QuickActionsStates.FULL_OPENED -> {
+                    if (shouldVibrateOnQuickAction) {
+                        performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
+                    }
+                }
+                else -> {
+                }
+            }
+        }
+    }
+
+    fun close() {
+        transitionToState(QuickActionsStates.CLOSED)
+    }
+
+    fun open() {
+        transitionToState(QuickActionsStates.OPENED)
+    }
+
+    fun fullyOpen() {
+        transitionToState(QuickActionsStates.FULL_OPENED)
+    }
+
+    private fun transitionToState(state: QuickActionsStates) {
+        val position = delegate.gePositionForState(this, actionSize, state)
+        viewDragHelper.smoothSlideViewTo(findContentView(), position, 0)
+        invalidate()
+    }
+
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         var contentWidth = 0
         var contentHeight = 0
@@ -156,7 +210,7 @@ class SwipeToActionLayout @JvmOverloads constructor(
         val mode = MeasureSpec.getMode(measureSpec)
         val availableSize = MeasureSpec.getSize(measureSpec)
 
-        return when(mode) {
+        return when (mode) {
             MeasureSpec.EXACTLY -> availableSize
             MeasureSpec.AT_MOST -> min(availableSize, size)
             MeasureSpec.UNSPECIFIED -> size
@@ -207,6 +261,18 @@ class SwipeToActionLayout @JvmOverloads constructor(
         }
     }
 
+    private fun findContentView(): View {
+        for (i in 0 until childCount) {
+            val child = getChildAt(i)
+
+            if (!ActionFactory.isAction(child)) {
+                return child
+            }
+        }
+
+        throw IllegalStateException()
+    }
+
     private fun reloadActions() {
         val items = actions
 
@@ -216,7 +282,15 @@ class SwipeToActionLayout @JvmOverloads constructor(
 
         for ((index, item) in items.withIndex()) {
             val isLastItem = (index == items.lastIndex)
-            val associatedView = actionFactory.createAction(item, isLastItem, gravity.getViewGravity())
+            val associatedView =
+                actionFactory.createAction(item, isLastItem, gravity.getViewGravity())
+
+            associatedView.isClickable = true
+            associatedView.isFocusable = true
+            associatedView.setOnClickListener {
+                menuListener?.onActionClicked(it, action = item)
+            }
+
             addView(associatedView)
         }
 
@@ -239,7 +313,7 @@ class SwipeToActionLayout @JvmOverloads constructor(
         }
     }
 
-    private inner class ViewDragHelperCallback: ViewDragHelper.Callback() {
+    private inner class ViewDragHelperCallback : ViewDragHelper.Callback() {
 
         override fun tryCaptureView(child: View, pointerId: Int): Boolean {
             return !ActionFactory.isAction(child)
@@ -265,11 +339,19 @@ class SwipeToActionLayout @JvmOverloads constructor(
                     actionOrder++
                 }
             }
+
+            inProgressStateProcessor.setState(
+                delegate.getStateForPosition(
+                    changedView,
+                    actionSize
+                )
+            )
         }
 
         override fun onViewReleased(releasedChild: View, xvel: Float, yvel: Float) {
             val finalLeftPosition = delegate.getFinalLeftPosition(releasedChild, xvel, actionSize)
             viewDragHelper.settleCapturedViewAt(finalLeftPosition, 0)
+            inProgressStateProcessor.release()
             invalidate()
         }
     }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/BehaviourDelegate.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/BehaviourDelegate.kt
@@ -2,6 +2,7 @@ package github.com.st235.lib_swipetoactionlayout.behaviour
 
 import android.graphics.Point
 import android.view.View
+import github.com.st235.lib_swipetoactionlayout.QuickActionsStates
 
 internal interface BehaviourDelegate {
 
@@ -15,4 +16,8 @@ internal interface BehaviourDelegate {
 
     fun getFinalLeftPosition(view: View, velocity: Float, actionSize: Int): Int
 
+    fun getStateForPosition(view: View, actionSize: Int): QuickActionsStates
+
+    fun gePositionForState(view: View, actionSize: Int, states: QuickActionsStates): Int
+
 }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/FullLeftDirectedBehaviorDelegate.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/FullLeftDirectedBehaviorDelegate.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.view.View
 import androidx.core.animation.addListener
 import github.com.st235.lib_swipetoactionlayout.ActionFactory
+import github.com.st235.lib_swipetoactionlayout.QuickActionsStates
 import github.com.st235.lib_swipetoactionlayout.utils.clamp
 import github.com.st235.lib_swipetoactionlayout.utils.max
 import github.com.st235.lib_swipetoactionlayout.utils.min
@@ -147,5 +148,25 @@ internal class FullLeftDirectedBehaviorDelegate(
         return position > translateDistance
     }
 
+    override fun getStateForPosition(
+        view: View,
+        actionSize: Int
+    ): QuickActionsStates {
+        return if (isFullyOpened(view, actionSize)) {
+            QuickActionsStates.FULL_OPENED
+        } else if (isOpened(view.left, actionSize)) {
+            QuickActionsStates.OPENED
+        } else {
+            QuickActionsStates.CLOSED
+        }
+    }
+
+    override fun gePositionForState(view: View, actionSize: Int, states: QuickActionsStates): Int {
+        return when(states) {
+            QuickActionsStates.FULL_OPENED -> view.measuredWidth
+            QuickActionsStates.OPENED -> actionSize * actionCount
+            QuickActionsStates.CLOSED -> 0
+        }
+    }
 
 }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/FullRightDirectedBehaviorDelegate.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/FullRightDirectedBehaviorDelegate.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.view.View
 import androidx.core.animation.addListener
 import github.com.st235.lib_swipetoactionlayout.ActionFactory
+import github.com.st235.lib_swipetoactionlayout.QuickActionsStates
 import github.com.st235.lib_swipetoactionlayout.utils.clamp
 
 internal class FullRightDirectedBehaviorDelegate(
@@ -110,12 +111,16 @@ internal class FullRightDirectedBehaviorDelegate(
     override fun getFinalLeftPosition(view: View, velocity: Float, actionSize: Int): Int {
         val translateDistance = actionSize * actionCount
 
-        return if (isFullyOpened(view, actionSize)) {
-            -view.measuredWidth
-        } else if (isOpened(view.left, actionSize)) {
-            -translateDistance
-        } else {
-            0
+        return when {
+            isFullyOpened(view, actionSize) -> {
+                -view.measuredWidth
+            }
+            isOpened(view.left, actionSize) -> {
+                -translateDistance
+            }
+            else -> {
+                0
+            }
         }
     }
 
@@ -127,5 +132,29 @@ internal class FullRightDirectedBehaviorDelegate(
         return position < -translateDistance
     }
 
+    override fun getStateForPosition(
+        view: View,
+        actionSize: Int
+    ): QuickActionsStates {
+        return when {
+            isFullyOpened(view, actionSize) -> {
+                QuickActionsStates.FULL_OPENED
+            }
+            isOpened(view.left, actionSize) -> {
+                QuickActionsStates.OPENED
+            }
+            else -> {
+                QuickActionsStates.CLOSED
+            }
+        }
+    }
+
+    override fun gePositionForState(view: View, actionSize: Int, states: QuickActionsStates): Int {
+        return when(states) {
+            QuickActionsStates.FULL_OPENED -> -view.measuredWidth
+            QuickActionsStates.OPENED -> -(actionSize * actionCount)
+            QuickActionsStates.CLOSED -> 0
+        }
+    }
 
 }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/LeftDirectedBehaviourDelegate.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/LeftDirectedBehaviourDelegate.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Point
 import android.util.Log
 import android.view.View
+import github.com.st235.lib_swipetoactionlayout.QuickActionsStates
 import github.com.st235.lib_swipetoactionlayout.utils.clamp
 
 internal open class LeftDirectedBehaviourDelegate(
@@ -42,4 +43,22 @@ internal open class LeftDirectedBehaviourDelegate(
         }
     }
 
+    override fun getStateForPosition(
+        view: View,
+        actionSize: Int
+    ): QuickActionsStates {
+        return if (isOpened(view.left, actionSize)) {
+            QuickActionsStates.OPENED
+        } else {
+            QuickActionsStates.CLOSED
+        }
+    }
+
+    override fun gePositionForState(view: View, actionSize: Int, states: QuickActionsStates): Int {
+        return when(states) {
+            QuickActionsStates.FULL_OPENED -> throw IllegalArgumentException("Unsupported state")
+            QuickActionsStates.OPENED -> actionSize * actionCount
+            QuickActionsStates.CLOSED -> 0
+        }
+    }
 }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/NoOpBehaviourDelegate.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/NoOpBehaviourDelegate.kt
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/RightDirectedBehaviourDelegate.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/behaviour/RightDirectedBehaviourDelegate.kt
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/events/QuickActionsMenuStateProcessor.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/events/QuickActionsMenuStateProcessor.kt
