Navaron Bracke

rename mobile scanner state enum

... ... @@ -5,8 +5,8 @@ export 'src/enums/camera_facing.dart';
export 'src/enums/detection_speed.dart';
export 'src/enums/email_type.dart';
export 'src/enums/encryption_type.dart';
export 'src/enums/mobile_scanner_authorization_state.dart';
export 'src/enums/mobile_scanner_error_code.dart';
export 'src/enums/mobile_scanner_state.dart';
export 'src/enums/phone_type.dart';
export 'src/enums/torch_state.dart';
export 'src/mobile_scanner.dart';
... ...
/// The authorization state of the scanner.
enum MobileScannerState {
enum MobileScannerAuthorizationState {
/// The scanner has not yet requested the required permissions.
undetermined(0),
... ... @@ -9,16 +9,16 @@ enum MobileScannerState {
/// The user denied the required permissions.
denied(2);
const MobileScannerState(this.rawValue);
const MobileScannerAuthorizationState(this.rawValue);
factory MobileScannerState.fromRawValue(int value) {
factory MobileScannerAuthorizationState.fromRawValue(int value) {
switch (value) {
case 0:
return MobileScannerState.undetermined;
return MobileScannerAuthorizationState.undetermined;
case 1:
return MobileScannerState.authorized;
return MobileScannerAuthorizationState.authorized;
case 2:
return MobileScannerState.denied;
return MobileScannerAuthorizationState.denied;
default:
throw ArgumentError.value(value, 'value', 'Invalid raw value.');
}
... ...
... ... @@ -4,8 +4,8 @@ import 'dart:io';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:mobile_scanner/src/enums/barcode_format.dart';
import 'package:mobile_scanner/src/enums/mobile_scanner_authorization_state.dart';
import 'package:mobile_scanner/src/enums/mobile_scanner_error_code.dart';
import 'package:mobile_scanner/src/enums/mobile_scanner_state.dart';
import 'package:mobile_scanner/src/enums/torch_state.dart';
import 'package:mobile_scanner/src/mobile_scanner_exception.dart';
import 'package:mobile_scanner/src/mobile_scanner_platform_interface.dart';
... ... @@ -92,10 +92,10 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
///
/// Throws a [MobileScannerException] if the permission is not granted.
Future<void> _requestCameraPermission() async {
final MobileScannerState authorizationState;
final MobileScannerAuthorizationState authorizationState;
try {
authorizationState = MobileScannerState.fromRawValue(
authorizationState = MobileScannerAuthorizationState.fromRawValue(
await methodChannel.invokeMethod<int>('state') ?? 0,
);
} on PlatformException catch (error) {
... ... @@ -111,13 +111,13 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
}
switch (authorizationState) {
case MobileScannerState.denied:
case MobileScannerAuthorizationState.denied:
throw const MobileScannerException(
errorCode: MobileScannerErrorCode.permissionDenied,
);
case MobileScannerState.authorized:
case MobileScannerAuthorizationState.authorized:
return; // Already authorized.
case MobileScannerState.undetermined:
case MobileScannerAuthorizationState.undetermined:
try {
final bool permissionResult = await methodChannel.invokeMethod<bool>('request') ?? false;
... ...
import 'package:flutter_test/flutter_test.dart';
import 'package:mobile_scanner/src/enums/mobile_scanner_state.dart';
import 'package:mobile_scanner/src/enums/mobile_scanner_authorization_state.dart';
void main() {
group('$MobileScannerState tests', () {
group('$MobileScannerAuthorizationState tests', () {
test('can be created from raw value', () {
const values = {
0: MobileScannerState.undetermined,
1: MobileScannerState.authorized,
2: MobileScannerState.denied,
0: MobileScannerAuthorizationState.undetermined,
1: MobileScannerAuthorizationState.authorized,
2: MobileScannerAuthorizationState.denied,
};
for (final MapEntry<int, MobileScannerState> entry in values.entries) {
final MobileScannerState result = MobileScannerState.fromRawValue(
for (final MapEntry<int, MobileScannerAuthorizationState> entry in values.entries) {
final MobileScannerAuthorizationState result = MobileScannerAuthorizationState.fromRawValue(
entry.key,
);
... ... @@ -24,23 +24,23 @@ void main() {
const int outOfRange = 3;
expect(
() => MobileScannerState.fromRawValue(negative),
() => MobileScannerAuthorizationState.fromRawValue(negative),
throwsArgumentError,
);
expect(
() => MobileScannerState.fromRawValue(outOfRange),
() => MobileScannerAuthorizationState.fromRawValue(outOfRange),
throwsArgumentError,
);
});
test('can be converted to raw value', () {
const values = <MobileScannerState, int>{
MobileScannerState.undetermined: 0,
MobileScannerState.authorized: 1,
MobileScannerState.denied: 2,
const values = <MobileScannerAuthorizationState, int>{
MobileScannerAuthorizationState.undetermined: 0,
MobileScannerAuthorizationState.authorized: 1,
MobileScannerAuthorizationState.denied: 2,
};
for (final MapEntry<MobileScannerState, int> entry in values.entries) {
for (final MapEntry<MobileScannerAuthorizationState, int> entry in values.entries) {
final int result = entry.key.rawValue;
expect(result, entry.value);
... ...