Merge pull request #10 from Team-Optix-3749/barcode-scanner

Barcode scanner

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: "12.x"
-      - uses: subosito/flutter-action@v1.3.2
+      - uses: subosito/flutter-action@v2
       - run: flutter pub get
       - run: flutter build apk
 

android/app/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.3'
     }
@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

lib/main.dart

@@ -30,11 +30,17 @@ class MyApp extends StatelessWidget {
       ],
     );
     return MultiProvider(
-      providers: [StreamProvider<firebase.User>.value(value: Auth.authState())],
-      child: Consumer<firebase.User>(
+      providers: [
+        StreamProvider<firebase.User?>.value(
+          value: Auth.authState(),
+          initialData: null,
+        )
+      ],
+      child: Consumer<firebase.User?>(
         builder: (context, user, child) {
           if (user != null) {
-            return FutureProvider<firebase.IdTokenResult>(
+            return FutureProvider<firebase.IdTokenResult?>(
+              initialData: null,
               create: (_) => user.getIdTokenResult(),
               child: MaterialApp(
                 title: 'OptixToolkit',
@@ -66,8 +72,8 @@ class MyApp extends StatelessWidget {
 class MainApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    if (Provider.of<firebase.User>(context) == null) return FormPage();
-    if (Provider.of<firebase.IdTokenResult>(context) == null) return Loading();
+    if (Provider.of<firebase.User?>(context) == null) return FormPage();
+    if (Provider.of<firebase.IdTokenResult?>(context) == null) return Loading();
     return MyStatefulWidget();
   }
 }

lib/services/Alert.dart

@@ -6,7 +6,7 @@ import 'package:google_fonts/google_fonts.dart';
 
 class Alert extends StatelessWidget {
   final String alert;
-  const Alert({Key key, this.alert}) : super(key: key);
+  const Alert({Key? key, required this.alert}) : super(key: key);
 
   static Future<void> showAlert(BuildContext context, String error) async {
     return showDialog<void>(

lib/services/Good.dart

@@ -6,7 +6,7 @@ import 'package:google_fonts/google_fonts.dart';
 
 class Good extends StatelessWidget {
   final String good;
-  const Good({Key key, this.good}) : super(key: key);
+  const Good({Key? key, required this.good}) : super(key: key);
 
   static Future<void> showGood(BuildContext context, String good) async {
     return showDialog<void>(

lib/services/GoodPop.dart

@@ -6,7 +6,7 @@ import 'package:google_fonts/google_fonts.dart';
 
 class GoodPop extends StatelessWidget {
   final String good;
-  const GoodPop({Key key, this.good}) : super(key: key);
+  const GoodPop({Key? key, required this.good}) : super(key: key);
 
   static Future<void> showGood(BuildContext context, String good) async {
     return showDialog<void>(

lib/services/NavigationService.dart

@@ -5,18 +5,18 @@ class NavigationService {
   static final GlobalKey<NavigatorState> navigatorKey =
       new GlobalKey<NavigatorState>();
   static Future<dynamic> navigateTo(Route<Object> route) {
-    return navigatorKey.currentState.pushReplacement(route);
+    return navigatorKey.currentState!.pushReplacement(route);
   }
 
   static Future<dynamic> goTo(Route<Object> route) {
-    return navigatorKey.currentState.push(route);
+    return navigatorKey.currentState!.push(route);
   }
 
-  static Future<dynamic> goToAndThen(Route<Object> route, Function f) {
-    return navigatorKey.currentState.push(route).then(f);
+  static Future<dynamic> goToAndThen(Route<Object> route, Function(Object?) f) {
+    return navigatorKey.currentState!.push(route).then(f);
   }
 
   static void pop() {
-    return navigatorKey.currentState.pop();
+    return navigatorKey.currentState!.pop();
   }
 }