From 4816ef89dba421ac8c84723ff2710fb5a11aca26 Mon Sep 17 00:00:00 2001
From: anonymouzz <sokolov.m.v@gmail.com>
Date: Fri, 4 Aug 2017 11:20:52 +0700
Subject: [PATCH] move CameraActivity to com.dinect.checker.zbar package, refs
 #9991

---
 android/app/src/main/AndroidManifest.xml                    | 2 +-
 .../app/src/main/java/com/dinect/checker/MainActivity.java  | 4 +++-
 .../java/com/dinect/checker/{ => zbar}/CameraActivity.java  | 6 +++++-
 .../java/com/dinect/checker/{ => zbar}/CameraPreview.java   | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 rename android/app/src/main/java/com/dinect/checker/{ => zbar}/CameraActivity.java (97%)
 rename android/app/src/main/java/com/dinect/checker/{ => zbar}/CameraPreview.java (99%)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1aa0c1c..0cdc19a 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
         </activity>
 
         <activity
-            android:name="com.dinect.checker.CameraActivity"
+            android:name="com.dinect.checker.zbar.CameraActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
 
diff --git a/android/app/src/main/java/com/dinect/checker/MainActivity.java b/android/app/src/main/java/com/dinect/checker/MainActivity.java
index 6c300f2..7fd8efc 100644
--- a/android/app/src/main/java/com/dinect/checker/MainActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/MainActivity.java
@@ -6,7 +6,9 @@ import android.util.Log;
 import android.widget.Toast;
 import android.content.Context;
 import android.content.SharedPreferences;
-import com.dinect.checker.zxing.ScannerActivity;
+
+import com.dinect.checker.zbar.CameraActivity;
+
 import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.GeneratedPluginRegistrant;
 import io.flutter.plugin.common.MethodCall;
diff --git a/android/app/src/main/java/com/dinect/checker/CameraActivity.java b/android/app/src/main/java/com/dinect/checker/zbar/CameraActivity.java
similarity index 97%
rename from android/app/src/main/java/com/dinect/checker/CameraActivity.java
rename to android/app/src/main/java/com/dinect/checker/zbar/CameraActivity.java
index 67cc4d5..9d9429d 100644
--- a/android/app/src/main/java/com/dinect/checker/CameraActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/zbar/CameraActivity.java
@@ -1,4 +1,4 @@
-package com.dinect.checker;
+package com.dinect.checker.zbar;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -9,6 +9,10 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
 
+import com.dinect.checker.AbstractScannerActivity;
+import com.dinect.checker.R;
+import com.dinect.checker.Utils;
+
 import net.sourceforge.zbar.Config;
 import net.sourceforge.zbar.Image;
 import net.sourceforge.zbar.ImageScanner;
diff --git a/android/app/src/main/java/com/dinect/checker/CameraPreview.java b/android/app/src/main/java/com/dinect/checker/zbar/CameraPreview.java
similarity index 99%
rename from android/app/src/main/java/com/dinect/checker/CameraPreview.java
rename to android/app/src/main/java/com/dinect/checker/zbar/CameraPreview.java
index fbb1e09..0b71009 100644
--- a/android/app/src/main/java/com/dinect/checker/CameraPreview.java
+++ b/android/app/src/main/java/com/dinect/checker/zbar/CameraPreview.java
@@ -1,4 +1,4 @@
-package com.dinect.checker;
+package com.dinect.checker.zbar;
 
 import android.app.Activity;
 import android.content.Context;