null check fixed whene poping back from scanner

Author: artchiee

lib/widgets/nutrition/widgets.dart

@@ -17,13 +17,14 @@
  */
 
 import 'dart:developer';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_barcode_scanner/flutter_barcode_scanner.dart';
+//import 'package:flutter_barcode_scanner/flutter_barcode_scanner.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
-//import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/platform.dart';
@@ -33,30 +34,28 @@ import 'package:wger/widgets/core/core.dart';
 
 import 'package:flutter_zxing/flutter_zxing.dart';
 
+
 class ScanReader extends StatelessWidget {
   String? scannedr;
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: ReaderWidget(
-        onScan: (result) {
-          debugPrint('Reader widget res : => ');
-          scannedr = result.text;
-          debugPrint(scannedr);
-          Navigator.pop(context, scannedr);
-        },
-      ),
-    );
-  }
+  Widget build(BuildContext context) => Scaffold(
+        body: ReaderWidget(
+          onScan: (result) {
+            scannedr = result.text;
+            Navigator.pop(context, scannedr);
+          },
+        ),
+      );
+
 }
 
 class IngredientTypeahead extends StatefulWidget {
   final TextEditingController _ingredientController;
   final TextEditingController _ingredientIdController;
 
   String? barcode = '';
-  Code? result;
+  //Code? result;
 
   late final bool? test;
   final bool showScanner;
@@ -76,20 +75,20 @@ class IngredientTypeahead extends StatefulWidget {
 class _IngredientTypeaheadState extends State<IngredientTypeahead> {
   var _searchEnglish = true;
 
-  Future<String> _readerscan(BuildContext context) async {
-    String barcode;
+  Future<String> readerscan(BuildContext context) async {
+    String scannedcode;
     try {
-      barcode =
+      scannedcode =
           await Navigator.of(context).push(MaterialPageRoute(builder: (context) => ScanReader()));
 
-      if (barcode.compareTo('-1') == 0) {
+      if (scannedcode.compareTo('-1') == 0) {
         return '';
       }
     } on PlatformException {
       return '';
     }
 
-    return barcode;
+    return scannedcode;
   }
 
   @override
@@ -157,8 +156,7 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
       onPressed: () async {
         try {
           if (!widget.test!) {
-            // using navigation to call Reader Widget and return context(scan result)
-            widget.barcode = await _readerscan(context);
+            widget.barcode = await readerscan(context);
           }
 
           if (widget.barcode!.isNotEmpty) {
@@ -216,8 +214,10 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
             }
           }
         } catch (e) {
-          debugPrint('scanner did not fire!! ');
           showErrorDialog(e, context);
+          // Need to pop back since reader scan is a widget 
+          // otherwise returns null when back button is pressed
+          return Navigator.pop(context); 
         }
       },
       icon: Image.asset('assets/images/barcode_scanner_icon.png'),

linux/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,13 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <file_selector_linux/file_selector_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_linux
   url_launcher_linux
 )
 

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,12 +5,14 @@
 import FlutterMacOS
 import Foundation
 
+import file_selector_macos
 import package_info_plus
 import rive_common
 import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))