Refactor UI components across various screens to use SVG avatars, enhance biometric authentication check, and improve code readability with consistent formatting.

android/app/.cxx/Debug/y4m3m96g/arm64-v8a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log`
 ^
 \D:\development_kits\flutter_sdk\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	¥þÿ÷ò2

¤ »æ’…â2Z
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	çÍ°øò2

¤ »æ’…â2Z
 X
-VD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\additional_project_files.txt	¥þÿ÷ò2
 ÏÓÜÔò2W
+VD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\additional_project_files.txt	çÍ°øò2
 ÏÓÜÔò2W
 U
-SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\android_gradle_build.json	¥þÿ÷ò2
è ÖÓÜÔò2\
+SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\android_gradle_build.json	çÍ°øò2
è ÖÓÜÔò2\
 Z
-XD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\android_gradle_build_mini.json	¥þÿ÷ò2
Ý äÓÜÔò2I
+XD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\android_gradle_build_mini.json	çÍ°øò2
Ý äÓÜÔò2I
 G
-ED:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\build.ninja	¥þÿ÷ò2
ÈÅ
 ›ÓÜÔò2M
+ED:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\build.ninja	çÍ°øò2
ÈÅ
 ›ÓÜÔò2M
 K
-ID:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\build.ninja.txt	¥þÿ÷ò2R
+ID:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\build.ninja.txt	çÍ°øò2R
 P
-ND:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\build_file_index.txt	¥þÿ÷ò2

\ êÓÜÔò2S
+ND:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\build_file_index.txt	çÍ°øò2

\ êÓÜÔò2S
 Q
-OD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\compile_commands.json	¥þÿ÷ò2	W
+OD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\compile_commands.json	çÍ°øò2	W
 U
-SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\compile_commands.json.bin	¥þÿ÷ò2
+SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\compile_commands.json.bin	çÍ°øò2
 ]
 [
-YD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\metadata_generation_command.txt	¥þÿ÷ò2
ý èÓÜÔò2P
+YD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\metadata_generation_command.txt	çÍ°øò2
ý èÓÜÔò2P
 N
-LD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\prefab_config.json	¥þÿ÷ò2

( éÓÜÔò2U
+LD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\prefab_config.json	çÍ°øò2

( éÓÜÔò2U
 S
-QD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\symbol_folder_index.txt	¥þÿ÷ò2


H éÓÜÔò2
+QD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\arm64-v8a\symbol_folder_index.txt	çÍ°øò2


H éÓÜÔò2

android/app/.cxx/Debug/y4m3m96g/armeabi-v7a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log`
 ^
 \D:\development_kits\flutter_sdk\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	¿þÿ÷ò2

¤ »æ’…â2\
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	€Î°øò2

¤ »æ’…â2\
 Z
-XD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\additional_project_files.txt	¿þÿ÷ò2
 øüÞÔò2Y
+XD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\additional_project_files.txt	€Î°øò2
 øüÞÔò2Y
 W
-UD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\android_gradle_build.json	¿þÿ÷ò2
ì ûüÞÔò2^
+UD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\android_gradle_build.json	€Î°øò2
ì ûüÞÔò2^
 \
-ZD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\android_gradle_build_mini.json	¿þÿ÷ò2
á þüÞÔò2K
+ZD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\android_gradle_build_mini.json	€Î°øò2
á þüÞÔò2K
 I
-GD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\build.ninja	¿þÿ÷ò2
ÒÅ
 ´üÞÔò2O
+GD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\build.ninja	€Î°øò2
ÒÅ
 ´üÞÔò2O
 M
-KD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\build.ninja.txt	¿þÿ÷ò2T
+KD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\build.ninja.txt	€Î°øò2T
 R
-PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\build_file_index.txt	¿þÿ÷ò2

\ ‚ýÞÔò2U
+PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\build_file_index.txt	€Î°øò2

\ ‚ýÞÔò2U
 S
-QD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\compile_commands.json	¿þÿ÷ò2	Y
+QD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\compile_commands.json	€Î°øò2	Y
 W
-UD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\compile_commands.json.bin	¿þÿ÷ò2
+UD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\compile_commands.json.bin	€Î°øò2
 _
 ]
