From 151140d563e0f42a75744392ea91f64b20a65af7 Mon Sep 17 00:00:00 2001 From: asif Date: Fri, 7 Nov 2025 17:40:56 +0530 Subject: [PATCH] Fingerprint Toggle fixed --- lib/di/injection.dart | 4 +- lib/features/profile/profile_screen.dart | 187 ++++++++++++----------- pubspec.lock | 64 ++++---- 3 files changed, 128 insertions(+), 127 deletions(-) diff --git a/lib/di/injection.dart b/lib/di/injection.dart index bef663c..20e6f4c 100644 --- a/lib/di/injection.dart +++ b/lib/di/injection.dart @@ -69,9 +69,9 @@ Dio _createDioClient() { final dio = Dio( BaseOptions( baseUrl: - 'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test + // 'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com', //prod - //'https://kccbmbnk.net', //prod small + 'https://kccbmbnk.net', //prod small connectTimeout: const Duration(seconds: 60), receiveTimeout: const Duration(seconds: 60), headers: { diff --git a/lib/features/profile/profile_screen.dart b/lib/features/profile/profile_screen.dart index 82f5e79..8d50855 100644 --- a/lib/features/profile/profile_screen.dart +++ b/lib/features/profile/profile_screen.dart @@ -34,13 +34,12 @@ class _ProfileScreenState extends State { return 'Version ${info.version} (${info.buildNumber})'; } - Future _loadBiometricStatus() async { - final storage = getIt(); - final isEnabled = await storage.read('biometric_enabled'); - setState(() { - _isBiometricEnabled = isEnabled == 'true'; - }); - } + Future _loadBiometricStatus() async { + final prefs = await SharedPreferences.getInstance(); + setState(() { + _isBiometricEnabled = prefs.getBool('biometric_enabled') ?? false; + }); + } Future _handleLogout(BuildContext context) async { final auth = getIt(); @@ -51,89 +50,90 @@ class _ProfileScreenState extends State { Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false); } - Future _handleBiometricToggle(bool enable) async { - final localAuth = LocalAuthentication(); - final storage = getIt(); - final canCheck = await localAuth.canCheckBiometrics; + Future _handleBiometricToggle(bool enable) async { + final localAuth = LocalAuthentication(); + final prefs = await SharedPreferences.getInstance(); + final canCheck = await localAuth.canCheckBiometrics; - if (!canCheck) { - // Optional: Show a snackbar or dialog if biometrics are not available - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(AppLocalizations.of(context).biometricsNotAvailable)), - ); - return; - } + if (!canCheck) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(AppLocalizations.of(context).biometricsNotAvailable)), + ); + return; + } - if (enable) { - // Show "Enable" dialog - final optIn = await showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) => AlertDialog( - title: Text(AppLocalizations.of(context).enableFingerprintLogin), - content: Text(AppLocalizations.of(context).enableFingerprintMessage), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: Text(AppLocalizations.of(context).no), - ), - TextButton( - onPressed: () => Navigator.of(ctx).pop(true), - child: Text(AppLocalizations.of(context).yes), - ), - ], - ), - ); + if (enable) { + final optIn = await showDialog( + context: context, + barrierDismissible: false, + builder: (ctx) => AlertDialog( + title: Text(AppLocalizations.of(context).enableFingerprintLogin), + content: Text(AppLocalizations.of(context).enableFingerprintMessage), + actions: [ + TextButton( + onPressed: () => Navigator.of(ctx).pop(false), + child: Text(AppLocalizations.of(context).no), + ), + TextButton( + onPressed: () => Navigator.of(ctx).pop(true), + child: Text(AppLocalizations.of(context).yes), + ), + ], + ), + ); - if (optIn == true) { - try { - final didAuth = await localAuth.authenticate( - localizedReason: AppLocalizations.of(context).authenticateToEnable, - options: const AuthenticationOptions( - stickyAuth: true, - biometricOnly: true, - ), - ); - if (didAuth) { - await storage.write('biometric_enabled', 'true'); - setState(() { - _isBiometricEnabled = true; - }); - } - } catch (e) { - // Handle authentication errors - } - } - } else { - // Show "Disable" dialog - final optOut = await showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) => AlertDialog( - title: Text(AppLocalizations.of(context).disableFingerprintLogin), - content: Text(AppLocalizations.of(context).disableFingerprintMessage), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: Text(AppLocalizations.of(context).no), - ), - TextButton( - onPressed: () => Navigator.of(ctx).pop(true), - child: Text(AppLocalizations.of(context).yes), - ), - ], - ), - ); + if (optIn == true) { + try { + final didAuth = await localAuth.authenticate( + localizedReason: AppLocalizations.of(context).authenticateToEnable, + options: const AuthenticationOptions( + stickyAuth: true, + biometricOnly: true, + ), + ); + if (didAuth) { + await prefs.setBool('biometric_enabled', true); + if (mounted) { + setState(() { + _isBiometricEnabled = true; + }); + } + } + } catch (e) { + // Handle exceptions, state remains unchanged. + } + } + } else { + final optOut = await showDialog( + context: context, + barrierDismissible: false, + builder: (ctx) => AlertDialog( + title: Text(AppLocalizations.of(context).disableFingerprintLogin), + content: Text(AppLocalizations.of(context).disableFingerprintMessage), + actions: [ + TextButton( + onPressed: () => Navigator.of(ctx).pop(false), + child: Text(AppLocalizations.of(context).no), + ), + TextButton( + onPressed: () => Navigator.of(ctx).pop(true), + child: Text(AppLocalizations.of(context).yes), + ), + ], + ), + ); - if (optOut == true) { - await storage.write('biometric_enabled', 'false'); - setState(() { - _isBiometricEnabled = false; - }); - } - } - } + if (optOut == true) { + await prefs.setBool('biometric_enabled', false); + if (mounted) { + setState(() { + _isBiometricEnabled = false; + }); + } + } + } + } @override Widget build(BuildContext context) { @@ -168,13 +168,14 @@ class _ProfileScreenState extends State { }, ), SwitchListTile( - title: Text(AppLocalizations.of(context).enableFingerprintLogin), - value: _isBiometricEnabled, - onChanged: (bool value) { - _handleBiometricToggle(value); - }, - secondary: const Icon(Icons.fingerprint), - ), + title: Text(AppLocalizations.of(context).enableFingerprintLogin), + value: _isBiometricEnabled, + onChanged: (bool value) { + // The state is now managed within _handleBiometricToggle + _handleBiometricToggle(value); + }, + secondary: const Icon(Icons.fingerprint), + ), ListTile( leading: const Icon(Icons.password), title: Text(loc.changeLoginPassword), diff --git a/pubspec.lock b/pubspec.lock index 167c712..6e600bd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -93,18 +93,18 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" confetti: dependency: "direct main" description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" ffi: dependency: transitive description: @@ -385,10 +385,10 @@ packages: dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.20.2" jailbreak_root_detection: dependency: "direct main" description: @@ -417,26 +417,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -497,10 +497,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -521,10 +521,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -561,10 +561,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -817,7 +817,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -838,18 +838,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -870,10 +870,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.6" typed_data: dependency: transitive description: @@ -982,10 +982,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -1043,5 +1043,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.24.0"