From 9776edbe45c5a53bb32943f89167b9f4ac28133a Mon Sep 17 00:00:00 2001
From: Weslley Rocha <weslleytato.12@gmail.com>
Date: Mon, 18 Mar 2019 11:05:50 -0300
Subject: [PATCH] moved to internal function

---
 DocumentScanner.js                             | 15 +--------------
 .../src/main/AndroidManifest.xml               |  2 +-
 .../documentscanner/DocumentScannerModule.java |  6 ------
 .../com/documentscanner/views/MainView.java    | 18 +++++++++++++++++-
 styles.js                                      | 15 ---------------
 5 files changed, 19 insertions(+), 37 deletions(-)
 delete mode 100644 styles.js

diff --git a/DocumentScanner.js b/DocumentScanner.js
index 06f5e366..85eb322e 100644
--- a/DocumentScanner.js
+++ b/DocumentScanner.js
@@ -6,11 +6,8 @@ import {
     NativeModules,
     requireNativeComponent,
     View,
-    TouchableOpacity
 } from 'react-native';
 
-import Styles from './styles';
-
 var iface = {
     name: 'DocumentScanner',
     propTypes: {
@@ -34,7 +31,6 @@ class Scanner extends PureComponent{
   static defaultProps = {
     onPictureTaken: ()=>{},
     onProcessing: ()=>{},
-    style: Styles.fill,
   }
 
   componentWillMount(){
@@ -53,17 +49,8 @@ class Scanner extends PureComponent{
     CameraManager.capture();
   }
 
-  focus = ()=>{
-    CameraManager.focus();
-  }
-
   render() {
-    return (
-      <View style={this.props.style}>
-        <DocumentScanner {...this.props} />
-        <TouchableOpacity activeOpacity={1} style={Styles.focusOverlay} onPressOut={() => this.focus()} />
-      </View>
-    );
+    return <DocumentScanner {...this.props} />;
   }
 }
 
diff --git a/android/openCVLibrary310/src/main/AndroidManifest.xml b/android/openCVLibrary310/src/main/AndroidManifest.xml
index f6fcc8f2..f99fed78 100644
--- a/android/openCVLibrary310/src/main/AndroidManifest.xml
+++ b/android/openCVLibrary310/src/main/AndroidManifest.xml
@@ -4,5 +4,5 @@
       android:versionCode="3100"
       android:versionName="3.1.0">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21" />
+    <!--<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21" />-->
 </manifest>
diff --git a/android/src/main/java/com/documentscanner/DocumentScannerModule.java b/android/src/main/java/com/documentscanner/DocumentScannerModule.java
index 785c3e49..bf56140d 100644
--- a/android/src/main/java/com/documentscanner/DocumentScannerModule.java
+++ b/android/src/main/java/com/documentscanner/DocumentScannerModule.java
@@ -33,10 +33,4 @@ public void capture(){
         MainView view = MainView.getInstance();
         view.capture();
     }
-
-    @ReactMethod
-    public void focus(){
-        MainView view = MainView.getInstance();
-        view.focus();
-    }
 }
diff --git a/android/src/main/java/com/documentscanner/views/MainView.java b/android/src/main/java/com/documentscanner/views/MainView.java
index de718e5d..4ead91d7 100644
--- a/android/src/main/java/com/documentscanner/views/MainView.java
+++ b/android/src/main/java/com/documentscanner/views/MainView.java
@@ -2,7 +2,9 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.support.v4.view.MotionEventCompat;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.widget.FrameLayout;
 
 import com.documentscanner.R;
@@ -44,6 +46,20 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
         }
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        int action = MotionEventCompat.getActionMasked(event);
+
+        switch (action) {
+            case (MotionEvent.ACTION_UP):
+                this.focus();
+                return true;
+            default:
+                return super.onTouchEvent(event);
+        }
+    }
+
     public void setDocumentAnimation(boolean animate){
         view.setDocumentAnimation(animate);
     }
@@ -92,7 +108,7 @@ public void capture() {
         view.capture();
     }
 
-    public void focus() {
+    private void focus() {
         view.focus();
     }
 }
diff --git a/styles.js b/styles.js
deleted file mode 100644
index c9bc47d9..00000000
--- a/styles.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-export default StyleSheet.create({
-  focusOverlay: {
-    position: 'absolute',
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-    backgroundColor: 'transparent',
-  },
-  fill:{
-    flex: 1
-  }
-});