From a71cb344a57f88447d34ab65148574854c44c5f8 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Tue, 16 Aug 2022 17:23:08 +0200
Subject: [PATCH] improve double tap behavior

---
 .../libretube/util/DoubleTapListener.kt       | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/util/DoubleTapListener.kt b/app/src/main/java/com/github/libretube/util/DoubleTapListener.kt
index 4374b9597..324319054 100644
--- a/app/src/main/java/com/github/libretube/util/DoubleTapListener.kt
+++ b/app/src/main/java/com/github/libretube/util/DoubleTapListener.kt
@@ -7,39 +7,34 @@ import android.view.View
 
 abstract class DoubleTapListener : View.OnClickListener {
 
+    private val maximumTimeDifference = 300L
+    private val handler = Handler(Looper.getMainLooper())
+
     private var isSingleEvent = false
-    private val doubleClickQualificationSpanInMillis: Long
-    private var timestampLastClick: Long
-    private val handler: Handler
-    private val runnable: Runnable
+    private var timeStampLastClick = 0L
+    private var timeStampLastDoubleClick = 0L
 
     override fun onClick(v: View?) {
-        if (SystemClock.elapsedRealtime() - timestampLastClick < doubleClickQualificationSpanInMillis) {
+        if (SystemClock.elapsedRealtime() - timeStampLastClick < maximumTimeDifference) {
             isSingleEvent = false
             handler.removeCallbacks(runnable)
+            timeStampLastDoubleClick = SystemClock.elapsedRealtime()
             onDoubleClick()
             return
         }
         isSingleEvent = true
-        handler.postDelayed(runnable, DEFAULT_QUALIFICATION_SPAN)
-        timestampLastClick = SystemClock.elapsedRealtime()
+        handler.removeCallbacks(runnable)
+        handler.postDelayed(runnable, maximumTimeDifference)
+        timeStampLastClick = SystemClock.elapsedRealtime()
     }
 
     abstract fun onDoubleClick()
     abstract fun onSingleClick()
 
-    companion object {
-        private const val DEFAULT_QUALIFICATION_SPAN: Long = 200
-    }
-
-    init {
-        doubleClickQualificationSpanInMillis = DEFAULT_QUALIFICATION_SPAN
-        timestampLastClick = 0
-        handler = Handler(Looper.getMainLooper())
-        runnable = Runnable {
-            if (isSingleEvent) {
-                onSingleClick()
-            }
-        }
+    private val runnable = Runnable {
+        if (!isSingleEvent ||
+            SystemClock.elapsedRealtime() - timeStampLastDoubleClick < maximumTimeDifference
+        ) return@Runnable
+        onSingleClick()
     }
 }