Rooted Device Check #1.2

android/app/build.gradle

@@ -45,7 +45,7 @@ android {
         applicationId "com.example.kmobile"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 29
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -53,13 +53,13 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 
-
+            'proguard-rules.pro'
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
         }
     }
 }

android/app/proguard-rules.pro

@@ -1,21 +1,77 @@
+# Keep Flutter embedding and plugin registrant (important)
+-keep class io.flutter.embedding.** { *; }
+-keep class io.flutter.plugins.** { *; }
+-keep class io.flutter.plugin.** { *; }
 -keep class io.flutter.app.** { *; }
--keep class io.flutter.plugin.**  { *; }
+
--keep class io.flutter.util.**  { *; }
+# Keep Application / Activity if you customized them (replace with your package name)
--keep class io.flutter.view.**  { *; }
+# -keep class com.yourcompany.yourapp.MainActivity { *; }
--keep class io.flutter.embedding.**  { *; }
+# -keep class com.yourcompany.yourapp.** { *; }
--keep class io.flutter.embedding.engine.plugins.**  { *; }
+
+# Keep classes referenced from AndroidManifest via reflection or lifecycle
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+    public <init>(android.content.Context, ...);
+}
+
+# Keep native entry points (JNI) if any (example)
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# Keep classes that use reflection heavily (OKHttp/Retrofit/Gson)
+# Retrofit/OkHttp
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class retrofit2.** { *; }
+-keep interface retrofit2.** { *; }
+
+# Gson (models accessed by reflection)
+-keep class com.google.gson.** { *; }
+-keepattributes Signature
+-keepattributes *Annotation*
+
+# Keep Firebase (if you use it)
 -keep class com.google.firebase.** { *; }
 -keep class com.google.android.gms.** { *; }
-# Please add these rules to your existing keep rules in order to suppress warnings.
+
-# This is generated automatically by the Android Gradle plugin.
+# WorkManager (if used)
--dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
+-keep class androidx.work.impl.background.systemjob.SystemJobService { *; }
--dontwarn com.google.android.play.core.splitinstall.SplitInstallException
+-keep class androidx.work.** { *; }
--dontwarn com.google.android.play.core.splitinstall.SplitInstallManager
+
--dontwarn com.google.android.play.core.splitinstall.SplitInstallManagerFactory
+# Room/DB entities - if you use Room, keep annotations and entity classes
--dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest$Builder
+-keepclassmembers class * {
--dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest
+    @androidx.room.* <fields>;
--dontwarn com.google.android.play.core.splitinstall.SplitInstallSessionState
+}
--dontwarn com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
+-keep class androidx.room.** { *; }
--dontwarn com.google.android.play.core.tasks.OnFailureListener
+
--dontwarn com.google.android.play.core.tasks.OnSuccessListener
+# Keep classes loaded by reflection (e.g. through Class.forName)
--dontwarn com.google.android.play.core.tasks.Task
+-keepclassmembers,includedescriptorclasses class * {
+    public static <fields>;
+    public <init>(...);
+}
+
+# Keep Kotlin metadata (for Kotlin reflection)
+-keep class kotlin.Metadata { *; }
+
+# Keep names of classes annotated with @Keep
+-keep @androidx.annotation.Keep class * { *; }
+-keepclassmembers class * {
+    @androidx.annotation.Keep *;
+}
+
+# If using Gson TypeAdapterFactory via reflection
+-keepclassmembers class * {
+    static ** typeAdapterFactory*(...);
+}
+
+# Don't remove debug/logging if you want (optional)
+#-keep class android.util.Log { *; }
+
+# Keep any generated plugin registrant classes if present (older projects)
+-keep class io.flutter.plugins.GeneratedPluginRegistrant { *; }
+
+# (Optional) Keep parcelable implementations if those are serialized dynamically
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
         android:label="kmobile"
         android:name="${applicationName}"
         android:usesCleartextTraffic="true"
-        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

lib/app.dart

@@ -2,8 +2,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_state.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import './l10n/app_localizations.dart';
@@ -80,34 +78,29 @@ class _KMobileState extends State<KMobile> {
       providers: [
         BlocProvider<AuthCubit>(create: (_) => getIt<AuthCubit>()),
         BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()),
-        BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()),
       ],
       child: BlocBuilder<ThemeCubit, ThemeState>(
         builder: (context, themeState) {
-          return BlocBuilder<ThemeModeCubit, ThemeModeState>(
+          return MaterialApp(
-            builder: (context, modeState) {
+            debugShowCheckedModeBanner: false,
-              return MaterialApp(
+            locale: _locale ?? const Locale('en'),
-                debugShowCheckedModeBanner: false,
+            supportedLocales: const [
-                locale: _locale ?? const Locale('en'),
+              Locale('en'),
-                supportedLocales: const [
+              Locale('hi'),
-                  Locale('en'),
+            ],
-                  Locale('hi'),
+            localizationsDelegates: const [
-                ],
+              AppLocalizations.delegate,
-                localizationsDelegates: const [
+              GlobalMaterialLocalizations.delegate,
-                  AppLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate,
-                  GlobalMaterialLocalizations.delegate,
+              GlobalCupertinoLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
+            ],
-                  GlobalCupertinoLocalizations.delegate,
+            title: 'kMobile',
-                ],
+            theme: themeState.getThemeData(),
-                title: 'kMobile',
+            //darkTheme: themeState.getThemeData(),
-                theme: themeState.getLightThemeData(),
+            themeMode: ThemeMode.light,
-                darkTheme: themeState.getDarkThemeData(),
+            onGenerateRoute: AppRoutes.generateRoute,
-                themeMode: context.watch<ThemeModeCubit>().state.mode,
+            initialRoute: AppRoutes.splash,
-                onGenerateRoute: AppRoutes.generateRoute,
+            home: showSplash ? const SplashScreen() : const AuthGate(),
-                initialRoute: AppRoutes.splash,
-                home: showSplash ? const SplashScreen() : const AuthGate(),
-              );
-            },
           );
         },
       ),
@@ -342,10 +335,10 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+          backgroundColor: Theme.of(context)
-          selectedItemColor: Theme.of(context).colorScheme.primary,
+              .scaffoldBackgroundColor, // Light blue background
-          unselectedItemColor:
+          selectedItemColor: Theme.of(context).primaryColor,
-              Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
+          unselectedItemColor: Colors.black54,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;

lib/config/theme_type.dart

@@ -3,5 +3,4 @@ enum ThemeType {
   green,
   orange,
   blue,
-  yellow,
 }

lib/config/themes.dart

@@ -1,52 +1,39 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'theme_type.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class AppThemes {
   static ThemeData getLightTheme(ThemeType type) {
-    final Color seedColor = _getSeedColor(type);
+    final Color seedColor;
-    final colorScheme = ColorScheme.fromSeed(
+    switch (type) {
-      seedColor: seedColor,
+      case ThemeType.green:
-      brightness: Brightness.light,
+        seedColor = Colors.green;
-    );
+        break;
-    return ThemeData.from(
+      case ThemeType.orange:
-      colorScheme: colorScheme,
+        seedColor = Colors.orange;
-      useMaterial3: true,
+        break;
-      textTheme: GoogleFonts.rubikTextTheme(),
+      case ThemeType.blue:
-    );
+        seedColor = Colors.blue;
-  }
+        break;
+      case ThemeType.violet:
+        seedColor = Colors.deepPurple;
+        break;
+    }
 
-  static ThemeData getDarkTheme(ThemeType type) {
-    final Color seedColor = _getSeedColor(type);
-    log(seedColor.toString());
     final colorScheme = ColorScheme.fromSeed(
       seedColor: seedColor,
-      brightness: Brightness.dark,
+      brightness: Brightness.light, // Explicitly set for a light theme
     );
 
     return ThemeData.from(
-      colorScheme: colorScheme,
+            colorScheme: colorScheme,
-      useMaterial3: true,
+            useMaterial3: true, // Recommended for modern Flutter apps
-      textTheme: GoogleFonts.rubikTextTheme(
+            textTheme: GoogleFonts.rubikTextTheme())
-        ThemeData(brightness: Brightness.dark).textTheme,
+        .copyWith(
+      scaffoldBackgroundColor: Colors.white,
+      bottomNavigationBarTheme: BottomNavigationBarThemeData(
+        backgroundColor: colorScheme.surface,
       ),
     );
   }
-
-  static Color _getSeedColor(ThemeType type) {
-    switch (type) {
-      case ThemeType.green:
-        return Colors.green;
-      case ThemeType.orange:
-        return Colors.orange;
-      case ThemeType.blue:
-        return Colors.blue;
-      case ThemeType.violet:
-        return Colors.deepPurple;
-      case ThemeType.yellow:
-        return Colors.yellow;
-    }
-  }
 }

lib/data/repositories/auth_repository.dart

@@ -49,12 +49,6 @@ class AuthRepository {
         _tokenExpiryKey, token.expiresAt.toIso8601String());
   }
 
