App Version added and dart format

lib/features/profile/change_password/change_password_otp_screen.dart

@@ -14,12 +14,13 @@ class ChangePasswordOTPScreen extends StatefulWidget {
   const ChangePasswordOTPScreen({
     required this.currentPassword,
     required this.newPassword,
-    required this.confirmPassword, 
+    required this.confirmPassword,
     required this.mobileNumber,
   });
 
   @override
-  State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState();
+  State<ChangePasswordOTPScreen> createState() =>
+      _ChangePasswordOTPScreenState();
 }
 
 class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
@@ -36,33 +37,33 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
       });
     });
   }
+
   final changePasswordService = getIt<ChangePasswordService>();
   Future<void> _validateOTP() async {
-   try {
-  await changePasswordService.validateOtp(
-    otp: otpController.text,
-    mobileNumber: widget.mobileNumber,
-  );
+    try {
+      await changePasswordService.validateOtp(
+        otp: otpController.text,
+        mobileNumber: widget.mobileNumber,
+      );
 
-  // If OTP is valid, then change the password
-  await changePasswordService.validateChangePwd(
-    OldLPsw: widget.currentPassword,
-    newLPsw: widget.newPassword,
-    confirmLPsw: widget.confirmPassword,
-  );
-  
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
-  );
+      // If OTP is valid, then change the password
+      await changePasswordService.validateChangePwd(
+        OldLPsw: widget.currentPassword,
+        newLPsw: widget.newPassword,
+        confirmLPsw: widget.confirmPassword,
+      );
 
-  // Navigate back to profile or login
-  Navigator.of(context).popUntil((route) => route.isFirst);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
+      );
 
-} catch (e) {
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
-  );
-}
+      // Navigate back to profile or login
+      Navigator.of(context).popUntil((route) => route.isFirst);
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+      );
+    }
   }
 
   @override
@@ -106,4 +107,4 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
       ),
     );
   }
-}
+}

lib/features/profile/change_password/change_password_screen.dart

@@ -56,38 +56,40 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
     }
     return null;
   }
-final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
-void _proceed() async {
-  if (_formKey.currentState!.validate()) {
 
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  void _proceed() async {
+    if (_formKey.currentState!.validate()) {
+      try {
+        await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
 
-    try {
-      await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
-
-
-      Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => ChangePasswordOTPScreen(
-            currentPassword: currentPasswordController.text,
-            newPassword: newPasswordController.text,
-            confirmPassword: confirmPasswordController.text,
-            mobileNumber: widget.mobileNumber, 
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => ChangePasswordOTPScreen(
+              currentPassword: currentPasswordController.text,
+              newPassword: newPasswordController.text,
+              confirmPassword: confirmPasswordController.text,
+              mobileNumber: widget.mobileNumber,
+            ),
           ),
-        ),
-      );
-    } catch (e) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
-      );
+        );
+      } catch (e) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+              content:
+                  Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+        );
+      }
     }
   }
-}
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
+      appBar:
+          AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
       body: Padding(
         padding: const EdgeInsets.all(16),
         child: Form(
@@ -103,8 +105,8 @@ void _proceed() async {
                     icon: Icon(_showCurrentPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
-                        setState(() => _showCurrentPassword = !_showCurrentPassword),
+                    onPressed: () => setState(
+                        () => _showCurrentPassword = !_showCurrentPassword),
                   ),
                 ),
                 validator: validateCurrentPassword,
@@ -135,8 +137,8 @@ void _proceed() async {
                     icon: Icon(_showConfirmPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
-                        setState(() => _showConfirmPassword = !_showConfirmPassword),
+                    onPressed: () => setState(
+                        () => _showConfirmPassword = !_showConfirmPassword),
                   ),
                 ),
                 validator: validateConfirmPassword,
@@ -152,4 +154,4 @@ void _proceed() async {
       ),
     );
   }
-}
+}

lib/features/profile/logout_dialog.dart

@@ -22,4 +22,4 @@ class LogoutDialog extends StatelessWidget {
       ],
     );
   }
-}
+}

