Add release application

ReceiptManager · Oct 25, 2020 · b37db71 · b37db71
1 parent f69dab9
commit b37db71
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 
 ### Android ###
 # Built application files
-*.apk
+#*.apk
 *.aar
 *.ap_
 *.aab
@@ -278,8 +278,6 @@ modules.xml
 # NDK
 obj/
 
-# IntelliJ IDEA
-/out/
 
 # User-specific configurations
 .idea/caches/

diff --git a/lib/ui/camera_picker.dart b/lib/ui/camera_picker.dart
@@ -64,39 +64,6 @@ class TakePictureScreenState extends State<TakePictureScreen> {
     super.dispose();
   }
 
-  Future<File> fixExifRotation(String imagePath) async {
-    final originalFile = File(imagePath);
-    List<int> imageBytes = await originalFile.readAsBytes();
-
-    final originalImage = img.decodeImage(imageBytes);
-    final height = originalImage.height;
-    final width = originalImage.width;
-
-    if (height >= width) {
-      return originalFile;
-    }
-
-    final exifData = await readExifFromBytes(imageBytes);
-    img.Image fixedImage;
-
-    if (height < width) {
-      if (exifData['Image Orientation'].printable.contains('Horizontal')) {
-        fixedImage = img.copyRotate(originalImage, 90);
-      } else if (exifData['Image Orientation'].printable.contains('180')) {
-        fixedImage = img.copyRotate(originalImage, -90);
-      } else if (exifData['Image Orientation'].printable.contains('CCW')) {
-        fixedImage = img.copyRotate(originalImage, 180);
-      } else {
-        fixedImage = img.copyRotate(originalImage, 0);
-      }
-    }
-
-    final fixedFile =
-        await originalFile.writeAsBytes(img.encodeJpg(fixedImage));
-
-    return fixedFile;
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -128,8 +95,6 @@ class TakePictureScreenState extends State<TakePictureScreen> {
           // Take an picture with the best resolution
           await _controller.takePicture(path);
           // await FlutterExifRotation.rotateAndSaveImage(path: path);
-          await fixExifRotation(path);
-
           Navigator.push(
               context,
               MaterialPageRoute(
@@ -155,6 +120,7 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen> {
   final GlobalKey<ScaffoldState> key2 = GlobalKey<ScaffoldState>();
   Color _acceptButtonColor = Colors.green;
   Color _declineButtonColor = Colors.red;
+  double _progress = 0.0;
   ProgressDialog pr;
 
   bool _isButtonDisabled;
@@ -167,25 +133,59 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen> {
     _isButtonDisabled = false;
   }
 
+  Future<File> fixExifRotation(String imagePath) async {
+    final originalFile = File(imagePath);
+    List<int> imageBytes = await originalFile.readAsBytes();
+
+    final originalImage = img.decodeImage(imageBytes);
+    final height = originalImage.height;
+    final width = originalImage.width;
+
+    if (height >= width) {
+      return originalFile;
+    }
+
+    final exifData = await readExifFromBytes(imageBytes);
+    img.Image fixedImage;
+
+    if (height < width) {
+      if (exifData['Image Orientation'].printable.contains('Horizontal')) {
+        fixedImage = img.copyRotate(originalImage, 90);
+      } else if (exifData['Image Orientation'].printable.contains('180')) {
+        fixedImage = img.copyRotate(originalImage, -90);
+      } else if (exifData['Image Orientation'].printable.contains('CCW')) {
+        fixedImage = img.copyRotate(originalImage, 180);
+      } else {
+        fixedImage = img.copyRotate(originalImage, 0);
+      }
+    }
+
+    final fixedFile =
+        await originalFile.writeAsBytes(img.encodeJpg(fixedImage));
+
+    return fixedFile;
+  }
+
   @override
   Widget build(BuildContext context) {
-    pr = ProgressDialog(
-      context,
-      type: ProgressDialogType.Normal,
-      textDirection: TextDirection.ltr,
-      isDismissible: false,
-    );
+    pr = ProgressDialog(context,
+        type: ProgressDialogType.Download,
+        isDismissible: false,
+        showLogs: true);
 
     pr.style(
-      message:
-          'Parsing image using tesseract. This takes some time.',
-      borderRadius: 10.0,
-      backgroundColor: Colors.white,
-      elevation: 10.0,
-      insetAnimCurve: Curves.easeInCirc,
-      messageTextStyle: TextStyle(
-          color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600),
-    );
+        message: 'Downloading file...',
+        borderRadius: 10.0,
+        backgroundColor: Colors.white,
+        progressWidget: CircularProgressIndicator(),
+        elevation: 10.0,
+        insetAnimCurve: Curves.easeInOut,
+        progress: 0.0,
+        maxProgress: 100.0,
+        progressTextStyle: TextStyle(
+            color: Colors.black, fontSize: 13.0, fontWeight: FontWeight.w400),
+        messageTextStyle: TextStyle(
+            color: Colors.black, fontSize: 19.0, fontWeight: FontWeight.w600));
 
     return Scaffold(
       appBar: AppBar(title: Text('Display the Picture')),
@@ -231,11 +231,10 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen> {
                                       await SharedPreferences.getInstance();
                                   String ip = sharedPrefs.get("ipv4");
 
-                                  pr.show();
+                                  await fixExifRotation(imagePath);
                                   await NetworkClient.sendImage(
                                       File(imagePath), ip, context, key2);
-
-                                  pr.hide();
+                                  _progress = _progress + 80.0;
                                 })))),
             ],
           )

diff --git a/release_apk/receipt-manager.apk b/release_apk/receipt-manager.apk