-Future<void> clearAuthTokens() async {
-    await _secureStorage.deleteAll();
-
-  }
-
-
   Future<AuthToken?> _getAuthToken() async {
     final accessToken = await _secureStorage.read(_accessTokenKey);
     final expiryString = await _secureStorage.read(_tokenExpiryKey);

lib/di/injection.dart

@@ -8,7 +8,6 @@ import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/api/services/user_service.dart';
 import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/features/auth/controllers/theme_cubit.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
 import '../api/services/auth_service.dart';
 import '../api/interceptors/auth_interceptor.dart';
 import '../data/repositories/auth_repository.dart';
@@ -21,7 +20,6 @@ Future<void> setupDependencies() async {
   //getIt.registerLazySingleton<ThemeController>(() => ThemeController());
   //getIt.registerLazySingleton<ThemeModeController>(() => ThemeModeController());
   getIt.registerSingleton<ThemeCubit>(ThemeCubit());
-  getIt.registerSingleton<ThemeModeCubit>(ThemeModeCubit());
 
   // Register Dio client
   getIt.registerSingleton<Dio>(_createDioClient());

lib/features/accounts/screens/account_info_screen.dart

@@ -30,9 +30,9 @@ class _AccountInfoScreen extends State<AccountInfoScreen> {
     int selectedIndex = widget.selectedIndex;
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)
+        title: Text(
-            .accountInfo
+          AppLocalizations.of(context).accountInfo,
-            .replaceFirst(RegExp('\n'), '')),
+        ),
       ),
       body: ListView(
         padding: const EdgeInsets.all(16.0),

lib/features/accounts/screens/account_statement_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:shimmer/shimmer.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -118,10 +119,31 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () => Navigator.pop(context),
+        ),
         title: Text(
           AppLocalizations.of(context).accountStatement,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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(12.0),
@@ -188,20 +210,19 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
               child: ElevatedButton(
                 onPressed: _loadTransactions,
                 style: ElevatedButton.styleFrom(
-                  backgroundColor:
+                  backgroundColor: Theme.of(context).primaryColor,
-                      Theme.of(context).colorScheme.primaryContainer,
                   padding: const EdgeInsets.symmetric(vertical: 16),
                 ),
                 child: Text(
                   AppLocalizations.of(context).search,
                   style: TextStyle(
-                    color: Theme.of(context).colorScheme.onPrimaryContainer,
+                    color: Theme.of(context).scaffoldBackgroundColor,
                     fontSize: 16,
                   ),
                 ),
               ),
             ),
-            const SizedBox(height: 15),
+            const SizedBox(height: 35),
             if (!_txLoading &&
                 _transactions.isNotEmpty &&
                 fromDate == null &&
@@ -213,7 +234,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                   style: TextStyle(
                     fontSize: 16,
                     fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    color: Colors.grey[700],
                   ),
                 ),
               ),
@@ -254,11 +275,10 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                   : _transactions.isEmpty
                       ? Center(
                           child: Text(
-                              AppLocalizations.of(context).noTransactions,
+                            AppLocalizations.of(context).noTransactions,
-                              style: TextStyle(
+                            style: TextStyle(
-                                fontSize: 16,
+                                fontSize: 16, color: Colors.grey[600]),
-                                color: Theme.of(context).colorScheme.onSurface,
+                          ),
-                              )),
                         )
                       : ListView.separated(
                           itemCount: _transactions.length,
@@ -269,9 +289,8 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                                 tx.type == 'CR'
                                     ? Symbols.call_received
                                     : Symbols.call_made,
-                                color: tx.type == 'CR'
+                                color:
-                                    ? Colors.green
+                                    tx.type == 'CR' ? Colors.green : Colors.red,
-                                    : Theme.of(context).colorScheme.error,
                               ),
                               title: Text(
                                 tx.date ?? '',
@@ -315,8 +334,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),
       decoration: BoxDecoration(
-        border:
+        border: Border.all(color: Colors.grey),
-            Border.all(color: Theme.of(context).colorScheme.onSurfaceVariant),
         borderRadius: BorderRadius.circular(6),
       ),
       child: Row(
@@ -326,9 +344,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
             date != null ? _formatDate(date) : label,
             style: TextStyle(
               fontSize: 16,
-              color: date != null
+              color: date != null ? Colors.black : Colors.grey,
-                  ? Theme.of(context).colorScheme.onSurface
-                  : Theme.of(context).colorScheme.onSurfaceVariant,
             ),
           ),
           const Icon(Icons.arrow_drop_down),

lib/features/auth/controllers/theme_mode_cubit.dart

@@ -1,23 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'theme_mode_state.dart';
-
-class ThemeModeCubit extends Cubit<ThemeModeState> {
-  ThemeModeCubit() : super(const ThemeModeState(mode: ThemeMode.system)) {
-    loadThemeMode();
-  }
-
-  Future<void> loadThemeMode() async {
-    final prefs = await SharedPreferences.getInstance();
-    final modeIndex = prefs.getInt('theme_mode') ?? 0; // default system
-    final mode = ThemeMode.values[modeIndex];
-    emit(ThemeModeState(mode: mode));
-  }
-
-  Future<void> changeThemeMode(ThemeMode mode) async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setInt('theme_mode', mode.index);
-    emit(ThemeModeState(mode: mode));
-  }
-}

lib/features/auth/controllers/theme_mode_state.dart

@@ -1,11 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-
-class ThemeModeState extends Equatable {
-  final ThemeMode mode;
-
-  const ThemeModeState({required this.mode});
-
-  @override
-  List<Object?> get props => [mode];
-}

lib/features/auth/controllers/theme_state.dart

@@ -1,4 +1,4 @@
-/*import 'package:equatable/equatable.dart';
+import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/config/theme_type.dart';
 import 'package:kmobile/config/themes.dart';
@@ -14,28 +14,4 @@ class ThemeState extends Equatable {
 
   @override
   List<Object?> get props => [themeType];
-}*/
+}
-
-
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-import 'package:kmobile/config/theme_type.dart';
-import 'package:kmobile/config/themes.dart';
-class ThemeState extends Equatable {
-  final ThemeType themeType;
-  const ThemeState({required this.themeType});
-
-    ThemeData getLightThemeData() {
-      return AppThemes.getLightTheme(themeType);
-    }
-
-    ThemeData getDarkThemeData() {
-      return AppThemes.getDarkTheme(themeType);
-    }
-
-    @override
-    List<Object?> get props => [themeType];
-  }
-
-
-

lib/features/auth/screens/login_screen.dart

@@ -120,11 +120,11 @@ class LoginScreenState extends State<LoginScreen>
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: OutlineInputBorder(
+                      enabledBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                        borderSide: BorderSide(color: Colors.black),
                       ),
-                      focusedBorder: OutlineInputBorder(
+                      focusedBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                        borderSide: BorderSide(color: Colors.black, width: 2),
                       ),
                     ),
                     keyboardType: TextInputType.number,
@@ -149,11 +149,11 @@ class LoginScreenState extends State<LoginScreen>
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: OutlineInputBorder(
+                      enabledBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                        borderSide: BorderSide(color: Colors.black),
                       ),
-                      focusedBorder: OutlineInputBorder(
+                      focusedBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                        borderSide: BorderSide(color: Colors.black, width: 2),
                       ),
                       suffixIcon: IconButton(
                         icon: Icon(
@@ -187,14 +187,14 @@ class LoginScreenState extends State<LoginScreen>
                         backgroundColor:
                             Theme.of(context).scaffoldBackgroundColor,
                         foregroundColor: Theme.of(context).primaryColorDark,
-                        side: BorderSide(color: Theme.of(context).colorScheme.outline, width: 1),
+                        side: const BorderSide(color: Colors.black, width: 1),
                         elevation: 0,
                       ),
                       child: state is AuthLoading
                           ? const CircularProgressIndicator()
                           : Text(
                               AppLocalizations.of(context).login,
-                              style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                              style: const TextStyle(fontSize: 16),
                             ),
                     ),
                   ),
@@ -225,11 +225,10 @@ class LoginScreenState extends State<LoginScreen>
                       style: OutlinedButton.styleFrom(
                         shape: const StadiumBorder(),
                         padding: const EdgeInsets.symmetric(vertical: 16),
-                        backgroundColor: Theme.of(context).colorScheme.primary,
+                        backgroundColor: Theme.of(context).primaryColorLight,
-                        foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                        foregroundColor: Colors.black,
                       ),
-                      child: Text(AppLocalizations.of(context).register,
+                      child: Text(AppLocalizations.of(context).register),
-                     style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),),
                     ),
                   ),
                 ],

lib/features/auth/screens/mpin_screen.dart

@@ -1,14 +1,12 @@
 import '../../../l10n/app_localizations.dart';
-import 'dart:math';
 
-// import 'dart:developer';
+import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:kmobile/app.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
-import 'package:flutter/services.dart';
 
 enum MPinMode { enter, set, confirm }
 
@@ -28,73 +26,22 @@ class MPinScreen extends StatefulWidget {
   State<MPinScreen> createState() => _MPinScreenState();
 }
 
-class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
+class _MPinScreenState extends State<MPinScreen> {
   List<String> mPin = [];
   String? errorText;
 
-  // Animation controllers
-  late final AnimationController _bounceController;
-  late final Animation<double> _bounceAnimation;
-  late final AnimationController _shakeController;
-  late final AnimationController _waveController;
-  late final Animation<double> _waveAnimation;
-
-  // State flags for animations
-  bool _isError = false;
-  bool _isSuccess = false;
-
   @override
   void initState() {
     super.initState();
-    // Bounce animation for single dot entry
-    _bounceController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 150),
-    );
-    _bounceAnimation = Tween<double>(begin: 1.0, end: 1.2).animate(
-      CurvedAnimation(
-        parent: _bounceController,
-        curve: Curves.elasticIn,
-        reverseCurve: Curves.elasticOut,
-      ),
-    )..addStatusListener((status) {
-        if (status == AnimationStatus.completed) {
-          _bounceController.reverse();
-        }
-      });
-
-    // Shake animation for error
-    _shakeController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 400),
-    );
-
-    // Wave animation for success
-    _waveController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 800),
-    );
-    _waveAnimation = Tween<double>(begin: 0, end: 1).animate(
-      CurvedAnimation(parent: _waveController, curve: Curves.easeInOut),
-    );
-
     if (widget.mode == MPinMode.enter) {
       _tryBiometricBeforePin();
     }
   }
 
