Merge branch 'working' into main

BlockchainResearchLab · Oct 28, 2022 · e76b9a0 · e76b9a0
2 parents 16a5a2d + e0b0c26
commit e76b9a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/lib/barcodeScanner.dart b/lib/barcodeScanner.dart
@@ -36,7 +36,6 @@ class _ScannerState extends State<Scanner> {
           );
         },
       );
-
       if (kDebugMode) {
         print(barcodeScanRes);
       }

diff --git a/lib/result2.dart b/lib/result2.dart
@@ -26,7 +26,7 @@ class _ScannedEntryState extends State<ScannedEntry> {
 
 
     return Scaffold(
-      bottomSheet: ResultFooter(),
+      bottomSheet: resultFooter(),
       body: Container(
         padding: const EdgeInsets.only(left: 20, right: 20),
         child: Center(
@@ -144,8 +144,7 @@ class _ScannedEntryState extends State<ScannedEntry> {
                       style: TextStyle(fontSize: 18),
                     ),
                   );
-                }
-                ;
+                };
               },
             ),
           ),
@@ -181,7 +180,9 @@ class Buttons extends StatelessWidget {
         ),
         shape: MaterialStatePropertyAll(
           RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(10),
+            borderRadius: BorderRadius.circular(
+              10,
+            ),
           ),
         ),
       ),
@@ -205,13 +206,10 @@ class Buttons extends StatelessWidget {
   }
 }
 
-Widget ResultFooter() {
+Widget resultFooter() {
   return Row(
     mainAxisAlignment: MainAxisAlignment.center,
     children: [
-      // SizedBox(
-      //   width: 145,
-      // ),
       SizedBox(
         height: 100,
         width: 100,
@@ -233,7 +231,7 @@ Widget ResultFooter() {
                   "images/brl_logo.png",
                 ),
               ),
-            )
+            ),
           ],
         ),
       ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,6 @@ class _ScannerState extends State<Scanner> { @@
               );
             },
           );
           if (kDebugMode) {
             print(barcodeScanRes);
           }
@@ Expand Down @@