commit 07f78d7b6e41d63bf4098596b6982527fb3c0d8c
author Luca Stefani <luca.stefani.ge1@gmail.com> Sun Aug 07 22:24:07 2022 +0200
committer LuK1337 <priv.luk@gmail.com> Thu Sep 29 22:22:52 2022 +0200
tree 27747efe9a3872ad86921763b4a06a06ef6e681e
parent 2f9f81d8cc5724ebc2187e357a386454b51d912d

Aperture: Implement focus interceptor properly

Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
Change-Id: If0b7a7b59d6a1ecb7be9c00e92ae54c0b0cbed58

app/src/main/java/org/lineageos/aperture/MainActivity.kt

diff --git a/app/src/main/java/org/lineageos/aperture/MainActivity.kt b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
index 834f61a..8a41d2e 100644
--- a/app/src/main/java/org/lineageos/aperture/MainActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
@@ -13,6 +13,7 @@
 import android.util.Log
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -81,6 +82,8 @@
 
     private var isTakingPhoto: Boolean = false
 
+    private var viewFinderTouchEvent: MotionEvent? = null
+
     private var recordingTime = 0L
         set(value) {
             field = value
@@ -373,18 +376,32 @@
                 }
             }
         }
-        viewFinder.setOnTouchListener { v, event ->
-            if (event != null) {
-                if (event.action == MotionEvent.ACTION_DOWN) {
-                    viewFinderFocus.x = event.x - (viewFinderFocus.width / 2)
-                    viewFinderFocus.y = event.y + (viewFinderFocus.height / 2)
-                }
-            } else {
-                viewFinderFocus.x = (v.width - viewFinderFocus.width) / 2f
-                viewFinderFocus.y = (v.height - viewFinderFocus.height) / 2f
+
+        viewFinder.setOnTouchListener { view, event ->
+            val isSingleTouch = event.pointerCount == 1
+            val isUpEvent = event.action == MotionEvent.ACTION_UP
+            val notALongPress = (event.eventTime - event.downTime
+                    < ViewConfiguration.getLongPressTimeout())
+            if (isSingleTouch && isUpEvent && notALongPress) {
+                // If the event is a click, invoke tap-to-focus and forward it to user's
+                // OnClickListener#onClick.
+                viewFinderTouchEvent = event
+                view.performClick()
+                // A click has been detected and forwarded. Consume the event so onClick won't be
+                // invoked twice.
+                return@setOnTouchListener true
             }
             return@setOnTouchListener false
         }
+        viewFinder.setOnClickListener { view ->
+            viewFinderTouchEvent?.let {
+                viewFinderFocus.x = it.x - (viewFinderFocus.width / 2)
+                viewFinderFocus.y = it.y + (viewFinderFocus.height / 2)
+            } ?: run {
+                viewFinderFocus.x = (view.width - viewFinderFocus.width) / 2f
+                viewFinderFocus.y = (view.height - viewFinderFocus.height) / 2f
+            }
+        }
 
         // Observe zoom state
         cameraController.zoomState.observe(this) {