-  @override
-  void dispose() {
-    _bounceController.dispose();
-    _shakeController.dispose();
-    _waveController.dispose();
-    super.dispose();
-  }
-
   Future<void> _tryBiometricBeforePin() async {
     final storage = getIt<SecureStorage>();
     final enabled = await storage.read('biometric_enabled');
-    // log('biometric_enabled: $enabled');
+    log('biometric_enabled: $enabled');
     if (enabled != null && enabled) {
       final auth = LocalAuthentication();
       if (await auth.canCheckBiometrics) {
@@ -115,13 +62,11 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   void addDigit(String digit) {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.length < 4) {
       setState(() {
         mPin.add(digit);
         errorText = null;
       });
-      _bounceController.forward(from: 0);
       if (mPin.length == 4) {
         _handleComplete();
       }
@@ -129,7 +74,6 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   void deleteDigit() {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.isNotEmpty) {
       setState(() {
         mPin.removeLast();
@@ -139,36 +83,19 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   Future<void> _handleComplete() async {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
-
     final pin = mPin.join();
     final storage = SecureStorage();
 
     switch (widget.mode) {
       case MPinMode.enter:
         final storedPin = await storage.read('mpin');
-        // log('storedPin: $storedPin');
+        log('storedPin: $storedPin');
         if (storedPin == int.tryParse(pin)) {
-          // Correct PIN
+          widget.onCompleted?.call(pin);
-          setState(() {
-            _isSuccess = true;
-            errorText = null;
-          });
-          await Future.delayed(const Duration(milliseconds: 100));
-          _waveController.forward(from: 0).whenComplete(() {
-            widget.onCompleted?.call(pin);
-          });
         } else {
-          // Incorrect PIN
           setState(() {
-            _isError = true;
             errorText = AppLocalizations.of(context).incorrectMPIN;
-          });
-          await _shakeController.forward(from: 0);
-          setState(() {
             mPin.clear();
-            _isError = false;
-            // Keep error text until next digit is entered
           });
         }
         break;
@@ -199,81 +126,28 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
           }
         } else {
           setState(() {
-            _isError = true;
             errorText = AppLocalizations.of(context).pinsDoNotMatch;
-          });
-          await _shakeController.forward(from: 0);
-          setState(() {
             mPin.clear();
-            _isError = false;
           });
         }
         break;
     }
   }
 
-  Widget buildMPinDots(BuildContext context) {
+  Widget buildMPinDots() {
-    return AnimatedBuilder(
+    return Row(
-      animation: Listenable.merge(
+      mainAxisAlignment: MainAxisAlignment.center,
-          [_bounceController, _shakeController, _waveController]),
+      children: List.generate(4, (index) {
-      builder: (context, child) {
+        return Container(
-        double shakeOffset = 0;
+          margin: const EdgeInsets.all(8),
-        if (_shakeController.isAnimating) {
+          width: 15,
-          // 4 cycles of sine wave for shake
+          height: 15,
-          shakeOffset = sin(_shakeController.value * 4 * pi) * 12;
+          decoration: BoxDecoration(
-        }
+            shape: BoxShape.circle,
-
+            color: index < mPin.length ? Colors.black : Colors.grey[400],
-        return Transform.translate(
-          offset: Offset(shakeOffset, 0),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: List.generate(4, (index) {
-              final isFilled = index < mPin.length;
-
-              // Bounce animation for single dot
-              final isAnimatingBounce =
-                  index == mPin.length - 1 && _bounceController.isAnimating;
-              double bounceScale =
-                  isAnimatingBounce ? _bounceAnimation.value : 1.0;
-
-              // Success wave animation
-              double waveScale = 1.0;
-              if (_isSuccess) {
-                final waveDelay = index * 0.15;
-                final waveValue =
-                    (_waveAnimation.value - waveDelay).clamp(0.0, 1.0);
-                // Grow and shrink
-                waveScale = 1.0 + sin(waveValue * pi) * 0.4;
-              }
-
-              // Determine dot color
-              Color dotColor;
-              if (_isError) {
-                dotColor = Theme.of(context).colorScheme.error;
-              } else if (_isSuccess) {
-                dotColor = Colors.green.shade600;
-              } else {
-                dotColor = isFilled
-                    ? Theme.of(context).colorScheme.onSurfaceVariant
-                    : Theme.of(context).colorScheme.surfaceContainerHighest;
-              }
-
-              return Transform.scale(
-                scale: bounceScale * waveScale,
-                child: Container(
-                  margin: const EdgeInsets.all(8),
-                  width: 25,
-                  height: 25,
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: dotColor,
-                  ),
-                ),
-              );
-            }),
           ),
         );
-      },
+      }),
     );
   }
 
@@ -291,10 +165,9 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: row.map((key) {
             return Padding(
-              padding: const EdgeInsets.all(1.0),
+              padding: const EdgeInsets.all(8.0),
               child: GestureDetector(
                 onTap: () {
-                  HapticFeedback.lightImpact();
                   if (key == '<') {
                     deleteDigit();
                   } else if (key == 'Enter') {
@@ -312,10 +185,11 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
                   }
                 },
                 child: Container(
-                  width: 80,
+                  width: 70,
-                  height: 80,
+                  height: 70,
-                  decoration: const BoxDecoration(
+                  decoration: BoxDecoration(
                     shape: BoxShape.circle,
+                    color: Colors.grey[200],
                   ),
                   alignment: Alignment.center,
                   child: key == 'Enter'
@@ -323,10 +197,10 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
                       : Text(
                           key == '<' ? '⌫' : key,
                           style: TextStyle(
-                            fontSize: 30,
+                            fontSize: 20,
                             color: key == 'Enter'
                                 ? Theme.of(context).primaryColor
-                                : Theme.of(context).colorScheme.onSurface,
+                                : Colors.black,
                           ),
                         ),
                 ),
@@ -355,7 +229,7 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
       body: SafeArea(
         child: Column(
           children: [
-            const SizedBox(height: 50),
+            const Spacer(),
             // Logo
             Image.asset('assets/images/logo.png', height: 100),
             const SizedBox(height: 20),
@@ -363,18 +237,19 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
               getTitle(),
               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
             ),
-            const Spacer(),
+            const SizedBox(height: 20),
-            buildMPinDots(context),
+            buildMPinDots(),
             if (errorText != null)
               Padding(
                 padding: const EdgeInsets.only(top: 8.0),
                 child: Text(
                   errorText!,
-                  style: TextStyle(color: Theme.of(context).colorScheme.error),
+                  style: const TextStyle(color: Colors.red),
                 ),
               ),
             const Spacer(),
             buildNumberPad(),
+            const Spacer(),
           ],
         ),
       ),

lib/features/auth/screens/splash_screen.dart

@@ -46,13 +46,13 @@ class _SplashScreenState extends State<SplashScreen> {
               ],
             ),
           ),
-          const Positioned(
+          Positioned(
             bottom: 40,
             left: 0,
             right: 0,
             child: Center(
               child: CircularProgressIndicator(
-                  color: Color(0xFFFFFFFF)),
+                  color: Theme.of(context).scaffoldBackgroundColor),
             ),
           ),
         ],

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -1,10 +1,11 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'beneficiary_result_page.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
@@ -219,10 +220,33 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).addBeneficiary,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundColor: Colors.grey[200],
+              radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
+            ),
+          ),
+        ],
       ),
       body: SafeArea(
         child: Form(
@@ -245,6 +269,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             // prefixIcon: Icon(Icons.person),
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                           obscureText: true,
                           keyboardType: TextInputType.number,
@@ -275,6 +311,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             // prefixIcon: Icon(Icons.person),
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                           keyboardType: TextInputType.number,
                           textInputAction: TextInputAction.next,
@@ -293,6 +341,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           },
                         ),
                         const SizedBox(height: 24),
+                        // 🔹 IFSC Code Field
                         TextFormField(
                           controller: ifscController,
                           maxLength: 11,
@@ -303,6 +352,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             labelText: AppLocalizations.of(context).ifscCode,
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                           textCapitalization: TextCapitalization.characters,
                           textInputAction: TextInputAction.next,
@@ -340,6 +401,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             labelText: AppLocalizations.of(context).bankName,
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor: Theme.of(context)
+                                .dialogBackgroundColor, // disabled color
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                         ),
                         const SizedBox(height: 24),
@@ -351,38 +424,19 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             labelText: AppLocalizations.of(context).branchName,
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor: Theme.of(context).dialogBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                         ),
-                        if (_isBeneficiaryValidated)
-                          Column(
-                            children: [
-                              const SizedBox(height: 24),
-                              TextFormField(
-                                controller: nameController,
-                                enabled: false,
-                                decoration: InputDecoration(
-                                  suffixIcon: _isBeneficiaryValidated
-                                      ? const Icon(
-                                          Symbols.verified,
-                                          size: 25,
-                                          fill: 1,
-                                        )
-                                      : null,
-                                  suffixIconColor:
-                                      Theme.of(context).colorScheme.primary,
-                                  labelText: AppLocalizations.of(context)
-                                      .beneficiaryName,
-                                  border: const OutlineInputBorder(),
-                                  isDense: true,
-                                ),
-                                textInputAction: TextInputAction.next,
-                                validator: (value) => value == null ||
-                                        value.isEmpty
-                                    ? AppLocalizations.of(context).nameRequired
-                                    : null,
-                              ),
-                            ],
-                          ),
                         const SizedBox(height: 24),
                         if (!_isBeneficiaryValidated)
                           Padding(
@@ -417,6 +471,30 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             ),
                           ),
                         //Beneficiary Name (Disabled)
+                        TextFormField(
+                          controller: nameController,
+                          enabled: false,
+                          decoration: InputDecoration(
+                            labelText:
+                                AppLocalizations.of(context).beneficiaryName,
+                            border: const OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor: Theme.of(context).dialogBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          textInputAction: TextInputAction.next,
+                          validator: (value) => value == null || value.isEmpty
+                              ? AppLocalizations.of(context).nameRequired
+                              : null,
+                        ),
+                        const SizedBox(height: 24),
                         // 🔹 Account Type Dropdown
                         DropdownButtonFormField<String>(
                           value: accountType,
@@ -424,6 +502,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             labelText: AppLocalizations.of(context).accountType,
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                           items: [
                             'Savings',
@@ -452,6 +542,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             prefixIcon: const Icon(Icons.phone),
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                           textInputAction: TextInputAction.done,
                           validator: (value) =>
@@ -466,22 +568,16 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                 ),
               ),
               Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
+                padding: const EdgeInsets.all(16.0),
                 child: SizedBox(
                   width: 250,
                   child: ElevatedButton(
                     onPressed: validateAndAddBeneficiary,
                     style: ElevatedButton.styleFrom(
-                        shape: const StadiumBorder(),
+                      shape: const StadiumBorder(),
-                        padding: const EdgeInsets.symmetric(vertical: 16),
+                      padding: const EdgeInsets.symmetric(vertical: 16),
-                        backgroundColor:
-                            Theme.of(context).colorScheme.primaryContainer,
-                        foregroundColor:
-                            Theme.of(context).colorScheme.onPrimaryContainer),
-                    child: Text(
-                      AppLocalizations.of(context).validateAndAdd,
-                      style: const TextStyle(fontSize: 16),
                     ),
+                    child: Text(AppLocalizations.of(context).validateAndAdd),
                   ),
                 ),
               ),

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -81,61 +81,59 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
       appBar: AppBar(
         title: Text(AppLocalizations.of(context).beneficiarydetails),
       ),
-      body: SafeArea(
+      body: Padding(
-        child: Padding(
+        padding: const EdgeInsets.all(16.0),
-          padding: const EdgeInsets.all(16.0),
+        child: Column(
-          child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
-            children: [
+            Row(
-              Row(
+              children: [
-                children: [
+                CircleAvatar(
-                  CircleAvatar(
+                  radius: 24,
-                    radius: 24,
+                  backgroundColor: Colors.transparent,
-                    backgroundColor: Colors.transparent,
+                  child: getBankLogo(beneficiary.bankName),
-                    child: getBankLogo(beneficiary.bankName, context),
+                ),
-                  ),
+                const SizedBox(width: 16),
-                  const SizedBox(width: 16),
+                Text(
-                  Text(
+                  beneficiary.name,
-                    beneficiary.name,
+                  style: const TextStyle(
-                    style: const TextStyle(
+                      fontSize: 20, fontWeight: FontWeight.bold),
-                        fontSize: 20, fontWeight: FontWeight.bold),
+                ),
-                  ),
+              ],
-                ],
+            ),
-              ),
+            const SizedBox(height: 24),
-              const SizedBox(height: 24),
+            _buildDetailRow('${AppLocalizations.of(context).bankName} ',
-              _buildDetailRow('${AppLocalizations.of(context).bankName} ',
+                beneficiary.bankName ?? 'N/A'),
-                  beneficiary.bankName ?? 'N/A'),
+            _buildDetailRow('${AppLocalizations.of(context).accountNumber} ',
-              _buildDetailRow('${AppLocalizations.of(context).accountNumber} ',
+                beneficiary.accountNo),
-                  beneficiary.accountNo),
+            _buildDetailRow('${AppLocalizations.of(context).accountType} ',
-              _buildDetailRow('${AppLocalizations.of(context).accountType} ',
+                beneficiary.accountType),
-                  beneficiary.accountType),
+            _buildDetailRow('${AppLocalizations.of(context).ifscCode} ',
-              _buildDetailRow('${AppLocalizations.of(context).ifscCode} ',
+                beneficiary.ifscCode),
-                  beneficiary.ifscCode),
+            _buildDetailRow('${AppLocalizations.of(context).branchName} ',
-              _buildDetailRow('${AppLocalizations.of(context).branchName} ',
+                beneficiary.branchName ?? 'N/A'),
-                  beneficiary.branchName ?? 'N/A'),
+            const Spacer(),
-              const Spacer(),
+            Row(
-              Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
-                children: [
+                // ElevatedButton.icon(
-                  // ElevatedButton.icon(
+                //   onPressed: () {
-                  //   onPressed: () {
+                //     // Set Transaction Limit for this beneficiary
-                  //     // Set Transaction Limit for this beneficiary
+                //   },
-                  //   },
+                //   icon: const Icon(Icons.currency_rupee),
-                  //   icon: const Icon(Icons.currency_rupee),
+                //   label: const Text('Set Limit'),
-                  //   label: const Text('Set Limit'),
+                // ),
-                  // ),
+                ElevatedButton.icon(
-                  ElevatedButton.icon(
+                  onPressed: () {
-                    onPressed: () {
+                    // Delete beneficiary option
-                      // Delete beneficiary option
+                    _showDeleteConfirmationDialog(context);
-                      _showDeleteConfirmationDialog(context);
+                  },
-                    },
+                  icon: const Icon(Icons.delete),
-                    icon: const Icon(Icons.delete),
+                  label: Text(AppLocalizations.of(context).delete),
-                    label: Text(AppLocalizations.of(context).delete),
+                ),
-                  ),
+              ],
-                ],
+            ),
-              ),
+          ],
-            ],
-          ),
         ),
       ),
     );