-[D:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\metadata_generation_command.txt	¿þÿ÷ò2
‡ €ýÞÔò2R
+[D:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\metadata_generation_command.txt	€Î°øò2
‡ €ýÞÔò2R
 P
-ND:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\prefab_config.json	¿þÿ÷ò2

( <20>ýÞÔò2W
+ND:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\prefab_config.json	€Î°øò2

( <20>ýÞÔò2W
 U
-SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\symbol_folder_index.txt	¿þÿ÷ò2


J <20>ýÞÔò2
+SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\armeabi-v7a\symbol_folder_index.txt	€Î°øò2


J <20>ýÞÔò2

android/app/.cxx/Debug/y4m3m96g/x86/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log`
 ^
 \D:\development_kits\flutter_sdk\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ðþÿ÷ò2

¤ »æ’…â2T
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	–ΰøò2

¤ »æ’…â2T
 R
-PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\additional_project_files.txt	Ðþÿ÷ò2
 <20><>ßÔò2Q
+PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\additional_project_files.txt	–ΰøò2
 <20><>ßÔò2Q
 O
-MD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\android_gradle_build.json	Ðþÿ÷ò2
Ü <20><>ßÔò2V
+MD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\android_gradle_build.json	–ΰøò2
Ü <20><>ßÔò2V
 T
-RD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\android_gradle_build_mini.json	Ðþÿ÷ò2
Ñ ‘<>ßÔò2C
+RD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\android_gradle_build_mini.json	–ΰøò2
Ñ ‘<>ßÔò2C
 A
-?D:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\build.ninja	Ðþÿ÷ò2
ªÅ
 í<>ßÔò2G
+?D:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\build.ninja	–ΰøò2
ªÅ
 í<>ßÔò2G
 E
-CD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\build.ninja.txt	Ðþÿ÷ò2L
+CD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\build.ninja.txt	–ΰøò2L
 J
-HD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\build_file_index.txt	Ðþÿ÷ò2

\ ’<>ßÔò2M
+HD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\build_file_index.txt	–ΰøò2

\ ’<>ßÔò2M
 K
-ID:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\compile_commands.json	Ðþÿ÷ò2	Q
+ID:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\compile_commands.json	–ΰøò2	Q
 O
-MD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\compile_commands.json.bin	Ðþÿ÷ò2
+MD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\compile_commands.json.bin	–ΰøò2
 W
 U
-SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\metadata_generation_command.txt	Ðþÿ÷ò2
ß ‘<>ßÔò2J
+SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\metadata_generation_command.txt	–ΰøò2
ß ‘<>ßÔò2J
 H
-FD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\prefab_config.json	Ðþÿ÷ò2

( ‘<>ßÔò2O
+FD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\prefab_config.json	–ΰøò2

( ‘<>ßÔò2O
 M
-KD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\symbol_folder_index.txt	Ðþÿ÷ò2


B ‘<>ßÔò2
+KD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86\symbol_folder_index.txt	–ΰøò2


B ‘<>ßÔò2

android/app/.cxx/Debug/y4m3m96g/x86_64/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log`
 ^
 \D:\development_kits\flutter_sdk\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	âþÿ÷ò2

¤ »æ’…â2W
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	°Î°øò2

¤ »æ’…â2W
 U
-SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\additional_project_files.txt	âþÿ÷ò2
 Ú¨ßÔò2T
+SD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\additional_project_files.txt	°Î°øò2
 Ú¨ßÔò2T
 R
-PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\android_gradle_build.json	âþÿ÷ò2
â Û¨ßÔò2Y
+PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\android_gradle_build.json	°Î°øò2
â Û¨ßÔò2Y
 W
-UD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\android_gradle_build_mini.json	âþÿ÷ò2
× Þ¨ßÔò2F
+UD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\android_gradle_build_mini.json	°Î°øò2
× Þ¨ßÔò2F
 D
-BD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\build.ninja	âþÿ÷ò2
¹Å
 »¨ßÔò2J
+BD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\build.ninja	°Î°øò2
¹Å
 »¨ßÔò2J
 H
-FD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\build.ninja.txt	âþÿ÷ò2O
+FD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\build.ninja.txt	°Î°øò2O
 M
-KD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\build_file_index.txt	âþÿ÷ò2

\ ߨßÔò2P
+KD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\build_file_index.txt	°Î°øò2

\ ߨßÔò2P
 N
-LD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\compile_commands.json	âþÿ÷ò2	T
+LD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\compile_commands.json	°Î°øò2	T
 R
-PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\compile_commands.json.bin	âþÿ÷ò2
+PD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\compile_commands.json.bin	°Î°øò2
 Z
 X
-VD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\metadata_generation_command.txt	âþÿ÷ò2
î Þ¨ßÔò2M
+VD:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\metadata_generation_command.txt	°Î°øò2
î Þ¨ßÔò2M
 K
-ID:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\prefab_config.json	âþÿ÷ò2

( Þ¨ßÔò2R
+ID:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\prefab_config.json	°Î°øò2

( Þ¨ßÔò2R
 P
-ND:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\symbol_folder_index.txt	âþÿ÷ò2


E Þ¨ßÔò2
+ND:\work\kmobile\android\app\.cxx\Debug\y4m3m96g\x86_64\symbol_folder_index.txt	°Î°øò2


E Þ¨ßÔò2

lib/features/auth/screens/mpin_screen.dart

@@ -40,7 +40,7 @@ class _MPinScreenState extends State<MPinScreen> {
     final storage = getIt<SecureStorage>();
     final enabled = await storage.read('biometric_enabled');
     log('biometric_enabled: $enabled');
-    if (enabled) {
+    if (enabled != null && enabled) {
       final auth = LocalAuthentication();
       if (await auth.canCheckBiometrics) {
         final didAuth = await auth.authenticate(

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class AddBeneficiaryScreen extends StatefulWidget {
@@ -71,12 +72,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen>{
         title: const Text('Add Beneficiary', style: TextStyle(color: Colors.black,
             fontWeight: FontWeight.w500),),
         centerTitle: false,
-        actions: const [
+        actions:  [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+                  backgroundColor: Colors.grey[200],
                   radius: 20,
+                  child: SvgPicture.asset(
+                    'assets/images/avatar_male.svg',
+                    width: 40,
+                    height: 40,
+                    fit: BoxFit.cover,
+                  ),
                 ),
           ),
         ],

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/beneficiaries/screens/add_beneficiary_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
@@ -6,7 +7,8 @@ class ManageBeneficiariesScreen extends StatefulWidget {
   const ManageBeneficiariesScreen({super.key});
 
   @override
-  State<ManageBeneficiariesScreen> createState() => _ManageBeneficiariesScreen();
+  State<ManageBeneficiariesScreen> createState() =>
+      _ManageBeneficiariesScreen();
 }
 
 class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
@@ -33,24 +35,33 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen>{
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Beneficiaries', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Beneficiaries',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: Padding(
         padding: const EdgeInsets.all(8.0),
         child: ListView.builder(
@@ -59,8 +70,7 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen>{
             final beneficiary = beneficiaries[index];
             return ListTile(
               leading: const CircleAvatar(
-                backgroundColor: Colors.blue,
-                  child: Text('A')),
+                  backgroundColor: Colors.blue, child: Text('A')),
               title: Text(beneficiary['name']!),
               subtitle: Text(beneficiary['bank']!),
               trailing: IconButton(
@@ -77,7 +87,9 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen>{
         padding: const EdgeInsets.only(bottom: 8.0),
         child: FloatingActionButton(
           onPressed: () {
-            Navigator.push(context, MaterialPageRoute(
+            Navigator.push(
+                context,
+                MaterialPageRoute(
                     builder: (context) => const AddBeneficiaryScreen()));
           },
           backgroundColor: Colors.grey[300],
@@ -88,5 +100,4 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen>{
       ),
     );
   }
-
 }

lib/features/card/screens/block_card_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
@@ -54,24 +55,33 @@ class _BlockCardScreen extends State<BlockCardScreen>{
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Block Card', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Block Card',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: Padding(
         padding: const EdgeInsets.all(10.0),
         child: Form(
@@ -96,8 +106,9 @@ class _BlockCardScreen extends State<BlockCardScreen>{
                 ),
                 keyboardType: TextInputType.number,
                 textInputAction: TextInputAction.next,
-                validator: (value) =>
-                value != null && value.length == 16 ? null : 'Enter valid card number',
+                validator: (value) => value != null && value.length == 16
+                    ? null
+                    : 'Enter valid card number',
               ),
               const SizedBox(height: 24),
               Row(
@@ -121,8 +132,9 @@ class _BlockCardScreen extends State<BlockCardScreen>{
                       keyboardType: TextInputType.number,
                       textInputAction: TextInputAction.next,
                       obscureText: true,
-                      validator: (value) =>
-                      value != null && value.length == 3 ? null : 'CVV must be 3 digits',
+                      validator: (value) => value != null && value.length == 3
+                          ? null
+                          : 'CVV must be 3 digits',
                     ),
                   ),
                   const SizedBox(width: 16),
@@ -145,8 +157,9 @@ class _BlockCardScreen extends State<BlockCardScreen>{
                           borderSide: BorderSide(color: Colors.black, width: 2),
                         ),
                       ),
-                      validator: (value) =>
-                      value != null && value.isNotEmpty ? null : 'Select expiry date',
+                      validator: (value) => value != null && value.isNotEmpty
+                          ? null
+                          : 'Select expiry date',
                     ),
                   ),
                 ],
@@ -170,8 +183,9 @@ class _BlockCardScreen extends State<BlockCardScreen>{
                 ),
                 textInputAction: TextInputAction.done,
                 keyboardType: TextInputType.phone,
-                validator: (value) =>
-                value != null && value.length >= 10 ? null : 'Enter valid phone number',
+                validator: (value) => value != null && value.length >= 10
+                    ? null
+                    : 'Enter valid phone number',
               ),
               const SizedBox(height: 45),
               Align(
@@ -196,5 +210,4 @@ class _BlockCardScreen extends State<BlockCardScreen>{
       ),
     );
   }
-
 }

lib/features/card/screens/card_management_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/card/screens/block_card_screen.dart';
 import 'package:kmobile/features/card/screens/card_pin_change_details_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -16,54 +17,64 @@ class _CardManagementScreen extends State<CardManagementScreen>{
     return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: false,
-        title: const Text('Card Management', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+        title: const Text(
+          'Card Management',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: ListView(
         children: [
           CardManagementTile(
             icon: Symbols.add,
             label: 'Apply Debit Card',
-            onTap: () {
-
-            },
+            onTap: () {},
+          ),
+          const Divider(
+            height: 1,
           ),
-
-          const Divider(height: 1,),
-
           CardManagementTile(
             icon: Symbols.remove_moderator,
             label: 'Block / Unblock Card',
             onTap: () {
-              Navigator.push(context, MaterialPageRoute(
+              Navigator.push(
+                  context,
+                  MaterialPageRoute(
                       builder: (context) => const BlockCardScreen()));
             },
           ),
-
-          const Divider(height: 1,),
-
+          const Divider(
+            height: 1,
+          ),
           CardManagementTile(
             icon: Symbols.password_2,
             label: 'Change Card PIN',
             onTap: () {
-              Navigator.push(context, MaterialPageRoute(
-                  builder: (context) => const CardPinChangeDetailsScreen()));
+              Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) =>
+                          const CardPinChangeDetailsScreen()));
             },
           ),
-
-          const Divider(height: 1,),
-
+          const Divider(
+            height: 1,
+          ),
         ],
       ),
     );
@@ -92,4 +103,3 @@ class CardManagementTile extends StatelessWidget {
     );
   }
 }
-

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/features/card/screens/card_pin_set_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -7,7 +8,8 @@ class CardPinChangeDetailsScreen extends StatefulWidget {
   const CardPinChangeDetailsScreen({super.key});
 
   @override
-  State<CardPinChangeDetailsScreen> createState() => _CardPinChangeDetailsScreen();
+  State<CardPinChangeDetailsScreen> createState() =>
+      _CardPinChangeDetailsScreen();
 }
 
 class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
@@ -43,24 +45,33 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Card Details', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Card Details',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: Padding(
         padding: const EdgeInsets.all(10.0),
         child: Form(
@@ -85,8 +96,9 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
                 ),
                 keyboardType: TextInputType.number,
                 textInputAction: TextInputAction.next,
-                validator: (value) =>
-                value != null && value.length == 16 ? null : 'Enter valid card number',
+                validator: (value) => value != null && value.length == 16
+                    ? null
+                    : 'Enter valid card number',
               ),
               const SizedBox(height: 24),
               Row(
@@ -110,8 +122,9 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
                       keyboardType: TextInputType.number,
                       textInputAction: TextInputAction.next,
                       obscureText: true,
-                      validator: (value) =>
-                      value != null && value.length == 3 ? null : 'CVV must be 3 digits',
+                      validator: (value) => value != null && value.length == 3
+                          ? null
+                          : 'CVV must be 3 digits',
                     ),
                   ),
                   const SizedBox(width: 16),
@@ -134,8 +147,9 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
                           borderSide: BorderSide(color: Colors.black, width: 2),
                         ),
                       ),
-                      validator: (value) =>
-                      value != null && value.isNotEmpty ? null : 'Select expiry date',
+                      validator: (value) => value != null && value.isNotEmpty
+                          ? null
+                          : 'Select expiry date',
                     ),
                   ),
                 ],
@@ -159,8 +173,9 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
                 ),
                 textInputAction: TextInputAction.done,
                 keyboardType: TextInputType.phone,
-                validator: (value) =>
-                value != null && value.length >= 10 ? null : 'Enter valid phone number',
+                validator: (value) => value != null && value.length >= 10
+                    ? null
+                    : 'Enter valid phone number',
               ),
               const SizedBox(height: 45),
               Align(
@@ -185,5 +200,4 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
       ),
     );
   }
-
 }

