From 9d1454c47f3cfb5fe3ff8f5e5771d8b48bdfbb38 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 13 Jun 2016 23:56:02 +0200
Subject: [PATCH] activate the shutter button at long pressing the preview

---
 .../camera/MainActivity.java                  | 21 ++++++++++-----
 .../com/simplemobiletools/camera/Preview.java | 27 ++++++++++++++++---
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
index c8f42e6c..794b9cf7 100644
--- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
@@ -46,7 +46,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
     private Preview preview;
     private int currCamera;
     private boolean isFlashEnabled;
-    private boolean isPhoto;
+    private boolean isInPhotoMode;
     private boolean isAskingPermissions;
     private boolean isCameraAvailable;
     private int currVideoRecTimer;
@@ -84,7 +84,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
         preview.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         viewHolder.addView(preview);
         sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
-        isPhoto = true;
+        isInPhotoMode = true;
         timerHandler = new Handler();
     }
 
@@ -165,7 +165,11 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
             return;
         }
 
-        if (isPhoto) {
+        handleShutter();
+    }
+
+    private void handleShutter() {
+        if (isInPhotoMode) {
             preview.takePicture();
         } else {
             final Resources res = getResources();
@@ -201,10 +205,10 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
         }
         disableFlash();
         hideTimer();
-        isPhoto = !isPhoto;
+        isInPhotoMode = !isInPhotoMode;
         toggleCameraBtn.setVisibility(View.VISIBLE);
 
-        if (isPhoto) {
+        if (isInPhotoMode) {
             initPhotoButtons();
         } else {
             initVideoButtons();
@@ -274,7 +278,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
             sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
         }
 
-        if (!isPhoto) {
+        if (!isInPhotoMode) {
             initVideoButtons();
         }
     }
@@ -333,4 +337,9 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
     public void setIsCameraAvailable(boolean available) {
         isCameraAvailable = available;
     }
+
+    @Override
+    public void activateShutter() {
+        handleShutter();
+    }
 }
diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java
index 1570fba5..f2bda19f 100644
--- a/app/src/main/java/com/simplemobiletools/camera/Preview.java
+++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java
@@ -14,6 +14,7 @@ import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
+import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 
 import java.io.File;
@@ -21,7 +22,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener {
+public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener{
     private static final String TAG = Preview.class.getSimpleName();
     private static final int FOCUS_AREA_SIZE = 200;
     private static final int PHOTO_PREVIEW_LENGTH = 1000;
@@ -41,6 +42,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
     private static boolean isRecording;
     private static boolean isVideoMode;
     private static String curVideoPath;
+    private static int lastClickX;
+    private static int lastClickY;
 
     public Preview(Context context) {
         super(context);
@@ -57,6 +60,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
         canTakePicture = false;
         surfaceView.setOnTouchListener(this);
+        surfaceView.setOnClickListener(this);
+        surfaceView.setOnLongClickListener(this);
         isFlashEnabled = false;
     }
 
@@ -174,12 +179,12 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         }
     };
 
-    private void focusArea(MotionEvent event) {
+    private void focusArea() {
         if (camera == null)
             return;
 
         camera.cancelAutoFocus();
-        final Rect focusRect = calculateFocusArea(event.getX(), event.getY());
+        final Rect focusRect = calculateFocusArea(lastClickX, lastClickY);
         if (parameters.getMaxNumFocusAreas() > 0) {
             final List<Camera.Area> focusAreas = new ArrayList<>(1);
             focusAreas.add(new Camera.Area(focusRect, 1000));
@@ -326,7 +331,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
 
     @Override
     public boolean onTouch(View v, MotionEvent event) {
-        focusArea(event);
+        lastClickX = (int) event.getX();
+        lastClickY = (int) event.getY();
         return false;
     }
 
@@ -419,9 +425,22 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         isRecording = false;
     }
 
+    @Override
+    public boolean onLongClick(View v) {
+        callback.activateShutter();
+        return true;
+    }
+
+    @Override
+    public void onClick(View v) {
+        focusArea();
+    }
+
     public interface PreviewListener {
         void setFlashAvailable(boolean available);
 
         void setIsCameraAvailable(boolean available);
+
+        void activateShutter();
     }
 }