lib/features/beneficiaries/screens/beneficiary_result_page.dart

@@ -90,7 +90,7 @@ class _BeneficiaryResultPageState extends State<BeneficiaryResultPage> {
                 ),
                 child: Text(
                   AppLocalizations.of(context).done,
-                  style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer), // slightly bigger text
+                  style: const TextStyle(fontSize: 18), // slightly bigger text
                 ),
               ),
             ),

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -75,7 +75,7 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
           leading: CircleAvatar(
             radius: 24,
             backgroundColor: Colors.transparent,
-            child: getBankLogo(item.bankName, context),
+            child: getBankLogo(item.bankName),
           ),
           title: Text(item.name),
           subtitle: Column(
@@ -122,6 +122,8 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
               ),
             );
           },
+          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+          foregroundColor: Theme.of(context).primaryColor,
           elevation: 5,
           child: const Icon(Icons.add),
         ),

lib/features/card/screens/block_card_screen.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import '../../../l10n/app_localizations.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class BlockCardScreen extends StatefulWidget {
   const BlockCardScreen({super.key});
@@ -54,12 +56,33 @@ class _BlockCardScreen extends State<BlockCardScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).blockCard,
           style:
               const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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),

lib/features/card/screens/card_details_screen.dart

@@ -161,4 +161,4 @@ class CardTile extends StatelessWidget {
       ),
     );
   }
-}
+}

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_details_screen.dart';
 import 'package:kmobile/features/card/screens/card_pin_change_details_screen.dart';
@@ -20,8 +21,25 @@ class _CardManagementScreen extends State<CardManagementScreen> {
         automaticallyImplyLeading: false,
         title: Text(
           AppLocalizations.of(context).cardManagement,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundColor: Colors.grey[200],
+              radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
+            ),
+          ),
+        ],
       ),
       body: ListView(
         children: [
@@ -48,16 +66,16 @@ class _CardManagementScreen extends State<CardManagementScreen> {
             icon: Symbols.password_2,
             label: AppLocalizations.of(context).changeCardPin,
             onTap: () {
-              Navigator.push(
+              // Navigator.push(
-                context,
+              //   context,
-                MaterialPageRoute(
+              //   MaterialPageRoute(
-                  builder: (context) => const CardPinChangeDetailsScreen(),
+              //     builder: (context) => const CardPinChangeDetailsScreen(),
-                ),
+              //   ),
-              );
+              // );
             },
           ),
           const Divider(height: 1),
-          CardManagementTile(
+           CardManagementTile(
             icon: Symbols.payment_card,
             label: AppLocalizations.of(context).viewCardDeatils,
             onTap: () {
@@ -76,6 +94,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
   }
 }
 
+
 class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -1,6 +1,8 @@
 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';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinChangeDetailsScreen extends StatefulWidget {
@@ -44,12 +46,33 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).cardDetails,
           style:
               const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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),

lib/features/card/screens/card_pin_set_screen.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinSetScreen extends StatefulWidget {
@@ -44,12 +46,33 @@ class _CardPinSetScreen extends State<CardPinSetScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).cardPin,
           style:
               const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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),

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';
 import '../../../l10n/app_localizations.dart';
