Added custom vibration option in LongPopupClickListener

Bug fixes in LongPopupClickListener
premacck · Dec 27, 2018 · 9f71db8 · 9f71db8
1 parent 831d4e9
commit 9f71db8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/app/src/main/java/com/prembros/facilis/SelectionActivity.kt b/app/src/main/java/com/prembros/facilis/SelectionActivity.kt
@@ -27,6 +27,7 @@ class SelectionActivity : BaseCardActivity() {
         blurPopupZoomBtn.onDebouncingClick { pushPopup(SampleBlurPopup.newInstance(R.anim.zoom_in, R.anim.zoom_out)) }
 
         LongPopupClickListener.inside(this)
+                .withVibration()
                 .withPopup(SampleBlurPopup.newInstance())
                 .setOn(longPressBlurPopupBtn)
     }

diff --git a/facilis/src/main/java/com/prembros/facilis/util/LongPopupClickListener.kt b/facilis/src/main/java/com/prembros/facilis/util/LongPopupClickListener.kt
@@ -1,6 +1,7 @@
 package com.prembros.facilis.util
 
-import android.view.*
+import android.view.MotionEvent.*
+import android.view.View
 import com.prembros.facilis.activity.BaseCardActivity
 import com.prembros.facilis.dialog.BaseBlurPopup
 import org.jetbrains.anko.toast
@@ -9,27 +10,40 @@ class LongPopupClickListener private constructor(private val activity: BaseCardA
 
     private lateinit var baseBlurPopup: BaseBlurPopup
     private var isLongPressStarted: Boolean = false
+    private var isVibrationEnabled: Boolean = false
+    private var vibrationDurationMillis: Long = DEFAULT_VIBRATION_DURATION
 
     companion object {
+        private const val DEFAULT_VIBRATION_DURATION = 50L
         fun inside(activity: BaseCardActivity): LongPopupClickListener = LongPopupClickListener(activity)
     }
 
+    fun withVibration(durationMillis: Long = DEFAULT_VIBRATION_DURATION): LongPopupClickListener {
+        isVibrationEnabled = true
+        vibrationDurationMillis = durationMillis
+        return this
+    }
+
     fun withPopup(baseBlurPopup: BaseBlurPopup): LongPopupClickListener {
         this.baseBlurPopup = baseBlurPopup
         return this
     }
 
     fun setOn(view: View) {
         view.setOnLongClickListener {
-            isLongPressStarted = true
-            activity.vibrate(40)
-            activity.pushPopup(baseBlurPopup)
-            true
+            if (!isLongPressStarted) {
+                isLongPressStarted = true
+                activity.vibrate(vibrationDurationMillis)
+                activity.pushPopup(baseBlurPopup)
+                return@setOnLongClickListener true
+            } else isLongPressStarted = false
+            false
         }
         view.setOnTouchListener { _, event ->
             when (event.action) {
-                MotionEvent.ACTION_UP -> {
+                ACTION_UP, ACTION_CANCEL, ACTION_OUTSIDE -> {
                     if (isLongPressStarted) {
+                        isLongPressStarted = false
                         activity.onBackPressed()
                         return@setOnTouchListener true
                     } else activity.toast("Long press for the popup")