Merge branch 'master' into patch-2

DocumentScanner.js

@@ -5,7 +5,7 @@ import {
     DeviceEventEmitter, // android
     NativeModules,
     requireNativeComponent,
-    View
+    View,
 } from 'react-native';
 
 var iface = {
@@ -49,9 +49,9 @@ class Scanner extends PureComponent{
     CameraManager.capture();
   }
 
-  render(){
-    return <DocumentScanner {...this.props}/>
+  render() {
+    return <DocumentScanner {...this.props} />;
   }
 }
 
-export default Scanner;
+export default Scanner;

README.md

@@ -1,45 +1,47 @@
-
 ![enter image description 
 here](https://media.giphy.com/media/KZBdm9gbGGRBlRZV1t/giphy.gif)
-
- ## React Native module to auto scan documents (Android only)
 
-
-Live document detection library. Returns either a URI  of the captured image, allowing you to easily store it or use it as you wish !
+## React Native module to auto scan documents (Android only)
+
+Live document detection library. Returns either a URI of the captured image, allowing you to easily store it or use it as you wish !
 
 Features:
- - Live detection
- - Perspective correction and image crop
- - Flash
 
+- Live detection
+- Perspective correction and image crop
+- Flash
 
 ### Get started
 
 `npm install --save react-native-documentscanner-android`
 
- In MainApplication.java, add this Line `import com.documentscanner.DocumentScannerPackage;` at the top of file,
+In MainApplication.java, add this Line `import com.documentscanner.DocumentScannerPackage;` at the top of file,
 
- ```java
+```java
 @Override
 protected  List<ReactPackage> getPackages() {
-return Arrays.<ReactPackage>asList(
-	new  MainReactPackage(),
-	new  DocumentScannerPackage() <--- this  line,
-	...
-	);
+  return Arrays.<ReactPackage>asList(
+    new  MainReactPackage(),
+    new  DocumentScannerPackage() <--- this  line,
+    ...
+  );
 }
 ```
+
 #### IMPORTANT - Go to folder app/settings.gradle and add
 
 ```java
 include ':react-native-documentscanner-android'
 project(':react-native-documentscanner-android').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-documentscanner-android/android')
 ```
- #### Add this (don't forget)
+
+#### Add this (don't forget)
+
 ```java
 include ':openCVLibrary310'
 project(':openCVLibrary310').projectDir = new File(rootProject.projectDir,'../node_modules/react-native-documentscanner-android/android/openCVLibrary310')
 ```
+
  #### In android/app/src/main/AndroidManifest.xml
  Change manifest header to avoid "Manifest merger error". After you add `xmlns:tools="http://schemas.android.com/tools"` should look like this:
  ```
@@ -53,73 +55,76 @@ project(':openCVLibrary310').projectDir = new File(rootProject.projectDir,'../no
  ```
  <uses-permission android:name="android.permission.CAMERA" />
  ```
+ #### Add this to android/app/build.gradle (dependencies section)
+```
+implementation project(':react-native-documentscanner-android')
+```
 
 ### Usage
 
 ```javascript
-import  DocumentScanner  from  'react-native-documentscanner-android';
-
-class  YourComponent  extends  Component {
-	render() {
-		return (
-			<View>
-				<DocumentScanner
-					onPictureTaken={data  =>{
-						console.log(data.path)
-					}}
-					enableTorch={false}
-					detectionCountBeforeCapture={5}
-				/>
-			</View>
-		);
-	}
+import DocumentScanner from 'react-native-documentscanner-android';
+
+class YourComponent extends Component {
+  render() {
+    return (
+      <View>
+        <DocumentScanner
+          onPictureTaken={data => {
+            console.log(data.path);
+          }}
+          enableTorch={false}
+          detectionCountBeforeCapture={5}
+        />
+      </View>
+    );
+  }
 }
-
 ```
 
-
-
-
 ### Properties
 
-|Props|Default|Type|Description
-|--|--|--|--|
-| manualOnly | false | `bool`|if true, auto-detect is disabled
-| enableTorch | false | `bool`|Allows to active or deactivate flash during document detection
-| detectionCountBeforeCapture | 15 |`number`|Number of correct rectangle to detect before capture document
-| brightness | 10 | `number`|This property only work to enhance document at the save moment
-| contrast | 1 | `number`|This property only work to enhance document at the save moment
-| noGrayScale | false | `bool`|Currently this module saves pictures only in gray scale, this property adds the option to disable gray scale
-
-
+| Props                       | Default | Type     | Description                                                                                                  |
+| --------------------------- | ------- | -------- | ------------------------------------------------------------------------------------------------------------ |
+| manualOnly                  | false   | `bool`   | if true, auto-detect is disabled                                                                             |
+| enableTorch                 | false   | `bool`   | Allows to active or deactivate flash during document detection                                               |
+| detectionCountBeforeCapture | 15      | `number` | Number of correct rectangle to detect before capture document                                                |
+| brightness                  | 10      | `number` | This property only work to enhance document at the save moment                                               |
+| contrast                    | 1       | `number` | This property only work to enhance document at the save moment                                               |
+| noGrayScale                 | false   | `bool`   | Currently this module saves pictures only in gray scale, this property adds the option to disable gray scale |
 
 ### Manual capture
 
- - Get the component ref
+- Get the component ref
 
 `<DocumentScanner ref={(ref) => this.scanner = ref} />`
 
 - Then
-```javascript  
+
+```javascript
 this.scanner.capture();
 ```
+
 ### Returned Image
-| Prop | Params |Type| Description
-|--|--|--|--|
-| onPictureTaken | data | object | Returns an image in a object `{ path: ('imageUri')}`
-| onProcessing | data | object |Returns an object `{processing: (true | false)}` to show is an image is processing yet
+
+| Prop           | Params | Type   | Description                                                                            |
+| -------------- | ------ | ------ | -------------------------------------------------------------------------------------- |
+| onPictureTaken | data   | object | Returns an image in a object `{ path: ('imageUri')}`                                   |
+| onProcessing   | data   | object | Returns an object `{processing: (true | false)}` to show is an image is processing yet |
 
 The images are saved in `Documents` folder.
 
- #### Todo
- - Pass overlay color dynamically
- - Pass contrast and brightness to preview
- - Use front cam
- - Use base64
-
+
+#### Todo
+
+- Pass overlay color dynamically
+- Pass contrast and brightness to preview
+- Use front cam
+- Use base64
+
 ## Contributors are welcome !!
 
+Inspired in android project
 
-Inspired in android project 
 - https://github.com/ctodobom/OpenNoteScanner
 - https://github.com/Michaelvilleneuve/react-native-document-scanner

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>

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,24 @@ 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();
+            case (MotionEvent.ACTION_DOWN):
+            case (MotionEvent.ACTION_MOVE):
+            case (MotionEvent.ACTION_CANCEL):
+            case (MotionEvent.ACTION_OUTSIDE):
+                return true;
+            default:
+                return super.onTouchEvent(event);
+        }
+    }
+
     public void setDocumentAnimation(boolean animate){
         view.setDocumentAnimation(animate);
     }
@@ -91,4 +111,8 @@ public void setRemoveGrayScale(boolean grayscale) {
     public void capture() {
         view.capture();
     }
+
+    private void focus() {
+        view.focus();
+    }
 }

android/src/main/java/com/documentscanner/views/OpenNoteCameraView.java

@@ -184,6 +184,10 @@ public void capture(){
         this.requestManualPicture();
     }
 
+    public void focus(){
+        this.requestManualFocus();
+    }
+
     public void setManualOnly( boolean manualOnly){
         this.manualCapture = manualOnly;
     }
@@ -579,6 +583,24 @@ public void run() {
         });
     }
 
+    public boolean requestManualFocus(){
+      PackageManager pm = mActivity.getPackageManager();
+      if(safeToTakePicture){
+        safeToTakePicture = false;
+        if(pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_AUTOFOCUS)) {
+          mCamera.autoFocus(new Camera.AutoFocusCallback() {
+            @Override
+            public void onAutoFocus(boolean success, Camera camera) {
+              Log.d(TAG,"Manual focus => " + success);
+            }
+          });
+        }
+        safeToTakePicture = true;
+        return true;
+      }
+      return false;
+    }
+
     public boolean requestManualPicture(){
         this.blinkScreenAndShutterSound();
         this.waitSpinnerVisible();