Skip to content

Commit da3f0ac

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # lib/src/ai_barcode_scanner.dart
2 parents d0487b3 + c2418e2 commit da3f0ac

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.github/workflows/flutter.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/[email protected]
15-
- uses: actions/setup-java@v3.4.1
15+
- uses: actions/setup-java@v3.5.0
1616
with:
1717
java-version: 11
1818
distribution: temurin
19-
- uses: subosito/flutter-action@v2.6.1
19+
- uses: subosito/flutter-action@v2.7.1
2020
with:
2121
cache: true
2222
- name: Version
@@ -29,11 +29,11 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- uses: actions/[email protected]
32-
- uses: actions/setup-java@v3.4.1
32+
- uses: actions/setup-java@v3.5.0
3333
with:
3434
java-version: 11
3535
distribution: temurin
36-
- uses: subosito/flutter-action@v2.6.1
36+
- uses: subosito/flutter-action@v2.7.1
3737
with:
3838
cache: true
3939
- name: Format

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.2.1'
9+
classpath 'com.android.tools.build:gradle:7.3.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

example/lib/main.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class MyHomePage extends StatefulWidget {
2525
}
2626

2727
class _MyHomePageState extends State<MyHomePage> {
28-
String barcode = 'Tap on button to scan';
28+
String barcode = 'Tap to scan';
2929
@override
3030
Widget build(BuildContext context) {
3131
return Scaffold(
3232
appBar: AppBar(
33-
title: const Text('Barcode Scanner'),
33+
title: const Text(' Scanner'),
3434
),
3535
body: Center(
3636
child: Column(
@@ -42,7 +42,7 @@ class _MyHomePageState extends State<MyHomePage> {
4242
await Navigator.of(context).push(
4343
MaterialPageRoute(
4444
builder: (context) => AiBarcodeScanner(
45-
validateText: 'https://',
45+
validateText: 'https://', // link to be validated
4646
validateType: ValidateType.startsWith,
4747
onScan: (String value) {
4848
debugPrint(value);

lib/src/ai_barcode_scanner.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ class AiBarcodeScanner extends StatefulWidget {
117117
this.controller,
118118
this.onDetect,
119119
this.borderColor = Colors.white,
120-
this.borderWidth = 10,
120+
this.borderWidth = 8,
121121
this.overlayColor = const Color.fromRGBO(0, 0, 0, 80),
122-
this.borderRadius = 10,
123-
this.borderLength = 30,
122+
this.borderRadius = 8,
123+
this.borderLength = 36,
124124
this.cutOutSize = 300,
125125
this.cutOutWidth,
126126
this.cutOutHeight,

lib/src/overlay.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import 'package:flutter/material.dart';
77
class OverlayShape extends ShapeBorder {
88
OverlayShape({
99
this.borderColor = Colors.red,
10-
this.borderWidth = 3.0,
10+
this.borderWidth = 4.0,
1111
this.overlayColor = const Color.fromRGBO(0, 0, 0, 80),
1212
this.borderRadius = 0,
13-
this.borderLength = 40,
13+
this.borderLength = 42,
1414
double? cutOutSize,
1515
double? cutOutWidth,
1616
double? cutOutHeight,

0 commit comments

Comments
 (0)