Skip to content

Commit

Permalink
Merge pull request juliansteenbakker#1314 from navaronbracke/fix_mast…
Browse files Browse the repository at this point in the history
…er_analysis

chore: fix analysis on master
  • Loading branch information
navaronbracke authored Feb 3, 2025
2 parents e7b3ade + c5f158b commit 9a7cfe6
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: subosito/[email protected]
with:
cache: true
flutter-version: '3.22'
flutter-version: '3.24'
channel: 'stable'
- name: Version
run: flutter doctor -v
Expand Down
2 changes: 1 addition & 1 deletion example/lib/barcode_scanner_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class _BarcodeScannerWithControllerState
child: Container(
alignment: Alignment.bottomCenter,
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Expand Down
2 changes: 1 addition & 1 deletion example/lib/barcode_scanner_listview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class _BarcodeScannerListViewState extends State<BarcodeScannerListView> {
child: Container(
alignment: Alignment.bottomCenter,
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: Column(
children: [
Expanded(
Expand Down
2 changes: 1 addition & 1 deletion example/lib/barcode_scanner_pageview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class _BarcodeScannerPage extends StatelessWidget {
child: Container(
alignment: Alignment.bottomCenter,
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: Center(
child: ScannedBarcodeLabel(barcodes: controller.barcodes),
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/barcode_scanner_returning_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class _BarcodeScannerReturningImageState
child: Container(
alignment: Alignment.bottomCenter,
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Expand Down
2 changes: 1 addition & 1 deletion example/lib/barcode_scanner_simple.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class _BarcodeScannerSimpleState extends State<BarcodeScannerSimple> {
child: Container(
alignment: Alignment.bottomCenter,
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Expand Down
6 changes: 3 additions & 3 deletions example/lib/barcode_scanner_window.dart
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class _BarcodeScannerWithScanWindowState
alignment: Alignment.center,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: ScannedBarcodeLabel(barcodes: controller.barcodes),
),
),
Expand Down Expand Up @@ -137,7 +137,7 @@ class ScannerOverlay extends CustomPainter {
final cutoutPath = Path()..addRect(scanWindow);

final backgroundPaint = Paint()
..color = Colors.black.withOpacity(0.5)
..color = const Color.fromRGBO(0, 0, 0, 0.5)
..style = PaintingStyle.fill
..blendMode = BlendMode.dstOver;

Expand Down Expand Up @@ -214,7 +214,7 @@ class BarcodeOverlay extends CustomPainter {
final cutoutPath = Path()..addPolygon(adjustedOffset, true);

final backgroundPaint = Paint()
..color = Colors.red.withOpacity(0.3)
..color = const Color(0x4DF44336)
..style = PaintingStyle.fill
..blendMode = BlendMode.dstOut;

Expand Down
2 changes: 1 addition & 1 deletion example/lib/barcode_scanner_zoom.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class _BarcodeScannerWithZoomState extends State<BarcodeScannerWithZoom> {
child: Container(
alignment: Alignment.bottomCenter,
height: 100,
color: Colors.black.withOpacity(0.4),
color: const Color.fromRGBO(0, 0, 0, 0.4),
child: Column(
children: [
if (!kIsWeb) _buildZoomScaleSlider(),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/mobile_scanner_overlay.dart
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class ScannerOverlay extends CustomPainter {
);

final backgroundPaint = Paint()
..color = Colors.black.withOpacity(0.5)
..color = const Color.fromRGBO(0, 0, 0, 0.5)
..style = PaintingStyle.fill
..blendMode = BlendMode.dstOver;

Expand Down
1 change: 0 additions & 1 deletion example/lib/scanner_error_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class ScannerErrorWidget extends StatelessWidget {
errorMessage = 'Scanning is unsupported on this device';
default:
errorMessage = 'Generic Error';
break;
}

return ColoredBox(
Expand Down

0 comments on commit 9a7cfe6

Please sign in to comment.