@@ -15,12 +16,33 @@ class _ChequeManagementScreen extends State<ChequeManagementScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).chequeManagement,
           style:
               const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundColor: Colors.grey[200],
+              radius: 20,
+              child: SvgPicture.asset(
+                'assets/images/avatar_male.svg',
+                width: 40,
+                height: 40,
+                fit: BoxFit.cover,
+              ),
+            ),
+          ),
+        ],
       ),
       body: ListView(
         children: [

lib/features/customer_info/screens/customer_info_screen.dart

@@ -19,9 +19,7 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          AppLocalizations.of(context)
+          AppLocalizations.of(context).customerInfo,
-              .customerInfo
-              .replaceFirst(RegExp('\n'), ''),
         ),
       ),
       body: SingleChildScrollView(

lib/features/dashboard/screens/dashboard_screen.dart

@@ -98,7 +98,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
   Widget _buildBalanceShimmer() {
     final theme = Theme.of(context);
     return Shimmer.fromColors(
-      baseColor: theme.colorScheme.primary,
+      baseColor: theme.primaryColor,
       highlightColor: theme.colorScheme.onPrimary,
       child: Container(
           width: 200, height: 42, color: theme.scaffoldBackgroundColor),
@@ -213,7 +213,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
           title: Text(
             AppLocalizations.of(context).kconnect,
             style: TextStyle(
-              color: theme.colorScheme.primary,
+              color: theme.primaryColor,
               fontWeight: FontWeight.w700,
             ),
           ),
@@ -275,7 +275,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           "${AppLocalizations.of(context).hi} $firstName!",
                           style: GoogleFonts.baumans().copyWith(
                             fontSize: 20,
-                            color: theme.colorScheme.primary,
+                            color: theme.primaryColor,
                             fontWeight: FontWeight.w700,
                           ),
                         ),
@@ -289,7 +289,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           vertical: 10,
                         ),
                         decoration: BoxDecoration(
-                          color: theme.colorScheme.primary,
+                          color: theme.primaryColor,
                           borderRadius: BorderRadius.circular(16),
                         ),
                         child: Column(
@@ -307,7 +307,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 ),
                                 DropdownButton<int>(
                                   value: selectedAccountIndex,
-                                  dropdownColor: theme.colorScheme.primary,
+                                  dropdownColor: theme.primaryColor,
                                   underline: const SizedBox(),
                                   icon: const Icon(Icons.keyboard_arrow_down),
                                   iconEnabledColor: theme.colorScheme.onPrimary,
@@ -602,7 +602,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               AppLocalizations.of(context).noTransactions,
                               style: TextStyle(
                                 fontSize: 16,
-                                color: Theme.of(context).colorScheme.outline,
+                                color: Colors.grey[600],
                               ),
                             ),
                           ),
@@ -663,8 +663,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
             icon,
             size: 30,
             color: disable
-                ? theme.colorScheme.onSurface.withOpacity(0.3)
+                ? theme.colorScheme.surfaceContainerHighest
-                : theme.colorScheme.primary,
+                : theme.primaryColor,
             grade: 200,
             weight: 700,
           ),

lib/features/dashboard/widgets/account_card.dart

@@ -13,7 +13,7 @@ class AccountCard extends StatelessWidget {
       width: 300,
       padding: const EdgeInsets.all(20),
       decoration: BoxDecoration(
-        color: Colors.white,
+        color: Theme.of(context).primaryColor,
         borderRadius: BorderRadius.circular(12),
         boxShadow: [
           BoxShadow(
@@ -33,7 +33,7 @@ class AccountCard extends StatelessWidget {
               Text(
                 account.accountType,
                 style: TextStyle(
-                  color: Theme.of(context).colorScheme.onPrimary,
+                  color: Theme.of(context).scaffoldBackgroundColor,
                   fontSize: 18,
                   fontWeight: FontWeight.bold,
                 ),
@@ -42,7 +42,7 @@ class AccountCard extends StatelessWidget {
                 account.accountType == 'Savings'
                     ? Icons.savings
                     : Icons.account_balance,
-                color: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context).scaffoldBackgroundColor,
               ),
             ],
           ),
@@ -50,13 +50,13 @@ class AccountCard extends StatelessWidget {
           Text(
             account.accountNumber,
             style: TextStyle(
-                color: Theme.of(context).colorScheme.onPrimary, fontSize: 16),
+                color: Theme.of(context).scaffoldBackgroundColor, fontSize: 16),
           ),
           const SizedBox(height: 30),
           Text(
             '${account.currency} ${account.balance.toStringAsFixed(2)}',
             style: TextStyle(
-              color: Theme.of(context).colorScheme.onPrimary,
+              color: Theme.of(context).scaffoldBackgroundColor,
               fontSize: 22,
               fontWeight: FontWeight.bold,
             ),
@@ -65,11 +65,10 @@ class AccountCard extends StatelessWidget {
           Text(
             AppLocalizations.of(context).availableBalance,
             style: TextStyle(
-                color: Theme.of(context).colorScheme.onPrimary, fontSize: 16),
+                color: Theme.of(context).scaffoldBackgroundColor, fontSize: 16),
           ),
         ],
       ),
     );
   }
 }
-

lib/features/enquiry/screens/enquiry_screen.dart

@@ -1,6 +1,8 @@
 // ignore_for_file: use_build_context_synchronously
 
 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';
 import '../../../l10n/app_localizations.dart';
 
