Julian Steenbakker
Committed by GitHub

Merge branch 'master' into pavel/web-auto

... ... @@ -12,4 +12,4 @@ jobs:
assign-author:
runs-on: ubuntu-latest
steps:
- uses: toshimaru/auto-author-assign@v1.6.1
- uses: toshimaru/auto-author-assign@v1.6.2
... ...
... ... @@ -11,7 +11,7 @@ jobs:
analysis:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.2.0
- uses: actions/checkout@v3.3.0
- uses: actions/setup-java@v3.9.0
with:
java-version: 11
... ... @@ -28,7 +28,7 @@ jobs:
formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.2.0
- uses: actions/checkout@v3.3.0
- uses: actions/setup-java@v3.9.0
with:
java-version: 11
... ...
... ... @@ -7,7 +7,7 @@
release-please:
runs-on: ubuntu-latest
steps:
- uses: GoogleCloudPlatform/release-please-action@v3.7.1
- uses: GoogleCloudPlatform/release-please-action@v3.7.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
release-type: simple
... ...
... ... @@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:7.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
... ...
... ... @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:7.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
... ...
... ... @@ -28,19 +28,23 @@ class _BarcodeListScannerWithControllerState
bool isStarted = true;
void _startOrStop() {
try {
if (isStarted) {
controller.stop();
} else {
controller.start().catchError((error) {
if (mounted) {
setState(() {});
controller.start();
}
});
}
setState(() {
isStarted = !isStarted;
});
} on Exception catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Something went wrong! $e'),
backgroundColor: Colors.red,
),
);
}
}
@override
... ... @@ -121,7 +125,7 @@ class _BarcodeListScannerWithControllerState
overflow: TextOverflow.fade,
style: Theme.of(context)
.textTheme
.headline4!
.headlineMedium!
.copyWith(color: Colors.white),
),
),
... ...
... ... @@ -28,19 +28,23 @@ class _BarcodeScannerWithControllerState
bool isStarted = true;
void _startOrStop() {
try {
if (isStarted) {
controller.stop();
} else {
controller.start().catchError((error) {
if (mounted) {
setState(() {});
controller.start();
}
});
}
setState(() {
isStarted = !isStarted;
});
} on Exception catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Something went wrong! $e'),
backgroundColor: Colors.red,
),
);
}
}
@override
... ... @@ -127,7 +131,7 @@ class _BarcodeScannerWithControllerState
overflow: TextOverflow.fade,
style: Theme.of(context)
.textTheme
.headline4!
.headlineMedium!
.copyWith(color: Colors.white),
),
),
... ...
... ... @@ -30,19 +30,23 @@ class _BarcodeScannerReturningImageState
bool isStarted = true;
void _startOrStop() {
try {
if (isStarted) {
controller.stop();
} else {
controller.start().catchError((error) {
if (mounted) {
setState(() {});
controller.start();
}
});
}
setState(() {
isStarted = !isStarted;
});
} on Exception catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Something went wrong! $e'),
backgroundColor: Colors.red,
),
);
}
}
@override
... ... @@ -141,7 +145,7 @@ class _BarcodeScannerReturningImageState
overflow: TextOverflow.fade,
style: Theme.of(context)
.textTheme
.headline4!
.headlineMedium!
.copyWith(color: Colors.white),
),
),
... ...
... ... @@ -82,7 +82,7 @@ class _BarcodeScannerWithScanWindowState
overflow: TextOverflow.fade,
style: Theme.of(context)
.textTheme
.headline4!
.headlineMedium!
.copyWith(color: Colors.white),
),
),
... ...
... ... @@ -54,7 +54,7 @@ class _BarcodeScannerWithoutControllerState
overflow: TextOverflow.fade,
style: Theme.of(context)
.textTheme
.headline4!
.headlineMedium!
.copyWith(color: Colors.white),
),
),
... ...
... ... @@ -109,7 +109,7 @@ class _BarcodeScannerWithZoomState extends State<BarcodeScannerWithZoom>
overflow: TextOverflow.fade,
style: Theme.of(context)
.textTheme
.headline4!
.headlineMedium!
.copyWith(color: Colors.white),
),
),
... ...