From c608407fc140c1d293733a8439ea7659de251183 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 7 May 2017 11:55:17 +0200
Subject: [PATCH] implement the "Focus before capture" functionality

---
 .../kotlin/com/simplemobiletools/camera/Preview.kt     | 10 +++++++++-
 .../camera/activities/MainActivity.kt                  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
index a443d403..c4226f85 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
@@ -256,7 +256,15 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
         })
     }
 
-    fun takePicture() {
+    fun tryTakePicture() {
+        if (config.focusBeforeCapture) {
+            focusArea(true)
+        } else {
+            takePicture()
+        }
+    }
+
+    private fun takePicture() {
         if (mCanTakePicture) {
             val selectedResolution = getSelectedResolution()
             mParameters!!.setPictureSize(selectedResolution.width, selectedResolution.height);
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index 15fb32b1..0715fffa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -269,7 +269,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
     private fun handleShutter() {
         if (mIsInPhotoMode) {
             toggleBottomButtons(true)
-            mPreview?.takePicture()
+            mPreview?.tryTakePicture()
             Handler().postDelayed({
                 toggleBottomButtons(false)
             }, Preview.PHOTO_PREVIEW_LENGTH)