@@ -34,13 +36,12 @@ class _EnquiryScreen extends State<EnquiryScreen> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(role,
+        Text(role, style: const TextStyle(color: Colors.grey)),
-            style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
         const SizedBox(height: 4),
         GestureDetector(
           onTap: () => _launchEmailAddress(email),
           child: Text(email,
-              style: TextStyle(color: Theme.of(context).colorScheme.primary)),
+              style: TextStyle(color: Theme.of(context).primaryColor)),
         ),
         const SizedBox(height: 4),
         GestureDetector(
@@ -57,8 +58,33 @@ class _EnquiryScreen extends State<EnquiryScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context).enquiry),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
+        title: Text(
+          AppLocalizations.of(context).enquiry,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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),
@@ -69,11 +95,12 @@ class _EnquiryScreen extends State<EnquiryScreen> {
             const SizedBox(height: 20),
             Text(
               AppLocalizations.of(context).writeToUs,
+              style: const TextStyle(color: Colors.grey),
             ),
             const SizedBox(height: 4),
             Text(
               "complaint@kccb.in",
-              style: TextStyle(color: Theme.of(context).colorScheme.primary),
+              style: TextStyle(color: Theme.of(context).primaryColor),
             ),
 
             const SizedBox(height: 20),
@@ -81,11 +108,11 @@ class _EnquiryScreen extends State<EnquiryScreen> {
               AppLocalizations.of(context).keyContacts,
               style: TextStyle(
                 fontSize: 17,
-                color: Theme.of(context).colorScheme.primary,
+                color: Theme.of(context).primaryColor,
               ),
               // horizontal line
             ),
-            Divider(color: Theme.of(context).colorScheme.outline),
+            Divider(color: Colors.grey[300]),
             const SizedBox(height: 16),
             _buildContactItem(
               AppLocalizations.of(context).chairman,

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -17,7 +17,6 @@ import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.da
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/data/models/transfer.dart';
-
 enum TransactionMode { neft, rtgs, imps }
 
 class FundTransferAmountScreen extends StatefulWidget {
@@ -39,7 +38,7 @@ class FundTransferAmountScreen extends StatefulWidget {
       _FundTransferAmountScreenState();
 }
 
-class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
+class  _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
   final _amountController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   TransactionMode _selectedMode = TransactionMode.neft;
@@ -296,145 +295,143 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       appBar: AppBar(
-        title: Text(loc.fundTransfer.replaceFirst(RegExp('\n'), '')),
+        title: Text(loc.fundTransfer),
       ),
-      body: SafeArea(
+      body: Padding(
-        child: Padding(
+        padding: const EdgeInsets.all(16.0),
-          padding: const EdgeInsets.all(16.0),
+        child: Form(
-          child: Form(
+          key: _formKey,
-            key: _formKey,
+          child: Column(
-            child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
-              children: [
+              // Debit Account (User)
-                // Debit Account (User)
+              Text(
-                Text(
+                loc.debitFrom,
-                  loc.debitFrom,
+                style: Theme.of(context).textTheme.titleSmall,
-                  style: Theme.of(context).textTheme.titleSmall,
+              ),
+              Card(
+                elevation: 0,
+                margin: const EdgeInsets.symmetric(vertical: 8.0),
+                child: ListTile(
+                  leading: Image.asset(
+                    'assets/images/logo.png',
+                    width: 40,
+                    height: 40,
+                  ),
+                  title: Text(widget.remitterName),
+                  subtitle: Text(widget.debitAccountNo),
                 ),
-                Card(
+              ),
-                  elevation: 0,
+              const SizedBox(height: 24),
-                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+
-                  child: ListTile(
+              // Credit Account (Beneficiary)
-                    leading: Image.asset(
+              Text(
-                      'assets/images/logo.png',
+                AppLocalizations.of(context).creditedTo,
-                      width: 40,
+                style: Theme.of(context).textTheme.titleSmall,
-                      height: 40,
+              ),
-                    ),
+              Card(
-                    title: Text(widget.remitterName),
+                elevation: 0,
-                    subtitle: Text(widget.debitAccountNo),
+                margin: const EdgeInsets.symmetric(vertical: 8.0),
+                child: ListTile(
+                  leading: getBankLogo(widget.creditBeneficiary.bankName),
+                  title: Text(widget.creditBeneficiary.name),
+                  subtitle: Text(widget.creditBeneficiary.accountNo),
+                ),
+              ),
+              const SizedBox(height: 24),
+
+              if (!widget.isOwnBank) ...[
+                // Transaction Mode Selection
+                Text(
+                  AppLocalizations.of(context).selectTransactionType,
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+                const SizedBox(height: 12),
+                Container(
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).cardColor,
+                    borderRadius: BorderRadius.circular(12),
+                    border: Border.all(color: Colors.grey.shade300),
+                  ),
+                  child: ToggleButtons(
+                    isSelected: [
+                      _selectedMode == TransactionMode.neft,
+                      _selectedMode == TransactionMode.rtgs,
+                      _selectedMode == TransactionMode.imps,
+                    ],
+                    onPressed: (index) {
+                      setState(() {
+                        _selectedMode = TransactionMode.values[index];
+                      });
+                    },
+                    borderRadius: BorderRadius.circular(10),
+                    selectedColor: Theme.of(context).colorScheme.onPrimary,
+                    fillColor: Theme.of(context).primaryColor,
+                    color: Theme.of(context).colorScheme.onSurface,
+                    borderColor: Colors.transparent,
+                    selectedBorderColor: Colors.transparent,
+                    splashColor:
+                        Theme.of(context).primaryColor,
+                    highlightColor:
+                        Theme.of(context).primaryColor,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 24.0, vertical: 12.0),
+                        child: Text(AppLocalizations.of(context).neft),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 24.0, vertical: 12.0),
+                        child: Text(AppLocalizations.of(context).rtgs),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 24.0, vertical: 12.0),
+                        child: Text(AppLocalizations.of(context).imps),
+                      ),
+                    ],
                   ),
                 ),
                 const SizedBox(height: 24),
-
-                // Credit Account (Beneficiary)
-                Text(
-                  AppLocalizations.of(context).creditedTo,
-                  style: Theme.of(context).textTheme.titleSmall,
-                ),
-                Card(
-                  elevation: 0,
-                  margin: const EdgeInsets.symmetric(vertical: 8.0),
-                  child: ListTile(
-                    leading:
-                        getBankLogo(widget.creditBeneficiary.bankName, context),
-                    title: Text(widget.creditBeneficiary.name),
-                    subtitle: Text(widget.creditBeneficiary.accountNo),
-                  ),
-                ),
-                const SizedBox(height: 24),
-
-                if (!widget.isOwnBank) ...[
-                  // Transaction Mode Selection
-                  Text(
-                    AppLocalizations.of(context).selectTransactionType,
-                    style: Theme.of(context).textTheme.titleMedium,
-                  ),
-                  const SizedBox(height: 12),
-                  Container(
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).cardColor,
-                      borderRadius: BorderRadius.circular(12),
-                      border: Border.all(color: Colors.grey.shade300),
-                    ),
-                    child: ToggleButtons(
-                      isSelected: [
-                        _selectedMode == TransactionMode.neft,
-                        _selectedMode == TransactionMode.rtgs,
-                        _selectedMode == TransactionMode.imps,
-                      ],
-                      onPressed: (index) {
-                        setState(() {
-                          _selectedMode = TransactionMode.values[index];
-                        });
-                      },
-                      borderRadius: BorderRadius.circular(10),
-                      selectedColor: Theme.of(context).colorScheme.onPrimary,
-                      fillColor: Theme.of(context).colorScheme.primary,
-                      color: Theme.of(context).colorScheme.onSurface,
-                      borderColor: Colors.transparent,
-                      selectedBorderColor: Colors.transparent,
-                      splashColor: Theme.of(context).colorScheme.primary,
-                      highlightColor: Theme.of(context).colorScheme.primary,
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.symmetric(
-                              horizontal: 24.0, vertical: 12.0),
-                          child: Text(AppLocalizations.of(context).neft),
-                        ),
-                        Padding(
-                          padding: const EdgeInsets.symmetric(
-                              horizontal: 24.0, vertical: 12.0),
-                          child: Text(AppLocalizations.of(context).rtgs),
-                        ),
-                        Padding(
-                          padding: const EdgeInsets.symmetric(
-                              horizontal: 24.0, vertical: 12.0),
-                          child: Text(AppLocalizations.of(context).imps),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 24),
-                ],
-                // Amount
-                TextFormField(
-                  controller: _amountController,
-                  keyboardType: TextInputType.number,
-                  decoration: InputDecoration(
-                    labelText: loc.amount,
-                    border: const OutlineInputBorder(),
-                    prefixIcon: const Icon(Icons.currency_rupee),
-                  ),
-                  validator: (value) {
-                    if (value == null || value.isEmpty) {
-                      return loc.amountRequired;
-                    }
-                    if (double.tryParse(value) == null ||
-                        double.parse(value) <= 0) {
-                      return loc.validAmount;
-                    }
-                    return null;
-                  },
-                ),
-                const Spacer(),
-
-                // Proceed Button
-                SizedBox(
-                  width: double.infinity,
-                  child: ElevatedButton(
-                    onPressed: _onProceed,
-                    style: ElevatedButton.styleFrom(
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                    ),
-                    child: Text(AppLocalizations.of(context).proceed),
-                  ),
-                ),
-                const SizedBox(height: 10),
               ],
-            ),
+              // Amount
+              TextFormField(
+                controller: _amountController,
+                keyboardType: TextInputType.number,
+                decoration: InputDecoration(
+                  labelText: loc.amount,
+                  border: const OutlineInputBorder(),
+                  prefixIcon: const Icon(Icons.currency_rupee),
+                ),
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return loc.amountRequired;
+                  }
+                  if (double.tryParse(value) == null ||
+                      double.parse(value) <= 0) {
+                    return loc.validAmount;
+                  }
+                  return null;
+                },
+              ),
+              const Spacer(),
+
+              // Proceed Button
+              SizedBox(
+                width: double.infinity,
+                child: ElevatedButton(
+                  onPressed: _onProceed,
+                  style: ElevatedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(vertical: 16),
+                  ),
+                  child: Text(AppLocalizations.of(context).proceed),
+                ),
+              ),
+            ],
           ),
         ),
       ),
     );
   }
-}
+}

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -86,7 +86,7 @@ class _FundTransferBeneficiaryScreenState
           leading: CircleAvatar(
             radius: 24,
             backgroundColor: Colors.transparent,
-            child: getBankLogo(beneficiary.bankName, context),
+            child: getBankLogo(beneficiary.bankName),
           ),
           title: Text(beneficiary.name),
           subtitle: Column(

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -17,9 +17,7 @@ class FundTransferScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)
+        title: Text(AppLocalizations.of(context).fundTransfer),
-            .fundTransfer
-            .replaceFirst(RegExp('\n'), '')),
       ),
       body: ListView(
         children: [

lib/features/fund_transfer/screens/transaction_pin_screen.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:kmobile/api/services/auth_service.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/fund_transfer/screens/tpin_prompt_screen.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 import '../../../l10n/app_localizations.dart';
 
@@ -15,40 +15,15 @@ class TransactionPinScreen extends StatefulWidget {
   State<TransactionPinScreen> createState() => _TransactionPinScreenState();
 }
 
-class _TransactionPinScreenState extends State<TransactionPinScreen>
+class _TransactionPinScreenState extends State<TransactionPinScreen> {
-    with SingleTickerProviderStateMixin {
   final List<String> _pin = [];
   bool _loading = true;
   bool _isSubmitting = false;
 
-  late final AnimationController _bounceController;
-  late final Animation<double> _bounceAnimation;
-
   @override
   void initState() {
     super.initState();
     _checkIfTpinIsSet();
-
-    _bounceController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 150),
-    );
-    _bounceAnimation = Tween<double>(begin: 1.0, end: 1.1).animate(
-      CurvedAnimation(
-          parent: _bounceController,
-          curve: Curves.elasticIn,
-          reverseCurve: Curves.elasticOut),
-    )..addStatusListener((status) {
-        if (status == AnimationStatus.completed) {
-          _bounceController.reverse();
-        }
-      });
-  }
-
-  @override
-  void dispose() {
-    _bounceController.dispose();
-    super.dispose();
   }
 
   Future<void> _checkIfTpinIsSet() async {
@@ -83,7 +58,6 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
         if (_pin.isNotEmpty) _pin.removeLast();
       } else if (_pin.length < 6) {
         _pin.add(value);
-        _bounceController.forward(from: 0);
       }
     });
   }