lib/features/profile/preferences/theme_mode_dialog.dart

@@ -17,13 +17,13 @@ String _getThemeModeText(ThemeMode mode, AppLocalizations l10n) {
 Future<void> showThemeModeDialog(BuildContext context) async {
   final cubit = context.read<ThemeModeCubit>();
   final currentMode = context.read<ThemeModeCubit>().state.mode;
-  final l10n = AppLocalizations.of(context); 
+  final l10n = AppLocalizations.of(context);
 
   await showDialog(
     context: context,
     builder: (context) {
       return AlertDialog(
-        title: Text(l10n.selectThemeMode), 
+        title: Text(l10n.selectThemeMode),
         content: Column(
           mainAxisSize: MainAxisSize.min,
           children: ThemeMode.values.map((mode) {
@@ -43,4 +43,4 @@ Future<void> showThemeModeDialog(BuildContext context) async {
       );
     },
   );
-}
+}

lib/features/profile/profile_screen.dart

@@ -6,6 +6,7 @@ import 'package:kmobile/features/profile/change_password/change_password_screen.
 import 'package:kmobile/features/profile/logout_dialog.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
@@ -20,22 +21,27 @@ class ProfileScreen extends StatefulWidget {
 }
 
 class _ProfileScreenState extends State<ProfileScreen> {
-    bool _isBiometricEnabled = false;
-     @override
- void initState() {
-   super.initState();
-   _loadBiometricStatus();
- }
+  bool _isBiometricEnabled = false;
+  @override
+  void initState() {
+    super.initState();
+    _loadBiometricStatus();
+  }
 
- Future<void> _loadBiometricStatus() async {
-   final storage = getIt<SecureStorage>();
-   final isEnabled = await storage.read('biometric_enabled');
-   setState(() {
-     _isBiometricEnabled = isEnabled == 'true';
-   });
- }
+  Future<String> _getAppVersion() async {
+    final PackageInfo info = await PackageInfo.fromPlatform();
+    return 'Version ${info.version} (${info.buildNumber})';
+  }
 
-    Future<void> _handleLogout(BuildContext context) async {
+  Future<void> _loadBiometricStatus() async {
+    final storage = getIt<SecureStorage>();
+    final isEnabled = await storage.read('biometric_enabled');
+    setState(() {
+      _isBiometricEnabled = isEnabled == 'true';
+    });
+  }
+
+  Future<void> _handleLogout(BuildContext context) async {
     final auth = getIt<AuthRepository>();
     final prefs = await SharedPreferences.getInstance();
     await prefs.clear(); // clear saved session/token
@@ -44,89 +50,89 @@ class _ProfileScreenState extends State<ProfileScreen> {
     Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
   }
 
-   
- Future<void> _handleBiometricToggle(bool enable) async {
-   final localAuth = LocalAuthentication();
-   final storage = getIt<SecureStorage>();
-   final canCheck = await localAuth.canCheckBiometrics;
+  Future<void> _handleBiometricToggle(bool enable) async {
+    final localAuth = LocalAuthentication();
+    final storage = getIt<SecureStorage>();
+    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) {
+      // Optional: Show a snackbar or dialog if biometrics are not available
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+            content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
+      );
+      return;
+    }
 
-   if (enable) {
-     // Show "Enable" dialog
-     final optIn = await showDialog<bool>(
-       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) {
+      // Show "Enable" dialog
+      final optIn = await showDialog<bool>(
+        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<bool>(
-       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 storage.write('biometric_enabled', 'true');
+            setState(() {
+              _isBiometricEnabled = true;
+            });
+          }
+        } catch (e) {
+          // Handle authentication errors
+        }
+      }
+    } else {
+      // Show "Disable" dialog
+      final optOut = await showDialog<bool>(
+        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 storage.write('biometric_enabled', 'false');
+        setState(() {
+          _isBiometricEnabled = false;
+        });
+      }
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -140,7 +146,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
         children: [
           ListTile(
             leading: const Icon(Icons.settings),
-            title: Text(loc.preferences), 
+            title: Text(loc.preferences),
             onTap: () {
               Navigator.push(
                 context,
@@ -149,71 +155,93 @@ class _ProfileScreenState extends State<ProfileScreen> {
               );
             },
           ),
-           SwitchListTile(
-   title: Text(AppLocalizations.of(context).enableFingerprintLogin),
-   value: _isBiometricEnabled,
-   onChanged: (bool value) {
-     _handleBiometricToggle(value);
-   },
-   secondary: const Icon(Icons.fingerprint),
- ),
+          SwitchListTile(
+            title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+            value: _isBiometricEnabled,
+            onChanged: (bool value) {
+              _handleBiometricToggle(value);
+            },
+            secondary: const Icon(Icons.fingerprint),
+          ),
           ListTile(
             leading: const Icon(Icons.password),
-            title: Text(loc.changeLoginPassword), 
+            title: Text(loc.changeLoginPassword),
             onTap: () {
-            Navigator.push(  
-              context,
-            MaterialPageRoute(builder: (context) => ChangePasswordScreen(
-              mobileNumber: widget.mobileNumber,
-            )),
-            );
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => ChangePasswordScreen(
+                          mobileNumber: widget.mobileNumber,
+                        )),
+              );
             },
           ),
           // ListTile(
           //   leading: const Icon(Icons.password),
-          //   title: const Text("Manage TPIN"), 
+          //   title: const Text("Manage TPIN"),
           //   onTap: () async {
           //   },
           // ),
           //           ListTile(
           //   leading: const Icon(Icons.password),
-          //   title: const Text("Change Login MPIN"), 
+          //   title: const Text("Change Login MPIN"),
           //   onTap: () async {
           //   },
           // ),
           ListTile(
-  leading: const Icon(Icons.exit_to_app),
-  title: Text(AppLocalizations.of(context).logout), 
-  onTap: () async {
-    final shouldExit = await showDialog<bool>(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text(AppLocalizations.of(context).logout),
-        content: Text(AppLocalizations.of(context).logoutCheck),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(false),
-            child: Text(AppLocalizations.of(context).no),
+            leading: const Icon(Icons.smartphone),
+            title: const Text("App Version"),
+            trailing: FutureBuilder<String>(
+              future: _getAppVersion(),
+              builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
+                if (snapshot.connectionState == ConnectionState.waiting) {
+                  // Show a loading indicator while waiting for the future to complete
+                  return const CircularProgressIndicator();
+                } else if (snapshot.hasError) {
+                  return const Text("Error");
+                } else {
+                  // Display the version number once the future is complete
+                  return Text(
+                    snapshot.data ?? "N/A",
+                    selectionColor: const Color(0xFFFFFFFF),
+                  );
+                }
+              },
+            ),
           ),
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(true),
-            child: Text(AppLocalizations.of(context).yes),
-          ),
-        ],
-      ),
-    );
+          ListTile(
+            leading: const Icon(Icons.exit_to_app),
+            title: Text(AppLocalizations.of(context).logout),
+            onTap: () async {
+              final shouldExit = await showDialog<bool>(
+                context: context,
+                builder: (context) => AlertDialog(
+                  title: Text(AppLocalizations.of(context).logout),
+                  content: Text(AppLocalizations.of(context).logoutCheck),
+                  actions: [
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(false),
+                      child: Text(AppLocalizations.of(context).no),
+                    ),
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(true),
+                      child: Text(AppLocalizations.of(context).yes),
+                    ),
+                  ],
+                ),
+              );
 
-     if (shouldExit == true) {
-           if (Platform.isAndroid) {
-              SystemNavigator.pop();
-            }
-            exit(0);
-          }
-  },
-),
-            ListTile(
+              if (shouldExit == true) {
+                if (Platform.isAndroid) {
+                  SystemNavigator.pop();
+                }
+                exit(0);
+              }
+            },
+          ),
+          ListTile(
             leading: const Icon(Icons.logout),
-            title: Text(AppLocalizations.of(context).deregister), 
+            title: Text(AppLocalizations.of(context).deregister),
             onTap: () async {
               final shouldLogout = await showDialog<bool>(
                 context: context,