feat: Extract camera scanner from core library as a new activity

enioka-Haute-Couture · Apr 17, 2024 · 5028b95 · 5028b95
1 parent e1233eb
commit 5028b95
Show file tree

Hide file tree

Showing 48 changed files with 823 additions and 250 deletions.
diff --git a/demoscannerapp/build.gradle b/demoscannerapp/build.gradle
@@ -27,6 +27,7 @@ android {
 dependencies {
     // Reference our own library, directly compiled from its project
     implementation project(':enioka_scan');
+    implementation project(':enioka_scan_camera');
 
     if (gradle.ext.withHoneywell) {
         implementation project(':enioka_scan_honeywell');

diff --git a/enioka_scan/build.gradle b/enioka_scan/build.gradle
@@ -35,14 +35,14 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 
-    // ZBAR & ZXING (Zebra Crossing) = camera. From Maven Central.
-    api('me.dm7.barcodescanner:zbar:1.9.8') {
-        transitive = false
-    }
-    api('me.dm7.barcodescanner:core:1.9.8') {
-        transitive = false
-    }
-    api 'com.google.zxing:core:3.5.1'
+//    // ZBAR & ZXING (Zebra Crossing) = camera. From Maven Central.
+//    api('me.dm7.barcodescanner:zbar:1.9.8') {
+//        transitive = false
+//    }
+//    api('me.dm7.barcodescanner:core:1.9.8') {
+//        transitive = false
+//    }
+//    api 'com.google.zxing:core:3.5.1'
 
     // Test things (useless for now)
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {

diff --git a/enioka_scan/src/main/AndroidManifest.xml b/enioka_scan/src/main/AndroidManifest.xml
@@ -29,20 +29,13 @@
 
     </application>
 
-    <uses-feature
-        android:name="android.hardware.camera.autofocus"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
     <uses-feature
         android:name="android.hardware.bluetooth_le"
         android:required="false" />
     <uses-feature
         android:name="android.hardware.bluetooth"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <!-- For newer API versions -->

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/activities/ManualInputFragment.java b/enioka_scan/src/main/java/com/enioka/scanner/activities/ManualInputFragment.java
@@ -76,7 +76,7 @@ public void onAttach(Context activity) {
             // The host should be an activity implementing a barcode listener.
             cb = (ScannerClient) activity;
         } catch (ClassCastException e) {
-            throw new ClassCastException(activity.toString() + " must implement ScannerDataCallback");
+            throw new ClassCastException(activity.toString() + " must implement ScannerClient");
         }
     }