@@ -110,46 +84,29 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
   }
 
   Widget _buildPinIndicators() {
-    return AnimatedBuilder(
+    return Row(
-        animation: _bounceAnimation,
+      mainAxisAlignment: MainAxisAlignment.center,
-        builder: (context, child) {
+      children: List.generate(6, (index) {
-          return Row(
+        return Container(
-            mainAxisAlignment: MainAxisAlignment.center,
+          margin: const EdgeInsets.symmetric(horizontal: 8),
-            children: List.generate(6, (index) {
+          width: 20,
-              final isAnimating =
+          height: 20,
-                  index == _pin.length - 1 && _bounceController.isAnimating;
+          decoration: BoxDecoration(
-              return Transform.scale(
+            shape: BoxShape.circle,
-                scale: isAnimating ? _bounceAnimation.value : 1.0,
+            border: Border.all(color: Theme.of(context).primaryColor, width: 2),
-                child: Container(
+            color: index < _pin.length
-                  margin: const EdgeInsets.symmetric(horizontal: 8),
+                ? Theme.of(context).primaryColor
-                  width: 30,
+                : Colors.transparent,
-                  height: 30,
+          ),
-                  decoration: BoxDecoration(
+        );
-                      shape: BoxShape.circle,
+      }),
-                      color: index < _pin.length
+    );
-                          ? Theme.of(context).colorScheme.onSurfaceVariant
-                          : Theme.of(context)
-                              .colorScheme
-                              .surfaceContainerHighest),
-                ),
-              );
-            }),
-          );
-        });
   }
 
   Widget _buildKey(String label, {IconData? icon}) {
     return Expanded(
       child: InkWell(
-        onTap: () {
+        onTap: () => label == 'done' ? _submitPin() : _onKeyPressed(label),
-          HapticFeedback.lightImpact();
-          if (label == 'done') {
-            _submitPin();
-          } else {
-            _onKeyPressed(label);
-          }
-        },
-        borderRadius: BorderRadius.circular(48),
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 20),
           child: Center(
@@ -186,30 +143,37 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context).tpin),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
+        title: Text(
+          AppLocalizations.of(context).tpin,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
       ),
       body: _loading
           ? const Center(child: CircularProgressIndicator())
-          : SafeArea(
+          : Padding(
-              child: Padding(
+              padding: const EdgeInsets.only(bottom: 20.0),
-                padding: const EdgeInsets.only(bottom: 20.0),
+              child: Column(
-                child: Column(
+                children: [
-                  children: [
+                  const Spacer(),
-                    const Spacer(),
+                  Text(
-                    Text(
+                    AppLocalizations.of(context).enterTpin,
-                      AppLocalizations.of(context).enterTpin,
+                    style: const TextStyle(fontSize: 18),
-                      style: const TextStyle(fontSize: 18),
+                  ),
-                    ),
+                  const SizedBox(height: 20),
-                    const SizedBox(height: 50),
+                  _buildPinIndicators(),
-                    _buildPinIndicators(),
+                  const Spacer(),
-                    const Spacer(),
+                  _buildKeypad(),
-                    _buildKeypad(),
+                ],
-                  ],
-                ),
               ),
             ),
     );
   }
 }
-

lib/features/fund_transfer/screens/transaction_success_screen.dart

@@ -67,13 +67,13 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                   const SizedBox(height: 6),
                   Text(
                     "On $transactionDate",
-                    style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6)),
+                    style: const TextStyle(fontSize: 14, color: Colors.black54),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),
                   Text(
                     "${AppLocalizations.of(context).toAccountNumber}: $creditAccount",
-                     style: TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8)),
+                    style: const TextStyle(fontSize: 12, color: Colors.black87),
                     textAlign: TextAlign.center,
                   ),
                 ],
@@ -91,15 +91,15 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                       child: OutlinedButton.icon(
                         onPressed: _shareScreenshot,
                         icon: const Icon(Icons.share, size: 18),
-                        label: Text(AppLocalizations.of(context).share,
+                        label: Text(AppLocalizations.of(context).share),
-                        style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
-                        ),
                         style: ElevatedButton.styleFrom(
                           shape: const StadiumBorder(),
                           padding: const EdgeInsets.symmetric(vertical: 16),
-                          backgroundColor: Theme.of(context).primaryColorDark,
+                          backgroundColor:
-                          foregroundColor:
                               Theme.of(context).scaffoldBackgroundColor,
+                          foregroundColor: Theme.of(context).primaryColorLight,
+                          side: const BorderSide(color: Colors.black, width: 1),
+                          elevation: 0,
                         ),
                       ),
                     ),

lib/features/profile/preferences/logout_dialog.dart

@@ -1,23 +0,0 @@
-import 'package:flutter/material.dart';
-
-class LogoutDialog extends StatelessWidget {
-  const LogoutDialog({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text("Logout"),
-      content: const Text("Are you sure you want to logout?"),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context, false), // dismiss
-          child: const Text("No"),
-        ),
-        TextButton(
-          onPressed: () => Navigator.pop(context, true), // confirm
-          child: const Text("Yes"),
-        ),
-      ],
-    );
-  }
-}

lib/features/profile/preferences/preference_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/features/profile/preferences/theme_mode_dialog.dart';
 import 'language_dialog.dart';
 import 'color_theme_dialog.dart';
 import '../../../l10n/app_localizations.dart';
@@ -29,7 +28,8 @@ class PreferenceScreen extends StatelessWidget {
                 onTap: () {
                   showDialog(
                     context: context,
-                    builder: (_) => const LanguageDialog(),
+                    builder: (_) =>
+                        const LanguageDialog(), // your custom language dialog
                   );
                 },
               ),
@@ -37,14 +37,19 @@ class PreferenceScreen extends StatelessWidget {
               ListTile(
                 leading: const Icon(Icons.brightness_6),
                 title: Text(AppLocalizations.of(context).themeMode),
-                onTap: () {
+                enabled: false,
-                  showThemeModeDialog(context);
+                //trailing: Switch(
-                },
+                // value: state.isDarkMode,
+                // onChanged: (val) {
+                //   context.read<ThemeCubit>().toggleDarkMode(val);
+                // },
+                //),
               ),
               //Color_Theme_Selection
               ListTile(
                   leading: const Icon(Icons.color_lens),
                   title: Text(AppLocalizations.of(context).themeColor),
+                  //enabled: false,
                   onTap: () {
                     showDialog(
                       context: context,

lib/features/profile/preferences/theme_mode_dialog.dart

@@ -1,33 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
-
-Future<void> showThemeModeDialog(BuildContext context) async {
-  final cubit = context.read<ThemeModeCubit>();
-  final currentMode = context.read<ThemeModeCubit>().state.mode;
-
-  await showDialog(
-    context: context,
-    builder: (context) {
-      return AlertDialog(
-        title: const Text("Select Theme Mode"),
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: ThemeMode.values.map((mode) {
-            return RadioListTile<ThemeMode>(
-              title: Text(mode.toString().split('.').last.toUpperCase()),
-              value: mode,
-              groupValue: currentMode,
-              onChanged: (value) {
-                if (value != null) {
-                  cubit.changeThemeMode(value);
-                  Navigator.pop(context);
-                }
-              },
-            );
-          }).toList(),
-        ),
-      );
-    },
-  );
-}

lib/features/profile/profile_screen.dart

@@ -1,23 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/data/repositories/auth_repository.dart';
-import 'package:kmobile/features/profile/preferences/logout_dialog.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
 
 class ProfileScreen extends StatelessWidget {
   const ProfileScreen({super.key});
-  
-
-    Future<void> _handleLogout(BuildContext context) async {
-    final auth = getIt<AuthRepository>();
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.clear(); // clear saved session/token
-    await auth.clearAuthTokens();
-    // Navigate to login and remove all previous routes
-    Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -31,7 +17,7 @@ class ProfileScreen extends StatelessWidget {
         children: [
           ListTile(
             leading: const Icon(Icons.settings),
-            title: Text(loc.preferences), 
+            title: Text(loc.preferences), // Localized "Preferences"
             onTap: () {
               Navigator.push(
                 context,
@@ -41,20 +27,6 @@ class ProfileScreen extends StatelessWidget {
             },
           ),
           // You can add more profile options here later
-          ListTile(
-            leading: const Icon(Icons.logout),
-            title: const Text("Logout"), 
-            onTap: () async {
-              final shouldLogout = await showDialog<bool>(
-                context: context,
-                builder: (_) => const LogoutDialog(),
-              );
-
-              if (shouldLogout == true) {
-                await _handleLogout(context);
-              }
-            },
-          ),
         ],
       ),
     );

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -13,7 +13,9 @@ import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
 import '../../../l10n/app_localizations.dart';
 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';
 import '../../../../di/injection.dart';
 import '../../../../api/services/beneficiary_service.dart';
 
@@ -373,10 +375,33 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).quickPayOutsideBank,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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(12),
@@ -410,13 +435,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 controller: accountNumberController,
@@ -448,13 +471,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 keyboardType: TextInputType.number,
@@ -485,14 +506,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
+                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black),
-                              color: Theme.of(context).colorScheme.outline),
                         ),
-                        focusedBorder: OutlineInputBorder(
+                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
                         ),
                       ),
                       controller: ifscController,
@@ -535,14 +553,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
+                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black),
-                              color: Theme.of(context).colorScheme.outline),
                         ),
-                        focusedBorder: OutlineInputBorder(
+                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
                         ),
                       ),
                       items: [
@@ -570,13 +585,14 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).dialogBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
                     borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                      color: Colors.black,
+                      width: 2,
+                    ),
                   ),
                 ),
               ),
@@ -590,13 +606,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).dialogBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
                     borderSide: BorderSide(
-                      color: Theme.of(context).colorScheme.primary,
+                      color: Colors.black,
                       width: 2,
                     ),
                   ),
@@ -639,8 +654,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   padding: const EdgeInsets.only(bottom: 24.0),
                   child: Text(
                     _validationError!,
-                    style:
+                    style: const TextStyle(color: Colors.red),
-                        TextStyle(color: Theme.of(context).colorScheme.error),
                   ),
                 ),
               TextFormField(
@@ -652,13 +666,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).dialogBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 validator: (value) {
@@ -682,14 +694,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
+                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black),
-                              color: Theme.of(context).colorScheme.outline),
                         ),
