Skip to content

Commit 1bf7ecb

Browse files
authored
Merge pull request #1 from Foundation-Devices/port_changes_from_qr_plus
Port changes from qr plus
2 parents 5af7a54 + 26b9193 commit 1bf7ecb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+672
-373
lines changed

.github/workflows/dart.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
with:
1414
distribution: 'temurin'
1515
java-version: '11'
16-
- uses: subosito/flutter-action@v2.8.0
16+
- uses: subosito/flutter-action@v2.10.0
1717
- name: Version
1818
run: flutter doctor -v
1919
- name: Install dependencies
2020
run: flutter pub get
2121
- name: Format
22-
run: flutter format -n --set-exit-if-changed .
22+
run: dart format --set-exit-if-changed .
2323
- name: Linter
24-
run: flutter analyze
24+
run: flutter analyze

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flutter 3.35.4-stable

CHANGELOG.md

Lines changed: 194 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,282 @@
1+
## 2.0.12
2+
- For iOS 18 or newer, call `pauseCamera` on dispose instead of `stopCamera`
3+
4+
## 2.0.11
5+
6+
FIX for iOS 26:
7+
- For iOS 26 or newer, call `pauseCamera` on dispose instead of `stopCamera`
8+
9+
Note: Calling stopCamera on dispose was causing UI to hang for 1-3 seconds
10+
11+
## 2.0.10+1
12+
13+
- Increased android compile SDK to 35 and removed android test deps
14+
15+
## 2.0.10
16+
17+
- Improved back camera selection for WEB on mobile
18+
- Fixed default overlay for `QrScannerOverlayShape` which was full black instead of translucent
19+
20+
## 2.0.9+1
21+
22+
- Fix a bad import causing mobile builds to fail
23+
24+
## 2.0.9
25+
26+
- Updated QrViewController to self-dispose when the QrView is disposed
27+
- Fixed WEB support for WASM
28+
29+
Note: The public `dispose()` function for `QRViewController` is now a no-op function and deprecated. You should stop calling it. It will be removed fully in the future.
30+
31+
## 2.0.8+1
32+
33+
- Updated package list of supported platforms to include web
34+
35+
## 2.0.8
36+
37+
- [WEB] Fixed support for WEB platform (thanks [@mikeesouth](https://github.com/mikeesouth))
38+
39+
## 2.0.7
40+
41+
- [Android] Updated Android AGP to version 8.9 (thanks [@SOMBORO](https://github.com/SOMBORO))
42+
- [Android] Removed Core Library Desugaring (thanks [@SOMBORO](https://github.com/SOMBORO))
43+
44+
## 2.0.6
45+
46+
- Fixed additional js_interop issues causing failure to build on web
47+
48+
## 2.0.5
49+
50+
- Fixed additional js_interop issues causing failure to build on web
51+
52+
## 2.0.4
53+
54+
- Fixed js_interop usage causing failure to build on web
55+
56+
## 2.0.3
57+
58+
- Updated flutter to ">=3.3.0"
59+
- Updated dart to ">=3.0.0"
60+
- Migrated from js and html to js_interop and web package
61+
62+
## 2.0.0, 2.0.1 and 2.0.2
63+
64+
- Retracted
65+
166
## 1.0.0
67+
268
Breaking changes:
369
Minimum Flutter version is now Flutter 3.0.0 (Dart 2.17.0).
470

571
#### Features
6-
* Inverted is now mixed with normal scanning.
7-
* onPermissionSet now works on web aswell.
8-
* [Android] zxing core is updated to 3.5.0.
9-
* [Android] Several code improvements.
10-
* [Android] Several dependencies updated.
72+
73+
- Inverted is now mixed with normal scanning.
74+
- onPermissionSet now works on web aswell.
75+
- [Android] zxing core is updated to 3.5.0.
76+
- [Android] Several code improvements.
77+
- [Android] Several dependencies updated.
1178

1279
## 0.7.0
80+
1381
#### Features
14-
* Add inverted feature for Android. See https://github.com/juliuscanute/qr_code_scanner/issues/403
82+
83+
- Add inverted feature for Android. See https://github.com/juliuscanute/qr_code_scanner/issues/403
1584

1685
#### Bugfixes
17-
* Fixed permission error on devices running Android 7 or lower.
18-
* Fixed error being thrown when user declines permission on iOS.
19-
* Updated dependencies
86+
87+
- Fixed permission error on devices running Android 7 or lower.
88+
- Fixed error being thrown when user declines permission on iOS.
89+
- Updated dependencies
2090

2191
## 0.6.1
22-
* Fix bug which caused build to fail for iOS. (#452)
92+
93+
- Fix bug which caused build to fail for iOS. (#452)
2394

2495
## 0.6.0
96+
2597
#### Features
26-
* Add support for raw bytes on iOS. (#421)
27-
* Add custom cutout width and height next to cutout size. (#432)
98+
99+
- Add support for raw bytes on iOS. (#421)
100+
- Add custom cutout width and height next to cutout size. (#432)
28101

29102
#### Bugfixes
30-
* Fix for calling permission multiple times. (#381)
31-
* Fix for QRView Overlay cutoutbottomoffset. (#383)
32-
* Multiple minor improvements
103+
104+
- Fix for calling permission multiple times. (#381)
105+
- Fix for QRView Overlay cutoutbottomoffset. (#383)
106+
- Multiple minor improvements
33107

34108
## 0.5.2
109+
35110
#### Bugfixes
36-
* Increased delay to fix QRView opening zoomed in on some devices by adding small delay to updateDimensions(). (#250)
37-
* Updated ZXING from 3.3.0 to 3.4.1 (#369)
38-
* Fixed permission not being called correctly on Android (#351)
111+
112+
- Increased delay to fix QRView opening zoomed in on some devices by adding small delay to updateDimensions(). (#250)
113+
- Updated ZXING from 3.3.0 to 3.4.1 (#369)
114+
- Fixed permission not being called correctly on Android (#351)
39115

40116
## 0.5.1
117+
41118
Removed web from library export.
42119

43120
## 0.5.0
44-
* Added initial web-support. This function is still under development and not fully tested.
45-
* Fixed permissions on iOS.
46-
* Updated dependencies.
121+
122+
- Added initial web-support. This function is still under development and not fully tested.
123+
- Fixed permissions on iOS.
124+
- Updated dependencies.
47125

48126
## 0.4.0
127+
49128
Stable null-safety support. (#278)
50129

51130
## 0.3.5
131+
52132
#### Bug fixes
53-
* Fixed QRView opening zoomed in on some devices by adding small delay to updateDimensions(). (#250)
54-
* Changed upc-A to EAN13 on iOS. (#262)
55-
* Fixed null-pointer on BarcodeFormat array on iOS. (#262)
56-
* Added LifecycleEventHandler to dispose(). (#265)
133+
134+
- Fixed QRView opening zoomed in on some devices by adding small delay to updateDimensions(). (#250)
135+
- Changed upc-A to EAN13 on iOS. (#262)
136+
- Fixed null-pointer on BarcodeFormat array on iOS. (#262)
137+
- Added LifecycleEventHandler to dispose(). (#265)
57138

58139
## 0.3.4
140+
59141
#### Bug fixes
60-
* Fixed No barcode view found on Android when calling controller.dispose() (#257)
61-
* Fixed Hot reload not working on Android.
142+
143+
- Fixed No barcode view found on Android when calling controller.dispose() (#257)
144+
- Fixed Hot reload not working on Android.
62145

63146
## 0.3.3
147+
64148
#### Bug fixes
65-
* Fixed updateDimensions not being called causing zoom on iOS. (#250)
66-
* Fixed Android permission callback not working. (#251) (#252)
67-
* Fixed null-pointers after declining permission on Android.
149+
150+
- Fixed updateDimensions not being called causing zoom on iOS. (#250)
151+
- Fixed Android permission callback not working. (#251) (#252)
152+
- Fixed null-pointers after declining permission on Android.
68153

69154
## 0.3.2
155+
70156
#### Bug fixes
71-
* Fixed null-pointer when no overlay provided on iOS. (#245)
72-
* Fixed camera not stopping (green dot on iOS 14) when navigating to other page. (#240)
157+
158+
- Fixed null-pointer when no overlay provided on iOS. (#245)
159+
- Fixed camera not stopping (green dot on iOS 14) when navigating to other page. (#240)
73160

74161
## 0.3.1
162+
75163
#### Bug fixes
76-
* Fixed permission callback on iOS & Android.
77-
* Fixed camera facing not working on Android.
78-
* Fixed scanArea not being honored on Android.
79-
* Updated ShapeBorder to QrScannerOverlayShape.
164+
165+
- Fixed permission callback on iOS & Android.
166+
- Fixed camera facing not working on Android.
167+
- Fixed scanArea not being honored on Android.
168+
- Updated ShapeBorder to QrScannerOverlayShape.
80169

81170
## 0.3.0
171+
82172
#### Breaking change
173+
83174
Its not necessary anymore to wrap the QRView in a SizeChangedLayoutNotifier because this is handled inside the plugin.
175+
84176
#### New Features
85-
* Added possibility to set allowed barcodes. (#135)
86-
* Added possibility to check what features are supported by device. (hasFlash, hasBackCamera, hasFrontCamera) (#135)
87-
* Added possibility to check if flash is on. (#135)
88-
* Added possibility to check which camera is active. (#135)
89-
* All functions are now async so you can await them. (#135)
177+
178+
- Added possibility to set allowed barcodes. (#135)
179+
- Added possibility to check what features are supported by device. (hasFlash, hasBackCamera, hasFrontCamera) (#135)
180+
- Added possibility to check if flash is on. (#135)
181+
- Added possibility to check which camera is active. (#135)
182+
- All functions are now async so you can await them. (#135)
90183

91184
See the updated example on how to implement these features.
185+
92186
#### Bug fixes
93-
* Fixed permission handling in Android.
94-
* Native functions now returns results so exceptions can be thrown when an error occurs.
187+
188+
- Fixed permission handling in Android.
189+
- Native functions now returns results so exceptions can be thrown when an error occurs.
95190

96191
## 0.2.1
97-
* Fixed critical bug where scanner wouldn't open when no scan overlay was configured.
192+
193+
- Fixed critical bug where scanner wouldn't open when no scan overlay was configured.
98194

99195
## 0.2.0
196+
100197
#### Breaking change
101-
* The plugin now returns Barcode object instead of QR String. This object includes the type of code, the code itself and on Android devices the raw bytes. (#63)
198+
199+
- The plugin now returns Barcode object instead of QR String. This object includes the type of code, the code itself and on Android devices the raw bytes. (#63)
200+
102201
#### New Features
103-
* Added possibility to provide scanArea on iOS. (#165)
202+
203+
- Added possibility to provide scanArea on iOS. (#165)
204+
104205
#### Bug fixes
105-
* Fixed preview going black after hot reload. (#76)
106-
* Fixed nullpointer when plugin binding order isn't correct. (#181)
107-
* Fixed permission being asked on startup (#185)
206+
207+
- Fixed preview going black after hot reload. (#76)
208+
- Fixed nullpointer when plugin binding order isn't correct. (#181)
209+
- Fixed permission being asked on startup (#185)
108210

109211
## 0.1.0
110-
* Changed Android minSDKversion from 24 to 21 (#170)
111-
* Fix preview size after iPad rotation (#125)
112-
* Implemented Android Embedding V2 (#132)
113-
* Added cutout bottom offset (#115)
114-
* Fix Android ActivityLifecycleCallbacks (#166)
115-
* Fix some other small bugs
212+
213+
- Changed Android minSDKversion from 24 to 21 (#170)
214+
- Fix preview size after iPad rotation (#125)
215+
- Implemented Android Embedding V2 (#132)
216+
- Added cutout bottom offset (#115)
217+
- Fix Android ActivityLifecycleCallbacks (#166)
218+
- Fix some other small bugs
116219

117220
## 0.0.14
118-
* Fix disposing camera on iOS 14 (#113)
221+
222+
- Fix disposing camera on iOS 14 (#113)
119223

120224
## 0.0.13
121-
* Fix misalignment when QRView doesn't start from the top left (#45)
122-
* Fix crash on iOS when scanning returns nil (#69, #72)
123-
* Fix ArithmeticException on Android (#43)
225+
226+
- Fix misalignment when QRView doesn't start from the top left (#45)
227+
- Fix crash on iOS when scanning returns nil (#69, #72)
228+
- Fix ArithmeticException on Android (#43)
124229

125230
## 0.0.12
126-
* Add optional parameter to use a camera overlay.
127-
* Simplify controller, expose scanDataStream.
128-
* Fix for Android flash toggle.
129-
* Add ability to pause/resume the camera.
130-
* Thanks! to Luis Thein for all the above contributions.
231+
232+
- Add optional parameter to use a camera overlay.
233+
- Simplify controller, expose scanDataStream.
234+
- Fix for Android flash toggle.
235+
- Add ability to pause/resume the camera.
236+
- Thanks! to Luis Thein for all the above contributions.
131237

132238
## 0.0.11
133-
* android build break fix
239+
240+
- android build break fix
134241

135242
## 0.0.10
136-
* update README.md
243+
244+
- update README.md
137245

138246
## 0.0.9
139-
* update README.md
247+
248+
- update README.md
140249

141250
## 0.0.8
142-
* migrated Android project to androidx (by Felipe César)
143-
* migrated iOS to Swift 5 (by Felipe César)
251+
252+
- migrated Android project to androidx (by Felipe César)
253+
- migrated iOS to Swift 5 (by Felipe César)
144254

145255
## 0.0.7
146-
* flash light support added
256+
257+
- flash light support added
147258

148259
## 0.0.6
149-
* camera flip added
260+
261+
- camera flip added
150262

151263
## 0.0.5
152-
* preview stretching after change screen orientation fix
264+
265+
- preview stretching after change screen orientation fix
153266

154267
## 0.0.4
155-
* fix black screen orientation/unlock/focus
268+
269+
- fix black screen orientation/unlock/focus
156270

157271
## 0.0.3
158-
* iOS library reference fix
159-
* Android pause/resume fix
272+
273+
- iOS library reference fix
274+
- Android pause/resume fix
160275

161276
## 0.0.2
162-
* Added documentation to cover how to use the plugin.
277+
278+
- Added documentation to cover how to use the plugin.
163279

164280
## 0.0.1
165-
* QR Code scanner embedded inside flutter.
281+
282+
- QR Code scanner embedded inside flutter.

0 commit comments

Comments
 (0)