Commit Graph

17 Commits

Author SHA1 Message Date
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
Julian Finkler 14a744d0af Owner changes:
Android:
Kotlin Package: `com.apptreesoftware.barcodescan` -> `de.mintware.barcode_scan`
Manifest-Package: `com.yourcompany.barcodescan` -> `de.mintware.barcodescan`
Activity: `com.apptreesoftware.barcodescan.BarcodeScannerActivity` -> `de.mintware.barcode_scan.BarcodeScannerActivity`

iOS:
Bundle ID: `com.apptreesoftware.barcode.plugin.example` -> `de.mintware.barcode_scan.plugin.example`

Flutter:
Method channel: `com.apptreesoftware.barcode_scan` -> `de.mintware.barcode_scan`
pubspec.yaml:
 - homepage updated
 - deprecated author entry removed
 - comments removed
 - flutter.plugin.androidPackage: `com.apptreesoftware.barcode_scan` -> `de.mintware.barcode_scan`

README.md updated and UPGRADE.md added
2020-02-19 23:19:14 +01:00
Julian Finkler 770bb47d6c Fixed the position of the scan line 2020-01-12 12:34:25 +01:00
Julian Finkler e0cc5c3bc2 Fixed the size of the preview overlay 2020-01-12 12:18:48 +01:00
Julian Finkler 06f38e0b53 Fix for Issue #61
While the iOS device is rotating the bounds of the previewView will be recalculated
and the scanRect will be reinitialized

Changes in the WorkspaceSettings are necessary to run the example app
2019-12-16 20:59:07 +01:00
weilu 0921367fc0 文字修改 2019-08-16 14:49:06 +08:00
brandon.maness 73c7a7ea3b Fix dart future not returning on cancel 2019-07-22 12:11:27 -05:00
Tolga Gezginiş 1581489f9b Stop scanning when pressed the cancel button iOS 2018-11-09 22:07:58 +03:00
Matthew Smith 28fd49d1eb Fix ios barcodes not scanning 2018-08-30 09:14:24 -07:00
dustin 1074ab990a make iOS scanner UI look the same as Android
Includes a scanner window and pulsing scan line
2018-08-11 09:17:35 -07:00
dustin 6de69d7c2a fix iOS flash implementation 2018-08-09 15:37:10 -07:00
Benjamin Sauer 65193acf1c changed delegate method name to 'didFailWithErrorCode' 2018-01-10 16:25:40 +01:00
Benjamin Sauer 1c34da8db9 BarcodeScanPlugin.m: extracted errorHandling into seperate method 2018-01-10 16:21:05 +01:00
Benjamin Sauer 2156fe33fe replaced iOs popup by throwing a flutter error 2018-01-08 14:42:47 +01:00
Matthew Smith a4880d7213 Add missing files 2017-11-07 18:32:33 -08:00
Matthew Smith 80b5c6f3eb Rewrote iOS scanner in ObjC to avoid swift plugin conflicts with use_frameworks! 2017-11-07 18:27:25 -08:00
Matthew Smith 0e4339160f Initial commit 2017-10-29 10:05:11 -07:00