Merge branch 'main' of hiddify-github:hiddify/hiddify-next
This commit is contained in:
Hiddify
@@ -1,13 +1,16 @@
|
||||
import 'package:dartx/dartx.dart';
|
||||
import 'package:fluentui_system_icons/fluentui_system_icons.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:hiddify/core/localization/translations.dart';
|
||||
import 'package:hiddify/utils/utils.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:mobile_scanner/mobile_scanner.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
|
||||
class QRCodeScannerScreen extends HookConsumerWidget with PresLogger {
|
||||
final _cameraPermissionProvider =
|
||||
FutureProvider.autoDispose((ref) => Permission.camera.request());
|
||||
|
||||
class QRCodeScannerScreen extends StatefulHookConsumerWidget {
|
||||
const QRCodeScannerScreen({super.key});
|
||||
|
||||
Future<String?> open(BuildContext context) async {
|
||||
@@ -20,110 +23,194 @@ class QRCodeScannerScreen extends HookConsumerWidget with PresLogger {
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
ConsumerState<QRCodeScannerScreen> createState() =>
|
||||
_QRCodeScannerScreenState();
|
||||
}
|
||||
|
||||
class _QRCodeScannerScreenState extends ConsumerState<QRCodeScannerScreen>
|
||||
with WidgetsBindingObserver, PresLogger {
|
||||
final controller =
|
||||
MobileScannerController(detectionTimeoutMs: 500, autoStart: false);
|
||||
bool started = false;
|
||||
bool settingsOpened = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
controller.stop();
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
if (state == AppLifecycleState.resumed && settingsOpened) {
|
||||
loggy.debug("resumed");
|
||||
ref.invalidate(_cameraPermissionProvider);
|
||||
settingsOpened = false;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final t = ref.watch(translationsProvider);
|
||||
|
||||
final controller = useMemoized(
|
||||
() => MobileScannerController(detectionTimeoutMs: 500),
|
||||
ref.listen(
|
||||
_cameraPermissionProvider,
|
||||
(previous, next) async {
|
||||
if (next case AsyncData(:final value)
|
||||
when value == PermissionStatus.granted) {
|
||||
try {
|
||||
final result = await controller.start();
|
||||
if (result != null) {
|
||||
setState(() {
|
||||
started = true;
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
loggy.warning("error starting scanner: $error", error);
|
||||
}
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
useEffect(() => controller.dispose, []);
|
||||
switch (ref.watch(_cameraPermissionProvider)) {
|
||||
case AsyncData(value: final status)
|
||||
when status == PermissionStatus.granted:
|
||||
final size = MediaQuery.sizeOf(context);
|
||||
final overlaySize = (size.shortestSide - 12).coerceAtMost(248);
|
||||
|
||||
final size = MediaQuery.sizeOf(context);
|
||||
final overlaySize = (size.shortestSide - 12).coerceAtMost(248);
|
||||
|
||||
return Scaffold(
|
||||
extendBodyBehindAppBar: true,
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.transparent,
|
||||
iconTheme: Theme.of(context).iconTheme.copyWith(
|
||||
color: Colors.white,
|
||||
size: 32,
|
||||
),
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: ValueListenableBuilder(
|
||||
valueListenable: controller.torchState,
|
||||
builder: (context, state, child) {
|
||||
switch (state) {
|
||||
case TorchState.off:
|
||||
return const Icon(
|
||||
FluentIcons.flash_off_24_regular,
|
||||
color: Colors.grey,
|
||||
);
|
||||
case TorchState.on:
|
||||
return const Icon(
|
||||
FluentIcons.flash_24_regular,
|
||||
color: Colors.yellow,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
tooltip: t.profile.add.qrScanner.torchSemanticLabel,
|
||||
onPressed: () => controller.toggleTorch(),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(FluentIcons.camera_switch_24_regular),
|
||||
tooltip: t.profile.add.qrScanner.facingSemanticLabel,
|
||||
onPressed: () => controller.switchCamera(),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: Stack(
|
||||
children: [
|
||||
MobileScanner(
|
||||
controller: controller,
|
||||
onDetect: (capture) {
|
||||
final rawData = capture.barcodes.first.rawValue;
|
||||
loggy.debug('captured raw: [$rawData]');
|
||||
if (rawData != null) {
|
||||
final uri = Uri.tryParse(rawData);
|
||||
if (context.mounted && uri != null) {
|
||||
loggy.debug('captured url: [$uri]');
|
||||
Navigator.of(context, rootNavigator: true)
|
||||
.pop(uri.toString());
|
||||
}
|
||||
} else {
|
||||
loggy.warning("unable to capture");
|
||||
}
|
||||
},
|
||||
errorBuilder: (_, error, __) {
|
||||
final message = switch (error.errorCode) {
|
||||
MobileScannerErrorCode.permissionDenied =>
|
||||
t.profile.add.qrScanner.permissionDeniedError,
|
||||
_ => t.profile.add.qrScanner.unexpectedError,
|
||||
};
|
||||
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(bottom: 8),
|
||||
child: Icon(
|
||||
FluentIcons.error_circle_24_regular,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
Text(message),
|
||||
Text(error.errorDetails?.message ?? ''),
|
||||
],
|
||||
return Scaffold(
|
||||
extendBodyBehindAppBar: true,
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.transparent,
|
||||
iconTheme: Theme.of(context).iconTheme.copyWith(
|
||||
color: Colors.white,
|
||||
size: 32,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
CustomPaint(
|
||||
painter: ScannerOverlay(
|
||||
Rect.fromCenter(
|
||||
center: size.center(Offset.zero),
|
||||
width: overlaySize,
|
||||
height: overlaySize,
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: ValueListenableBuilder(
|
||||
valueListenable: controller.torchState,
|
||||
builder: (context, state, child) {
|
||||
switch (state) {
|
||||
case TorchState.off:
|
||||
return const Icon(
|
||||
FluentIcons.flash_off_24_regular,
|
||||
color: Colors.grey,
|
||||
);
|
||||
case TorchState.on:
|
||||
return const Icon(
|
||||
FluentIcons.flash_24_regular,
|
||||
color: Colors.yellow,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
tooltip: t.profile.add.qrScanner.torchSemanticLabel,
|
||||
onPressed: () => controller.toggleTorch(),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(FluentIcons.camera_switch_24_regular),
|
||||
tooltip: t.profile.add.qrScanner.facingSemanticLabel,
|
||||
onPressed: () => controller.switchCamera(),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: Stack(
|
||||
children: [
|
||||
MobileScanner(
|
||||
controller: controller,
|
||||
onDetect: (capture) {
|
||||
final rawData = capture.barcodes.first.rawValue;
|
||||
loggy.debug('captured raw: [$rawData]');
|
||||
if (rawData != null) {
|
||||
final uri = Uri.tryParse(rawData);
|
||||
if (context.mounted && uri != null) {
|
||||
loggy.debug('captured url: [$uri]');
|
||||
Navigator.of(context, rootNavigator: true)
|
||||
.pop(uri.toString());
|
||||
}
|
||||
} else {
|
||||
loggy.warning("unable to capture");
|
||||
}
|
||||
},
|
||||
errorBuilder: (_, error, __) {
|
||||
final message = switch (error.errorCode) {
|
||||
MobileScannerErrorCode.permissionDenied =>
|
||||
t.profile.add.qrScanner.permissionDeniedError,
|
||||
_ => t.profile.add.qrScanner.unexpectedError,
|
||||
};
|
||||
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(bottom: 8),
|
||||
child: Icon(
|
||||
FluentIcons.error_circle_24_regular,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
Text(message),
|
||||
Text(error.errorDetails?.message ?? ''),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
if (started)
|
||||
CustomPaint(
|
||||
painter: ScannerOverlay(
|
||||
Rect.fromCenter(
|
||||
center: size.center(Offset.zero),
|
||||
width: overlaySize,
|
||||
height: overlaySize,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
case AsyncData(value: final status):
|
||||
return Scaffold(
|
||||
appBar: AppBar(),
|
||||
body: Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(t.profile.add.qrScanner.permissionDeniedError),
|
||||
if (status == PermissionStatus.permanentlyDenied)
|
||||
TextButton(
|
||||
onPressed: () async {
|
||||
settingsOpened = await openAppSettings();
|
||||
},
|
||||
child: Text(t.general.openAppSettings),
|
||||
)
|
||||
else
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
ref.invalidate(_cameraPermissionProvider);
|
||||
},
|
||||
child: Text(t.general.grantPermission),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
);
|
||||
|
||||
default:
|
||||
return Scaffold(
|
||||
appBar: AppBar(),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user