Merge pull request #1043 from nidghogg/main
Fixed camera permission handling for QR
This commit is contained in:
@@ -1,3 +1,6 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:developer';
|
||||||
|
|
||||||
import 'package:dartx/dartx.dart';
|
import 'package:dartx/dartx.dart';
|
||||||
import 'package:fluentui_system_icons/fluentui_system_icons.dart';
|
import 'package:fluentui_system_icons/fluentui_system_icons.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -28,62 +31,185 @@ class QRCodeScannerScreen extends StatefulHookConsumerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _QRCodeScannerScreenState extends ConsumerState<QRCodeScannerScreen> with WidgetsBindingObserver, PresLogger {
|
class _QRCodeScannerScreenState extends ConsumerState<QRCodeScannerScreen> with WidgetsBindingObserver, PresLogger {
|
||||||
final controller = MobileScannerController(detectionTimeoutMs: 500, autoStart: false);
|
final MobileScannerController controller = MobileScannerController(
|
||||||
|
detectionTimeoutMs: 500,
|
||||||
|
// autoStart: false,
|
||||||
|
);
|
||||||
bool started = false;
|
bool started = false;
|
||||||
|
|
||||||
late FlutterEasyPermission _easyPermission;
|
// late FlutterEasyPermission _easyPermission;
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
WidgetsBinding.instance.addObserver(this);
|
WidgetsBinding.instance.addObserver(this);
|
||||||
|
_initializeScanner();
|
||||||
|
|
||||||
_easyPermission = FlutterEasyPermission()
|
// _easyPermission = FlutterEasyPermission()
|
||||||
..addPermissionCallback(onGranted: (requestCode, androidPerms, iosPerm) {
|
// ..addPermissionCallback(onGranted: (requestCode, androidPerms, iosPerm) {
|
||||||
debugPrint("android:$androidPerms");
|
// debugPrint("android:$androidPerms");
|
||||||
debugPrint("iOS:$iosPerm");
|
// debugPrint("iOS:$iosPerm");
|
||||||
startQrScannerIfPermissionGranted();
|
// startQrScannerIfPermissionGranted();
|
||||||
}, onDenied: (requestCode, androidPerms, iosPerm, isPermanent) {
|
// }, onDenied: (requestCode, androidPerms, iosPerm, isPermanent) {
|
||||||
if (isPermanent) {
|
// if (isPermanent) {
|
||||||
FlutterEasyPermission.showAppSettingsDialog(title: "Camera");
|
// FlutterEasyPermission.showAppSettingsDialog(title: "Camera");
|
||||||
} else {
|
// } else {
|
||||||
debugPrint("android:$androidPerms");
|
// debugPrint("android:$androidPerms");
|
||||||
debugPrint("iOS:$iosPerm");
|
// debugPrint("iOS:$iosPerm");
|
||||||
}
|
// }
|
||||||
}, onSettingsReturned: () {
|
// }, onSettingsReturned: () {
|
||||||
startQrScannerIfPermissionGranted();
|
// startQrScannerIfPermissionGranted();
|
||||||
});
|
// });
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> _requestCameraPermission() async {
|
||||||
|
final hasPermission = await FlutterEasyPermission.has(
|
||||||
|
perms: permissions,
|
||||||
|
permsGroup: permissionGroup,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (hasPermission) return true;
|
||||||
|
|
||||||
|
final completer = Completer<bool>();
|
||||||
|
|
||||||
|
void permissionCallback(int requestCode, List<Permissions> ?perms, PermissionGroup ?perm) {
|
||||||
|
if (!completer.isCompleted) {
|
||||||
|
completer.complete(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void permissionDeniedCallback(int requestCode, List<Permissions> ?perms, PermissionGroup ?perm, bool isPermanent) {
|
||||||
|
if (!completer.isCompleted) {
|
||||||
|
completer.complete(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FlutterEasyPermission().addPermissionCallback(
|
||||||
|
onGranted: permissionCallback,
|
||||||
|
onDenied: permissionDeniedCallback,
|
||||||
|
);
|
||||||
|
|
||||||
|
FlutterEasyPermission.request(
|
||||||
|
perms: permissions,
|
||||||
|
permsGroup: permissionGroup,
|
||||||
|
rationale: "Camera permission is required to scan QR codes.",
|
||||||
|
);
|
||||||
|
|
||||||
|
return completer.future;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _initializeScanner() async {
|
||||||
|
final hasPermission = await _requestCameraPermission();
|
||||||
|
if (hasPermission) {
|
||||||
|
_startScanner();
|
||||||
|
} else {
|
||||||
|
_showPermissionDialog();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
controller.stop();
|
controller.dispose();
|
||||||
_easyPermission.dispose();
|
// _easyPermission.dispose();
|
||||||
|
FlutterEasyPermission().dispose();
|
||||||
WidgetsBinding.instance.removeObserver(this);
|
WidgetsBinding.instance.removeObserver(this);
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
void startQrScannerIfPermissionGranted() {
|
@override
|
||||||
FlutterEasyPermission.has(perms: permissions, permsGroup: permissionGroup).then((value) {
|
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||||
if (value) {
|
/// Checking app cycle so that when user returns from settings, need to recheck for permissions
|
||||||
controller.start().then((result) {
|
if (state == AppLifecycleState.resumed) {
|
||||||
if (result != null) {
|
_checkPermissionAndStartScanner();
|
||||||
setState(() {
|
}
|
||||||
started = true;
|
}
|
||||||
});
|
|
||||||
}
|
Future<void> _checkPermissionAndStartScanner() async {
|
||||||
}).catchError((error) {
|
final hasPermission = await FlutterEasyPermission.has(
|
||||||
loggy.warning("Error starting scanner: $error");
|
perms: permissions,
|
||||||
});
|
permsGroup: permissionGroup,
|
||||||
} else {}
|
);
|
||||||
|
if (hasPermission) {
|
||||||
|
_startScanner();
|
||||||
|
} else {
|
||||||
|
setState(() {}); // Trigger rebuild to show permission denied UI
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _startScanner() async {
|
||||||
|
await controller.start().whenComplete(() {
|
||||||
|
setState(() {
|
||||||
|
started = true;
|
||||||
|
});
|
||||||
|
}).catchError((error) {
|
||||||
|
loggy.warning("Error starting scanner: $error");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> startQrScannerIfPermissionIsGranted() async {
|
||||||
|
final hasPermission = await FlutterEasyPermission.has(
|
||||||
|
perms: permissions,
|
||||||
|
permsGroup: permissionGroup,
|
||||||
|
);
|
||||||
|
if (hasPermission) {
|
||||||
|
_startScanner();
|
||||||
|
} else {
|
||||||
|
_showPermissionDialog();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// void startQrScannerIfPermissionGranted() {
|
||||||
|
// FlutterEasyPermission.has(perms: permissions, permsGroup: permissionGroup).then((value) {
|
||||||
|
// if (value) {
|
||||||
|
// controller.start().then((result) {
|
||||||
|
// if (result != null) {
|
||||||
|
// setState(() {
|
||||||
|
// started = true;
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }).catchError((error) {
|
||||||
|
// loggy.warning("Error starting scanner: $error");
|
||||||
|
// });
|
||||||
|
// } else {}
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|
||||||
|
void _showPermissionDialog() {
|
||||||
|
FlutterEasyPermission.showAppSettingsDialog(
|
||||||
|
title: "Camera Access Required",
|
||||||
|
rationale: "Permission to camera to scan QR Code",
|
||||||
|
positiveButtonText: "Settings",
|
||||||
|
negativeButtonText: "Cancel",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final t = ref.watch(translationsProvider);
|
final Translations t = ref.watch(translationsProvider);
|
||||||
|
|
||||||
startQrScannerIfPermissionGranted();
|
// startQrScannerIfPermissionGranted();
|
||||||
|
|
||||||
|
return FutureBuilder(
|
||||||
|
future: FlutterEasyPermission.has(
|
||||||
|
perms: permissions,
|
||||||
|
permsGroup: permissionGroup,
|
||||||
|
),
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (snapshot.data == true) {
|
||||||
|
return _buildScannerUI(context, t);
|
||||||
|
} else {
|
||||||
|
return _buildPermissionDeniedUI(context, t);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Widget _buildScannerUI(BuildContext context, Translations t) {
|
||||||
final size = MediaQuery.sizeOf(context);
|
final size = MediaQuery.sizeOf(context);
|
||||||
final overlaySize = (size.shortestSide - 12).coerceAtMost(248);
|
final overlaySize = (size.shortestSide - 12).coerceAtMost(248);
|
||||||
|
|
||||||
@@ -92,9 +218,9 @@ class _QRCodeScannerScreenState extends ConsumerState<QRCodeScannerScreen> with
|
|||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
backgroundColor: Colors.transparent,
|
backgroundColor: Colors.transparent,
|
||||||
iconTheme: Theme.of(context).iconTheme.copyWith(
|
iconTheme: Theme.of(context).iconTheme.copyWith(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
size: 32,
|
size: 32,
|
||||||
),
|
),
|
||||||
actions: [
|
actions: [
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: ValueListenableBuilder(
|
icon: ValueListenableBuilder(
|
||||||
@@ -179,6 +305,32 @@ class _QRCodeScannerScreenState extends ConsumerState<QRCodeScannerScreen> with
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget _buildPermissionDeniedUI(BuildContext context, Translations t) {
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
iconTheme: Theme.of(context).iconTheme.copyWith(
|
||||||
|
color: Colors.white,
|
||||||
|
size: 32,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
body: Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Text(t.profile.add.qrScanner.permissionDeniedError),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: _showPermissionDialog,
|
||||||
|
child: const Text("Settings"),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class ScannerOverlay extends CustomPainter {
|
class ScannerOverlay extends CustomPainter {
|
||||||
@@ -233,4 +385,4 @@ class ScannerOverlay extends CustomPainter {
|
|||||||
bool shouldRepaint(covariant CustomPainter oldDelegate) {
|
bool shouldRepaint(covariant CustomPainter oldDelegate) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user