md.asif5/kmobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Theme Mode #3

Browse Source
This commit is contained in:
Nilanjan Chakrabarti
2025-09-03 17:39:57 +05:30
parent 52534f9210
commit 57439f2acb
8 changed files with 132 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/app.dart
View File

@@ -82,31 +82,6 @@ class _KMobileState extends State<KMobile> {
BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()), BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()),
BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()), BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()),
], ],
// child: BlocBuilder<ThemeCubit, ThemeState>(
// builder: (context, themeState) {
// return MaterialApp(
// debugShowCheckedModeBanner: false,
// locale: _locale ?? const Locale('en'),
// supportedLocales: const [
// Locale('en'),
// Locale('hi'),
// ],
// localizationsDelegates: const [
// AppLocalizations.delegate,
// GlobalMaterialLocalizations.delegate,
// GlobalWidgetsLocalizations.delegate,
// GlobalCupertinoLocalizations.delegate,
// ],
// title: 'kMobile',
// theme: themeState.getThemeData(),
// //darkTheme: themeState.getThemeData(),
// themeMode: ThemeMode.light,
// onGenerateRoute: AppRoutes.generateRoute,
// initialRoute: AppRoutes.splash,
// home: showSplash ? const SplashScreen() : const AuthGate(),
// );
// },
// ),
child: BlocBuilder<ThemeCubit, ThemeState>( child: BlocBuilder<ThemeCubit, ThemeState>(
builder: (context, themeState) { builder: (context, themeState) {
return BlocBuilder<ThemeModeCubit, ThemeModeState>( return BlocBuilder<ThemeModeCubit, ThemeModeState>(
@@ -370,7 +345,7 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
type: BottomNavigationBarType.fixed, type: BottomNavigationBarType.fixed,
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: Theme.of(context).scaffoldBackgroundColor,
selectedItemColor: Theme.of(context).primaryColor, selectedItemColor: Theme.of(context).primaryColor,
unselectedItemColor: Colors.black54, unselectedItemColor: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
onTap: (index) { onTap: (index) {
setState(() { setState(() {
_selectedIndex = index; _selectedIndex = index;

81
lib/config/themes.dart
View File

@@ -39,40 +39,83 @@ class AppThemes {
}*/ }*/
import 'dart:developer';
import 'package:flutter/material.dart';import 'theme_type.dart'; import 'package:flutter/material.dart';import 'theme_type.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
class AppThemes { class AppThemes {
static ThemeData getLightTheme(ThemeType type) { static ThemeData getLightTheme(ThemeType type) {
print('inside get light theme');
final Color seedColor = _getSeedColor(type); final Color seedColor = _getSeedColor(type);
final colorScheme = ColorScheme.fromSeed( final colorScheme = ColorScheme.fromSeed(
seedColor: seedColor, seedColor: seedColor,
brightness: Brightness.light, brightness: Brightness.light,
); );
print(seedColor.toString());
return ThemeData.from( return ThemeData.from(
colorScheme: colorScheme, colorScheme: colorScheme,
useMaterial3: true, useMaterial3: true,
textTheme: GoogleFonts.rubikTextTheme(), textTheme: GoogleFonts.rubikTextTheme(),
).copyWith(
scaffoldBackgroundColor: Colors.white,
bottomNavigationBarTheme: BottomNavigationBarThemeData(
backgroundColor: colorScheme.surface,
),
); );
// .copyWith(
// scaffoldBackgroundColor: Colors.white,
// bottomNavigationBarTheme: BottomNavigationBarThemeData(
// backgroundColor: colorScheme.surface,
// ),
// );
} }
static ThemeData getDarkTheme(ThemeType type) { static ThemeData getDarkTheme(ThemeType type) {
final Color seedColor = _getSeedColor(type); print('inside get dark theme');
final colorScheme = ColorScheme.fromSeed( final Color seedColor = _getSeedColor(type);
seedColor: seedColor, log(seedColor.toString());
brightness: Brightness.dark, // Use dark brightness final colorScheme = ColorScheme.fromSeed(
); seedColor: seedColor,
return ThemeData.from( brightness: Brightness.dark,
colorScheme: colorScheme, // Define custom background and surface colors for better contrast
useMaterial3: true, // background: const Color(0xFF121212), // A common dark theme background c
textTheme: GoogleFonts.rubikTextTheme( // surface: const Color(0xFF1E1E1E), // A slightly lighter surface color
ThemeData(brightness: Brightness.dark).textTheme, );
),
); return ThemeData.from(
} colorScheme: colorScheme,
useMaterial3: true,
textTheme: GoogleFonts.rubikTextTheme(
ThemeData(brightness: Brightness.dark).textTheme,
),
);
// .copyWith(
// Explicitly set scaffold background color
// scaffoldBackgroundColor: colorScheme.background,
// // Customize card theme for dark mode
// cardTheme: CardTheme(
// elevation: 2,
// color: colorScheme.surface,
// surfaceTintColor: colorScheme.surface,
// ),
// // Customize text input fields
// inputDecorationTheme: InputDecorationTheme(
// filled: true,
// fillColor: colorScheme.surface,
// border: OutlineInputBorder(
// borderRadius: BorderRadius.circular(8),
// borderSide: BorderSide.none,
// ),
// focusedBorder: OutlineInputBorder(
// borderRadius: BorderRadius.circular(8),
// borderSide: BorderSide(color: colorScheme.primary),
// ),
// ),
// Ensure icons have a contrasting color
// iconTheme: IconThemeData(color: colorScheme.onSurface),
// Adjust bottom navigation bar
// bottomNavigationBarTheme: BottomNavigationBarThemeData(
// backgroundColor: colorScheme.surface,
// selectedItemColor: colorScheme.primary,
// unselectedItemColor: colorScheme.onSurface.withOpacity(0.6),
// ),
// );
}
static Color _getSeedColor(ThemeType type) { static Color _getSeedColor(ThemeType type) {
switch (type) { switch (type) {
case ThemeType.green: case ThemeType.green:

20
lib/features/auth/screens/login_screen.dart
View File

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

4
lib/features/auth/screens/splash_screen.dart
View File

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

2
lib/features/dashboard/widgets/account_card.dart
View File

@@ -13,7 +13,7 @@ class AccountCard extends StatelessWidget {
width: 300, width: 300,
padding: const EdgeInsets.all(20), padding: const EdgeInsets.all(20),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).primaryColor, color: Theme.of(context).colorScheme.onPrimary,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(

6
lib/features/fund_transfer/screens/transaction_success_screen.dart
View File

@@ -67,13 +67,13 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
const SizedBox(height: 6), const SizedBox(height: 6),
Text( Text(
"On $transactionDate", "On $transactionDate",
style: const TextStyle(fontSize: 14, color: Colors.black54), style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6)),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(
"${AppLocalizations.of(context).toAccountNumber}: $creditAccount", "${AppLocalizations.of(context).toAccountNumber}: $creditAccount",
style: const TextStyle(fontSize: 12, color: Colors.black87), style: TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8)),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
], ],
@@ -98,7 +98,7 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Theme.of(context).primaryColorLight, foregroundColor: Theme.of(context).primaryColorLight,
side: const BorderSide(color: Colors.black, width: 1), side: BorderSide(color: Theme.of(context).colorScheme.outline, width: 1),
elevation: 0, elevation: 0,
), ),
), ),

64
lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart
View File

@@ -412,11 +412,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
controller: accountNumberController, controller: accountNumberController,
@@ -448,11 +448,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
@@ -483,11 +483,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
controller: ifscController, controller: ifscController,
@@ -530,11 +530,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
items: [ items: [
@@ -562,8 +562,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).dialogBackgroundColor, fillColor: Theme.of(context).dialogBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: const OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@@ -583,8 +583,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).dialogBackgroundColor, fillColor: Theme.of(context).dialogBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: const OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@@ -643,11 +643,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).dialogBackgroundColor, fillColor: Theme.of(context).dialogBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
validator: (value) { validator: (value) {
@@ -671,11 +671,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
@@ -693,11 +693,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
controller: amountController, controller: amountController,

42
lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart
View File

@@ -91,7 +91,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
title: Text( title: Text(
AppLocalizations.of(context).quickPayOwnBank, AppLocalizations.of(context).quickPayOwnBank,
style: style:
const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), TextStyle(color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500),
), ),
centerTitle: false, centerTitle: false,
), ),
@@ -124,11 +124,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
controller: accountNumberController, controller: accountNumberController,
@@ -154,11 +154,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
@@ -238,11 +238,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
value: _selectedAccountType, value: _selectedAccountType,
@@ -276,11 +276,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
controller: amountController, controller: amountController,
@@ -377,11 +377,11 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).dialogBackgroundColor, fillColor: Theme.of(context).dialogBackgroundColor,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black), borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black, width: 2), borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
); );