Update

Author: aashari

app/build.gradle

@@ -2,43 +2,28 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
-
     defaultConfig {
-        applicationId "id.aashari.code.camerascanner"
-        minSdkVersion 14
+        applicationId "id.aashari.code.camerascannertesting2"
+        minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        ndk
-                {
-                    moduleName "Scanner"
-                }
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    /*sourceSets.main
-            {
-                jni.srcDirs = []
-                jniLibs.srcDir 'src/main/libs'
-            }*/
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    externalNativeBuild {
-        ndkBuild {
-            path 'src/main/jni/Android.mk'
-        }
-    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'com.android.support:support-v4:27.1.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation project(':openCVLibrary341')
 }

app/src/androidTest/java/id/aashari/code/camerascanner/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/id/aashari/code/camerascannertesting2/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package id.aashari.code.camerascanner;
+package id.aashari.code.camerascannertesting2;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("id.aashari.code.camerascanner", appContext.getPackageName());
+        assertEquals("id.aashari.code.camerascannertesting2", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="id.aashari.code.camerascanner">
+    package="id.aashari.code.camerascannertesting2">
 
     <application
         android:allowBackup="true"
@@ -17,7 +17,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".ImageCropActivity" />
-        <activity android:name=".ImageEnhanceActivity"></activity>
+        <activity android:name=".ImageEnhanceActivity" />
     </application>
 
 </manifest>

app/src/main/java/id/aashari/code/camerascanner/Helpers/NativeClass.java

@@ -1,4 +1,4 @@
-package id.aashari.code.camerascanner;
+package id.aashari.code.camerascannertesting2;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -15,14 +15,18 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import org.opencv.core.MatOfPoint2f;
+import org.opencv.core.Point;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import id.aashari.code.camerascanner.Helpers.MyConstants;
-import id.aashari.code.camerascanner.Helpers.NativeClass;
-import id.aashari.code.camerascanner.Helpers.PolygonView;
+import id.aashari.code.camerascannertesting2.helpers.MyConstants;
+import id.aashari.code.camerascannertesting2.libraries.NativeClass;
+import id.aashari.code.camerascannertesting2.libraries.PolygonView;
 
 public class ImageCropActivity extends Activity {
 
@@ -134,24 +138,17 @@ private Map<Integer, PointF> getEdgePoints(Bitmap tempBitmap) {
 
     private List<PointF> getContourEdgePoints(Bitmap tempBitmap) {
         Log.v("aashari-tag", "getContourEdgePoints");
-        float[] points = nativeClass.getPoints(tempBitmap);
-        float x1 = points[0];
-        float x2 = points[1];
-        float x3 = points[2];
-        float x4 = points[3];
-
-        float y1 = points[4];
-        float y2 = points[5];
-        float y3 = points[6];
-        float y4 = points[7];
-
-
-        List<PointF> pointFs = new ArrayList<>();
-        pointFs.add(new PointF(x1, y1));
-        pointFs.add(new PointF(x2, y2));
-        pointFs.add(new PointF(x3, y3));
-        pointFs.add(new PointF(x4, y4));
-        return pointFs;
+
+        MatOfPoint2f point2f = nativeClass.getPoint(tempBitmap);
+        List<Point> points = Arrays.asList(point2f.toArray());
+
+        List<PointF> result = new ArrayList<>();
+        for (int i = 0; i < points.size(); i++) {
+            result.add(new PointF(((float) points.get(i).x), ((float) points.get(i).y)));
+        }
+
+        return result;
+
     }
 
     private Map<Integer, PointF> getOutlinePoints(Bitmap tempBitmap) {

app/src/main/java/id/aashari/code/camerascanner/ImageCropActivity.java renamed to app/src/main/java/id/aashari/code/camerascannertesting2/ImageCropActivity.java

@@ -1,14 +1,14 @@
-package id.aashari.code.camerascanner;
+package id.aashari.code.camerascannertesting2;
 
 import android.graphics.Bitmap;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
-import id.aashari.code.camerascanner.Helpers.MyConstants;
-import id.aashari.code.camerascanner.Helpers.NativeClass;
+import id.aashari.code.camerascannertesting2.helpers.MyConstants;
+import id.aashari.code.camerascannertesting2.libraries.NativeClass;
 
 public class ImageEnhanceActivity extends AppCompatActivity {
 
@@ -57,21 +57,24 @@ private void initializeImage() {
     private View.OnClickListener btnImageToBWClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            imageView.setImageBitmap(nativeClass.getBWBitmap(selectedImageBitmap));
+            //TODO: create BW
+            //imageView.setImageBitmap(nativeClass.getBWBitmap(selectedImageBitmap));
         }
     };
 
     private View.OnClickListener btnImageToMagicColorClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            imageView.setImageBitmap(nativeClass.getMagicColorBitmap(selectedImageBitmap));
+            //TODO: create magic color
+            //imageView.setImageBitmap(nativeClass.getMagicColorBitmap(selectedImageBitmap));
         }
     };
 
     private View.OnClickListener btnImageToGrayClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            imageView.setImageBitmap(nativeClass.getGrayBitmap(selectedImageBitmap));
+            //TODO: create Gray
+            //imageView.setImageBitmap(nativeClass.getGrayBitmap(selectedImageBitmap));
         }
     };
 

app/src/main/java/id/aashari/code/camerascanner/ImageEnhanceActivity.java renamed to app/src/main/java/id/aashari/code/camerascannertesting2/ImageEnhanceActivity.java

@@ -1,20 +1,19 @@
-package id.aashari.code.camerascanner;
+package id.aashari.code.camerascannertesting2;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import id.aashari.code.camerascanner.Helpers.MyConstants;
-import id.aashari.code.camerascanner.Helpers.NativeClass;
+import id.aashari.code.camerascannertesting2.helpers.MyConstants;
 
 public class MainActivity extends AppCompatActivity {
 

app/src/main/java/id/aashari/code/camerascanner/MainActivity.java renamed to app/src/main/java/id/aashari/code/camerascannertesting2/MainActivity.java

@@ -1,4 +1,4 @@
-package id.aashari.code.camerascanner.Helpers;
+package id.aashari.code.camerascannertesting2.helpers;
 
 import android.graphics.Bitmap;
 

app/src/main/java/id/aashari/code/camerascanner/Helpers/MyConstants.java renamed to app/src/main/java/id/aashari/code/camerascannertesting2/helpers/MyConstants.java

@@ -0,0 +1,32 @@
+package id.aashari.code.camerascannertesting2.libraries;
+
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+
+import org.opencv.android.Utils;
+import org.opencv.core.CvType;
+import org.opencv.core.Mat;
+import org.opencv.core.Scalar;
+
+public class ImageUtils {
+
+    public static Bitmap rotateBitmap(Bitmap original, int angle) {
+        Matrix matrix = new Matrix();
+        matrix.postRotate(90);
+        return Bitmap.createBitmap(original, 0, 0, original.getWidth(), original.getHeight(), matrix, true);
+    }
+
+    public static Mat bitmapToMat(Bitmap bitmap) {
+        Mat mat = new Mat(bitmap.getHeight(), bitmap.getWidth(), CvType.CV_8U, new Scalar(4));
+        Bitmap bitmap32 = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        Utils.bitmapToMat(bitmap32, mat);
+        return mat;
+    }
+
+    public static Bitmap matToBitmap(Mat mat) {
+        Bitmap bitmap = Bitmap.createBitmap(mat.cols(), mat.rows(), Bitmap.Config.ARGB_8888);
+        Utils.matToBitmap(mat, bitmap);
+        return bitmap;
+    }
+
+}

app/src/main/java/id/aashari/code/camerascannertesting2/libraries/ImageUtils.java

@@ -0,0 +1,47 @@
+package id.aashari.code.camerascannertesting2.libraries;
+
+import org.opencv.core.CvType;
+import org.opencv.core.MatOfPoint;
+import org.opencv.core.MatOfPoint2f;
+import org.opencv.core.Point;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class MathUtils {
+
+    public static MatOfPoint toMatOfPointInt(MatOfPoint2f mat) {
+        MatOfPoint matInt = new MatOfPoint();
+        mat.convertTo(matInt, CvType.CV_32S);
+        return matInt;
+    }
+
+    public static MatOfPoint2f toMatOfPointFloat(MatOfPoint mat) {
+        MatOfPoint2f matFloat = new MatOfPoint2f();
+        mat.convertTo(matFloat, CvType.CV_32FC2);
+        return matFloat;
+    }
+
+    public static double angle(Point p1, Point p2, Point p0) {
+        double dx1 = p1.x - p0.x;
+        double dy1 = p1.y - p0.y;
+        double dx2 = p2.x - p0.x;
+        double dy2 = p2.y - p0.y;
+        return (dx1 * dx2 + dy1 * dy2) / Math.sqrt((dx1 * dx1 + dy1 * dy1) * (dx2 * dx2 + dy2 * dy2) + 1e-10);
+    }
+
+    public static MatOfPoint2f scaleRectangle(MatOfPoint2f original, double scale) {
+        List<Point> originalPoints = original.toList();
+        List<Point> resultPoints = new ArrayList<Point>();
+
+        for (Point point : originalPoints) {
+            resultPoints.add(new Point(point.x * scale, point.y * scale));
+        }
+
+        MatOfPoint2f result = new MatOfPoint2f();
+        result.fromList(resultPoints);
+        return result;
+    }
+
+}