inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-04-28 05:26:47 +00:00
Code

Update qr_code_scanner to the latest version

Browse Source
This commit is contained in:
Oliver Walters 2021-02-25 17:23:19 +11:00
parent d93f32ac2c
commit 90df4c6135
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/barcode.dart
View File

@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:one_context/one_context.dart'; import 'package:one_context/one_context.dart';
import 'package:device_info/device_info.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart';
import 'package:InvenTree/inventree/stock.dart'; import 'package:InvenTree/inventree/stock.dart';
@ -15,9 +16,9 @@ import 'package:InvenTree/api.dart';
import 'package:InvenTree/widget/location_display.dart'; import 'package:InvenTree/widget/location_display.dart';
import 'package:InvenTree/widget/part_detail.dart'; import 'package:InvenTree/widget/part_detail.dart';
import 'package:InvenTree/widget/category_display.dart';
import 'package:InvenTree/widget/stock_detail.dart'; import 'package:InvenTree/widget/stock_detail.dart';
import 'dart:io';
import 'dart:convert'; import 'dart:convert';
@ -396,21 +397,33 @@ class _QRViewState extends State<InvenTreeQRView> {
BuildContext context; BuildContext context;
// In order to get hot reload to work we need to pause the camera if the platform
// is android, or resume the camera if the platform is iOS.
@override
void reassemble() {
super.reassemble();
if (Platform.isAndroid) {
_controller.pauseCamera();
} else if (Platform.isIOS) {
_controller.resumeCamera();
}
}
_QRViewState(this._handler) : super(); _QRViewState(this._handler) : super();
final GlobalKey qrKey = GlobalKey(debugLabel: 'QR'); final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
void _onViewCreated(QRViewController controller) { void _onViewCreated(QRViewController controller) {
_controller = controller; _controller = controller;
controller.scannedDataStream.listen((scandata) { controller.scannedDataStream.listen((barcode) {
_controller?.pauseCamera(); _controller?.pauseCamera();
_handler.processBarcode(context, _controller, scandata); _handler.processBarcode(context, _controller, barcode.code);
}); });
} }
@override @override
void dispose() { void dispose() {
_controller.dispose(); _controller?.dispose();
super.dispose(); super.dispose();
} }

2
pubspec.lock
View File

@ -405,7 +405,7 @@ packages:
name: qr_code_scanner name: qr_code_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.14" version: "0.3.5"
quiver: quiver:
dependency: transitive dependency: transitive
description: description:

2
pubspec.yaml
View File

@ -24,7 +24,7 @@ dependencies:
cupertino_icons: ^0.1.3 cupertino_icons: ^0.1.3
http: ^0.12.1 http: ^0.12.1
cached_network_image: ^2.5.0 cached_network_image: ^2.5.0
qr_code_scanner: ^0.0.13 qr_code_scanner: ^0.3.5 # Barcode scanning
package_info: ^0.4.0 # App information introspection package_info: ^0.4.0 # App information introspection
device_info: ^1.0.0 # Information about the device device_info: ^1.0.0 # Information about the device
font_awesome_flutter: ^8.8.1 # FontAwesome icon set font_awesome_flutter: ^8.8.1 # FontAwesome icon set