weilu d36a12a9c6 Merge remote-tracking branch 'upstream/master' into dev ... # Conflicts: # android/build.gradle # android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScanPlugin.kt # example/.gitignore # example/android/app/src/main/AndroidManifest.xml # example/android/gradle.properties # pubspec.yaml		2020-04-10 13:43:52 +08:00
..
BarcodeScannerViewController.h	make iOS scanner UI look the same as Android	2018-08-11 09:17:35 -07:00
BarcodeScannerViewController.m	Merge remote-tracking branch 'upstream/master' into dev	2020-04-10 13:43:52 +08:00
BarcodeScannerViewControllerDelegate.h	changed delegate method name to 'didFailWithErrorCode'	2018-01-10 16:25:40 +01:00
BarcodeScanPlugin.h	Fix dart future not returning on cancel	2019-07-22 12:11:27 -05:00
BarcodeScanPlugin.m	Owner changes:	2020-02-19 23:19:14 +01:00
ScannerOverlay.h	make iOS scanner UI look the same as Android	2018-08-11 09:17:35 -07:00
ScannerOverlay.m	Fixed the position of the scan line	2020-01-12 12:34:25 +01:00