lib/features/card/screens/card_pin_set_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class CardPinSetScreen extends StatefulWidget {
@@ -44,24 +45,33 @@ class _CardPinSetScreen extends State<CardPinSetScreen>{
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Card PIN', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Card PIN',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Form(

lib/features/cheque/screens/cheque_management_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/enquiry/screens/enquiry_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
@@ -10,94 +11,97 @@ class ChequeManagementScreen extends StatefulWidget {
 }
 
 class _ChequeManagementScreen extends State<ChequeManagementScreen> {
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Cheque Management', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Cheque Management',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: ListView(
         children: [
           const SizedBox(height: 15),
           ChequeManagementTile(
             icon: Symbols.add,
             label: 'Request Checkbook',
-            onTap: () {
-
-            },
+            onTap: () {},
+          ),
+          const Divider(
+            height: 1,
           ),
-
-          const Divider(height: 1,),
-
           ChequeManagementTile(
             icon: Symbols.data_alert,
             label: 'Enquiry',
             onTap: () {
-              Navigator.push(context, MaterialPageRoute(
+              Navigator.push(
+                  context,
+                  MaterialPageRoute(
                       builder: (context) => const EnquiryScreen()));
             },
           ),
-
-          const Divider(height: 1,),
-
+          const Divider(
+            height: 1,
+          ),
           ChequeManagementTile(
             icon: Symbols.approval_delegation,
             label: 'Cheque Deposit',
-            onTap: () {
-            },
+            onTap: () {},
+          ),
+          const Divider(
+            height: 1,
           ),
-
-          const Divider(height: 1,),
-
           ChequeManagementTile(
             icon: Symbols.front_hand,
             label: 'Stop Cheque',
-            onTap: () {
-            },
+            onTap: () {},
+          ),
+          const Divider(
+            height: 1,
           ),
-
-          const Divider(height: 1,),
-
           ChequeManagementTile(
             icon: Symbols.cancel_presentation,
             label: 'Revoke Stop',
-            onTap: () {
-            },
+            onTap: () {},
+          ),
+          const Divider(
+            height: 1,
           ),
-
-          const Divider(height: 1,),
-
           ChequeManagementTile(
             icon: Symbols.payments,
             label: 'Positive Pay',
-            onTap: () {
-            },
+            onTap: () {},
+          ),
+          const Divider(
+            height: 1,
           ),
-
-          const Divider(height: 1,),
-
         ],
       ),
     );
   }
-
 }
 
 class ChequeManagementTile extends StatelessWidget {

lib/features/enquiry/screens/enquiry_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -35,24 +36,33 @@ class _EnquiryScreen extends State<EnquiryScreen>{
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Enquiry', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Enquiry',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
@@ -89,5 +99,4 @@ class _EnquiryScreen extends State<EnquiryScreen>{
       ),
     );
   }
-
 }

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/beneficiaries/screens/add_beneficiary_screen.dart';
 import 'package:kmobile/features/fund_transfer/screens/fund_transfer_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -7,10 +8,12 @@ class FundTransferBeneficiaryScreen extends StatefulWidget {
   const FundTransferBeneficiaryScreen({super.key});
 
   @override
-  State<FundTransferBeneficiaryScreen> createState() => _FundTransferBeneficiaryScreen();
+  State<FundTransferBeneficiaryScreen> createState() =>
+      _FundTransferBeneficiaryScreen();
 }
 
-class _FundTransferBeneficiaryScreen extends State<FundTransferBeneficiaryScreen>{
+class _FundTransferBeneficiaryScreen
+    extends State<FundTransferBeneficiaryScreen> {
   final List<Map<String, String>> beneficiaries = [
     {
       'bank': 'State Bank Of India',
@@ -34,24 +37,33 @@ class _FundTransferBeneficiaryScreen extends State<FundTransferBeneficiaryScreen
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
           onPressed: () {
             Navigator.pop(context);
-          },),
-        title: const Text('Fund Transfer - Beneficiary', style: TextStyle(color: Colors.black,
-            fontWeight: FontWeight.w500),),
+          },
+        ),
+        title: const Text(
+          'Fund Transfer - Beneficiary',
+          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
       ),
-
       body: Padding(
         padding: const EdgeInsets.all(8.0),
         child: ListView.builder(
@@ -60,18 +72,22 @@ class _FundTransferBeneficiaryScreen extends State<FundTransferBeneficiaryScreen
             final beneficiary = beneficiaries[index];
             return ListTile(
               leading: const CircleAvatar(
-                  backgroundColor: Colors.blue,
-                  child: Text('A')),
+                  backgroundColor: Colors.blue, child: Text('A')),
               title: Text(beneficiary['name']!),
               subtitle: Text(beneficiary['bank']!),
               trailing: IconButton(
-                icon: const Icon(Symbols.arrow_right, size: 20,),
+                icon: const Icon(
+                  Symbols.arrow_right,
+                  size: 20,
+                ),
                 onPressed: () {
                   // Delete action
                 },
               ),
               onTap: () {
-                Navigator.push(context, MaterialPageRoute(
+                Navigator.push(
+                    context,
+                    MaterialPageRoute(
                         builder: (context) => const FundTransferScreen()));
               },
             );
@@ -82,7 +98,9 @@ class _FundTransferBeneficiaryScreen extends State<FundTransferBeneficiaryScreen
         padding: const EdgeInsets.only(bottom: 8.0),
         child: FloatingActionButton(
           onPressed: () {
-            Navigator.push(context, MaterialPageRoute(
+            Navigator.push(
+                context,
+                MaterialPageRoute(
                     builder: (context) => const AddBeneficiaryScreen()));
           },
           backgroundColor: Colors.grey[300],

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:flutter_swipe_button/flutter_swipe_button.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
@@ -58,13 +59,18 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
           style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'),
-              // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],

lib/features/quick_pay/screens/quick_pay_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/quick_pay/screens/quick_pay_outside_bank_screen.dart';
 import 'package:kmobile/features/quick_pay/screens/quick_pay_within_bank_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -26,13 +27,18 @@ class _QuickPayScreen extends State<QuickPayScreen> {
           style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'),
-              // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:flutter_swipe_button/flutter_swipe_button.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
@@ -15,7 +16,8 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   final _formKey = GlobalKey<FormState>();
 
   final TextEditingController accountNumberController = TextEditingController();
-  final TextEditingController confirmAccountNumberController = TextEditingController();
+  final TextEditingController confirmAccountNumberController =
+      TextEditingController();
   final TextEditingController nameController = TextEditingController();
   final TextEditingController amountController = TextEditingController();
 
@@ -34,13 +36,18 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
           style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: const [
+        actions: [
           Padding(
-            padding: EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.only(right: 10.0),
             child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'),
-              // Replace with your image
+              backgroundColor: Colors.grey[200],
               radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
             ),
           ),
         ],
@@ -210,13 +217,13 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                     if (_formKey.currentState!.validate()) {
                       // Perform payment logic
                       ScaffoldMessenger.of(context).showSnackBar(
-                        const SnackBar(
-                            content: Text('Processing Payment...')),
+                        const SnackBar(content: Text('Processing Payment...')),
                       );
                       Navigator.push(
                           context,
                           MaterialPageRoute(
-                              builder: (context) => const TransactionPinScreen()));
+                              builder: (context) =>
+                                  const TransactionPinScreen()));
                     }
                   },
                 ),