Merge pull request #411 from artchiee/google_play_dependency

Flutter barcode scanner replaced with  flutter_zxing package

Author: rolandgeider

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
-    "dart.lineLength": 100,
-    "diffEditor.ignoreTrimWhitespace": true,
-}
+  "dart.lineLength": 100,
+  "diffEditor.ignoreTrimWhitespace": true,
+}

AUTHORS.md

@@ -20,6 +20,7 @@
 - Aman Negi - <https://github.com/AmanNegi>
 - Sandi Milohanic - <https://github.com/sandimilohanic>
 - Miroslav Mazel - <https://gitlab.com/12people>
+- artchiee - <https://github.com/artchiee>
 - Tejas Bir Singh - <https://github.com/tejasbirsingh>
 
 ## Translators

flatpak/scripts/pubspec.lock

@@ -82,4 +82,4 @@ packages:
     source: hosted
     version: "1.3.1"
 sdks:
-  dart: ">=2.18.5 <3.0.0"
+  dart: ">=2.18.5 <4.0.0"

lib/main.dart

@@ -50,8 +50,12 @@ import 'package:wger/theme/theme.dart';
 import 'package:wger/widgets/core/about.dart';
 
 import 'providers/auth.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_zxing/flutter_zxing.dart';
+
 
 void main() {
+  zx.setLogEnabled(kDebugMode);
   // Needs to be called before runApp
   WidgetsFlutterBinding.ensureInitialized();
 

lib/widgets/nutrition/widgets.dart

@@ -16,23 +16,47 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+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:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/platform.dart';
 import 'package:wger/helpers/ui.dart';
 import 'package:wger/providers/nutrition.dart';
 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) => 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;
+
   late final bool? test;
   final bool showScanner;
 
@@ -48,28 +72,24 @@ class IngredientTypeahead extends StatefulWidget {
   _IngredientTypeaheadState createState() => _IngredientTypeaheadState();
 }
 
-Future<String> scanBarcode(BuildContext context) async {
-  String barcode;
-  try {
-    barcode = await FlutterBarcodeScanner.scanBarcode(
-      '#ff6666',
-      AppLocalizations.of(context).close,
-      true,
-      ScanMode.BARCODE,
-    );
+class _IngredientTypeaheadState extends State<IngredientTypeahead> {
+  var _searchEnglish = true;
 
-    if (barcode.compareTo('-1') == 0) {
+  Future<String> readerscan(BuildContext context) async {
+    String scannedcode;
+    try {
+      scannedcode =
+          await Navigator.of(context).push(MaterialPageRoute(builder: (context) => ScanReader()));
+
+      if (scannedcode.compareTo('-1') == 0) {
+        return '';
+      }
+    } on PlatformException {
       return '';
     }
-  } on PlatformException {
-    return '';
-  }
 
-  return barcode;
-}
-
-class _IngredientTypeaheadState extends State<IngredientTypeahead> {
-  var _searchEnglish = true;
+    return scannedcode;
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -136,7 +156,7 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
       onPressed: () async {
         try {
           if (!widget.test!) {
-            widget.barcode = await scanBarcode(context);
+            widget.barcode = await readerscan(context);
           }
 
           if (widget.barcode!.isNotEmpty) {
@@ -195,6 +215,9 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
           }
         } catch (e) {
           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,10 +3,12 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_linux
   url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  flutter_zxing
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

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"))