-                        focusedBorder: OutlineInputBorder(
+                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
                         ),
                       ),
                       textInputAction: TextInputAction.next,
@@ -707,14 +716,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
+                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black),
-                              color: Theme.of(context).colorScheme.outline),
                         ),
-                        focusedBorder: OutlineInputBorder(
+                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
                         ),
                       ),
                       controller: amountController,
@@ -751,7 +757,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 child: SwipeButton.expand(
                   thumb: Icon(Icons.arrow_forward,
                       color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
+                  activeThumbColor: Theme.of(context).primaryColor,
                   activeTrackColor:
                       Theme.of(context).colorScheme.secondary.withAlpha(100),
                   borderRadius: BorderRadius.circular(30),
@@ -787,12 +793,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 padding: const EdgeInsets.symmetric(vertical: 5),
                 decoration: BoxDecoration(
                   color: isSelected
-                      ? Theme.of(context).colorScheme.primary
+                      ? Theme.of(context).primaryColor
                       : Theme.of(context).scaffoldBackgroundColor,
                   borderRadius: BorderRadius.circular(5),
                   border: Border.all(
                     color: isSelected
-                        ? Theme.of(context).colorScheme.primary
+                        ? Theme.of(context).primaryColor
                         : Theme.of(context).scaffoldBackgroundColor,
                     width: isSelected ? 0 : 1.2,
                   ),
@@ -800,8 +806,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 alignment: Alignment.center,
                 child: Text(
                   transactionModes(context)[index],
-                  style:
+                  style: const TextStyle(color: Colors.black),
-                      TextStyle(color: Theme.of(context).colorScheme.onSurface),
                 ),
               ),
             ),

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -1,11 +1,13 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:flutter_swipe_button/flutter_swipe_button.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/data/models/transfer.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 import '../../fund_transfer/screens/transaction_pin_screen.dart';
 
@@ -88,13 +90,33 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).quickPayOwnBank,
-          style: TextStyle(
+          style:
-              color: Theme.of(context).colorScheme.onSurface,
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
-              fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              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),
@@ -125,13 +147,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 controller: accountNumberController,
@@ -157,13 +177,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 keyboardType: TextInputType.number,
@@ -243,13 +261,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 value: _selectedAccountType,
@@ -283,13 +299,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
+                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black),
-                        color: Theme.of(context).colorScheme.outline),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
-                        color: Theme.of(context).colorScheme.primary, width: 2),
                   ),
                 ),
                 controller: amountController,
@@ -312,7 +326,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                 child: SwipeButton.expand(
                   thumb: Icon(Icons.arrow_forward,
                       color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
+                  activeThumbColor: Theme.of(context).primaryColor,
                   activeTrackColor: Theme.of(
                     context,
                   ).colorScheme.secondary.withAlpha(100),
@@ -386,12 +400,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
         isDense: true,
         filled: true,
         fillColor: Theme.of(context).dialogBackgroundColor,
-        enabledBorder: OutlineInputBorder(
+        enabledBorder: const OutlineInputBorder(
-          borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+          borderSide: BorderSide(color: Colors.black),
         ),
-        focusedBorder: OutlineInputBorder(
+        focusedBorder: const OutlineInputBorder(
-          borderSide: BorderSide(
+          borderSide: BorderSide(color: Colors.black, width: 2),
-              color: Theme.of(context).colorScheme.primary, width: 2),
         ),
       ),
     );

lib/features/security/security_error_screen.dart

@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:lottie/lottie.dart';
-
-class SecurityErrorScreen extends StatelessWidget {
-  final String message;
-
-  const SecurityErrorScreen({Key? key, required this.message}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Padding(
-        padding: const EdgeInsets.all(20.0),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Lottie.asset('assets/animations/error.json', height: 200),
-            const SizedBox(height: 20),
-            Text(
-              message,
-              textAlign: TextAlign.center,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
-            ),
-            const SizedBox(height: 40),
-            ElevatedButton(
-              onPressed: () => SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
-              child: const Text('Okay'),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/features/service/screens/service_screen.dart

@@ -20,8 +20,34 @@ class _ServiceScreen extends State<ServiceScreen> {
         automaticallyImplyLeading: false,
         title: Text(
           AppLocalizations.of(context).services,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          // IconButton(
+          //   icon: const Icon(Icons.notifications_outlined),
+          //   onPressed: () {
+          //     // Navigate to notifications
+          //   },
+          // ),
+          Padding(
+            padding: const EdgeInsets.only(right: 10.0),
+            child: InkWell(
+              borderRadius: BorderRadius.circular(20),
+              onTap: () {
+                // Navigator.push(context, MaterialPageRoute(
+                //     builder: (context) => const CustomerInfoScreen()));
+              },
+              child: const CircleAvatar(
+                backgroundImage: AssetImage(
+                  'assets/images/avatar.jpg',
+                ), // Replace with your image
+                radius: 20,
+              ),
+            ),
+          ),
+        ],
       ),
       body: ListView(
         children: [

lib/l10n/app_en.arb

@@ -109,8 +109,9 @@
 "gmNorth": "General Manager (North)",
 "enquiry": "Enquiry",
 "fundTransferBeneficiary": "Fund Transfer - Beneficiary",
+"fundTransfer": "Fund Transfer",
 "enterAmount": "Enter Amount",
-"accountInfo": "Account \n Info",
+"accountInfo": "Account Info",
 "customerNumber": "Customer Number",
 "productName": "Product Name",
 "accountStatus": "Account Status",

lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:kmobile/features/security/security_error_screen.dart';
+import 'package:jailbreak_root_detection/jailbreak_root_detection.dart';
-import 'package:kmobile/security/security_service.dart';
+import 'package:kmobile/rooted_screen.dart';
 import 'di/injection.dart';
 import 'app.dart';
 
@@ -14,16 +14,19 @@ void main() async {
     DeviceOrientation.portraitDown,
   ]);
 
-  // Check for device compromise
-  final compromisedMessage = await SecurityService.deviceCompromisedMessage;
-  // if (compromisedMessage != null) {
-  //   runApp(MaterialApp(
-  //     home: SecurityErrorScreen(message: compromisedMessage),
-  //   ));
-  //   return;
-  // }
-
   // Initialize dependencies
   await setupDependencies();
+
+  final isJailBroken = await JailbreakRootDetection.instance.isJailBroken;
+final isRealDevice = await JailbreakRootDetection.instance.isRealDevice;
+  if(isJailBroken || !isRealDevice){
+    runApp(const MaterialApp(
+      home: RootedScreen(),
+      debugShowCheckedModeBanner: false,
+    )
+    );
+  }
+  else{
   runApp(const KMobile());
+  }
 }

lib/rooted_screen.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+
+class RootedScreen extends StatelessWidget {
+  const RootedScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24.0),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const Icon(
+                Icons.warning_amber_rounded,
+                color: Colors.red,
+                size: 80,
+              ),
+              const SizedBox(height: 20),
+              const Text(
+                "Rooted Device Detected",
+                style: TextStyle(
+                  color: Colors.red,
+                  fontSize: 22,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 15),
+              const Text(
+                "For security reasons, this app cannot run on rooted devices.",
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Colors.white70,
+                  fontSize: 16,
+                ),
+              ),
+              const SizedBox(height: 30),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.red,
+                  foregroundColor: Colors.white,
+                ),
+                onPressed: () {
+                  // Optionally close the app
+                },
+                child: const Text("Exit"),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/security/security_service.dart

@@ -1,31 +0,0 @@
-import 'dart:io';
-
-import 'package:jailbreak_root_detection/jailbreak_root_detection.dart';
-
-class SecurityService {
-  static Future<String?> get deviceCompromisedMessage async {
-    final isNotTrust = await JailbreakRootDetection.instance.isNotTrust;
-    if (isNotTrust) {
-      return 'Your device is rooted or jailbroken. For security reasons, you cannot access our services on a compromised device.';
-    }
-
-    final isRealDevice = await JailbreakRootDetection.instance.isRealDevice;
-    if (!isRealDevice) {
-      return 'Emulators are not allowed to access our services. Please use a real device.';
-    }
-
-    if (Platform.isAndroid) {
-      try {
-        final isOnExternalStorage =
-            await JailbreakRootDetection.instance.isOnExternalStorage;
-        if (isOnExternalStorage) {
-          return 'The application cannot be run from external storage.';
-        }
-      } catch (e) {
-        // Ignore
-      }
-    }
-
-    return null;
-  }
-}

lib/widgets/bank_logos.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-Widget getBankLogo(String? bankName, BuildContext context) {
+Widget getBankLogo(String? bankName) {
   if (bankName != null && bankName.toLowerCase().contains('state bank of')) {
     return Image.asset(
       'assets/images/sbi_logo.png',
@@ -72,10 +72,10 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       height: 40,
     );
   } else {
-    return Icon(
+    return const Icon(
       Icons.account_balance,
       size: 40,
-      color: Theme.of(context).colorScheme.outline,
+      color: Colors.grey,
     );
   }
 }

pubspec.yaml

@@ -36,7 +36,6 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  jailbreak_root_detection: ^1.1.6
   equatable: ^2.0.7
   dio: ^5.8.0+1
   flutter_secure_storage: ^9.2.4
@@ -60,6 +59,8 @@ dependencies:
   lottie: ^2.6.0
   share_plus: ^7.2.1
   confetti: ^0.7.0
+  jailbreak_root_detection: "^1.1.6"
+