pull rmtmckenzie#206

Author: DeividAndreola

android/src/main/java/com/github/rmtmckenzie/qrmobilevision/QrCameraC2.java

@@ -28,6 +28,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -400,18 +401,35 @@ private Size getAppropriateSize(Size[] sizes) {
     }
 
     private Size[] sortSizesAscending(Size[] sizes) {
+        // Java code not supported on older versions of Android
+        /*
         Comparator<Size> compareWidth = new Comparator<Size>() {
             public int compare(Size a, Size b) {
                 return Integer.compare(a.getWidth(), b.getWidth());
-            }
+	@@ -412,6 +415,27 @@ public int compare(Size a, Size b) {
         };
-        Comparator<Size> compareHeight = new Comparator<Size>() {
-            public int compare(Size a, Size b) {
-                return Integer.compare(a.getHeight(), b.getHeight());
+        Arrays.sort(sizes, compareWidth.thenComparing(compareHeight));
+        */
+        Comparator<Size> areaComparator = new Comparator<Size>() {
+
+            public int compare(Size size, Size size2) {
+                if (size.equals(size2)) {
+                    return 0;
+                }
+
+                long width = size.getWidth();
+                long width2 = size2.getWidth();
+                long area = width * size.getHeight();
+                long area2 = width2 * size2.getHeight();
+
+                if (area == area2) {
+                    return (width > width2) ? 1 : -1;
+                }
+
+                return (area > area2) ? 1 : -1;
             }
         };
-
-        Arrays.sort(sizes, compareWidth.thenComparing(compareHeight));
+        Collections.sort(Arrays.asList(sizes), areaComparator);
         return sizes;
     }
 }

android/src/main/java/com/github/rmtmckenzie/qrmobilevision/QrDetector.java

@@ -7,6 +7,7 @@
 
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.mlkit.vision.barcode.BarcodeScanner;
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions;
 import com.google.mlkit.vision.barcode.BarcodeScanning;
@@ -72,9 +73,11 @@ private void processFrame(Frame frame) {
         if (image != null) {
             detector.process(image)
                 .addOnSuccessListener(this)
-                .addOnFailureListener(this);
+                .addOnFailureListener(this)
+                .addOnCompleteListener((Task<List<Barcode>> firebaseVisionBarcodes) -> {
+                    frame.close();
+                });
         }
-        frame.close();
     }
 
     @Override

example/android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:label="qr_mobile_vision_example"
         android:allowBackup="false">
         <activity
-            android:name="io.flutter.embedding.android.FlutterActivity"
+            android:name="${applicationName}"
             android:exported="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

pubspec.yaml

@@ -19,7 +19,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  native_device_orientation: ^1.0.0
+  native_device_orientation: ^1.1.4
   device_info_plus: '>=3.0.0 <5.0.0'
 
 false_secrets: