This commit is contained in:
2025-08-06 17:26:25 +05:30
parent 2fdef7c850
commit c4d4261afc
33 changed files with 772 additions and 935 deletions

View File

@@ -93,9 +93,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
Widget _buildBalanceShimmer() {
return Shimmer.fromColors(
baseColor: Colors.white.withOpacity(0.7),
highlightColor: Colors.white.withOpacity(0.3),
child: Container(width: 100, height: 32, color: Colors.white),
baseColor: Theme.of(context).dialogBackgroundColor,
highlightColor: Theme.of(context).dialogBackgroundColor,
child: Container(width: 100, height: 32, color: Theme.of(context).scaffoldBackgroundColor),
);
}
@@ -197,9 +197,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
}
},
child: Scaffold(
backgroundColor: const Color(0xfff5f9fc),
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
appBar: AppBar(
backgroundColor: const Color(0xfff5f9fc),
backgroundColor:Theme.of(context).scaffoldBackgroundColor,
automaticallyImplyLeading: false,
title: Text(
AppLocalizations.of(context).kMobile,
@@ -208,6 +208,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontWeight: FontWeight.w500,
),
),
centerTitle: true,
actions: [
Padding(
padding: const EdgeInsets.only(right: 10.0),
@@ -265,7 +266,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
"${AppLocalizations.of(context).hi} $firstName",
style: GoogleFonts.montserrat().copyWith(
fontSize: 25,
color: Theme.of(context).primaryColorDark,
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.w700,
),
),
@@ -289,8 +290,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: [
Text(
"${AppLocalizations.of(context).accountNumber}: ",
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: Theme.of(context).dialogBackgroundColor,
fontSize: 12,
),
),
@@ -299,9 +300,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
dropdownColor: Theme.of(context).primaryColor,
underline: const SizedBox(),
icon: const Icon(Icons.keyboard_arrow_down),
iconEnabledColor: Colors.white,
style: const TextStyle(
color: Colors.white,
iconEnabledColor:Theme.of(context).dialogBackgroundColor,
style: TextStyle(
color: Theme.of(context).dialogBackgroundColor,
fontSize: 14,
),
items: List.generate(users.length, (index) {
@@ -309,8 +310,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
value: index,
child: Text(
users[index].accountNo ?? 'N/A',
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: Theme.of(context).dialogBackgroundColor,
fontSize: 14,
),
),
@@ -346,17 +347,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
const Spacer(),
IconButton(
icon: isRefreshing
? const SizedBox(
? SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
color: Colors.white,
color: Theme.of(context).dialogBackgroundColor,
strokeWidth: 2,
),
)
: const Icon(
: Icon(
Icons.refresh,
color: Colors.white,
color: Theme.of(context).dialogBackgroundColor,
),
onPressed: isRefreshing
? null
@@ -367,8 +368,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
Text(
getFullAccountType(currAccount.accountType),
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: Theme.of(context).dialogBackgroundColor,
fontSize: 16,
),
),
@@ -376,10 +377,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const Text(
Text(
"",
style: TextStyle(
color: Colors.white,
color: Theme.of(context).dialogBackgroundColor,
fontSize: 40,
fontWeight: FontWeight.w700,
),
@@ -391,8 +392,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
? currAccount.currentBalance ??
'0.00'
: '********',
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: Theme.of(context).dialogBackgroundColor,
fontSize: 40,
fontWeight: FontWeight.w700,
),
@@ -422,7 +423,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
isVisible
? Symbols.visibility_lock
: Symbols.visibility,
color: Colors.white,
color: Theme.of(context).scaffoldBackgroundColor,
),
),
],
@@ -598,17 +599,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
leading: Shimmer.fromColors(
baseColor: Colors.grey[300]!,
highlightColor: Colors.grey[100]!,
child: const CircleAvatar(radius: 12, backgroundColor: Colors.white),
child: CircleAvatar(radius: 12, backgroundColor: Theme.of(context).scaffoldBackgroundColor),
),
title: Shimmer.fromColors(
baseColor: Colors.grey[300]!,
highlightColor: Colors.grey[100]!,
child: Container(height: 10, width: 100, color: Colors.white),
child: Container(height: 10, width: 100, color: Theme.of(context).scaffoldBackgroundColor),
),
subtitle: Shimmer.fromColors(
baseColor: Colors.grey[300]!,
highlightColor: Colors.grey[100]!,
child: Container(height: 8, width: 60, color: Colors.white),
child: Container(height: 8, width: 60, color: Theme.of(context).scaffoldBackgroundColor),
),
);
});

View File

@@ -39,8 +39,8 @@ class AccountCard extends StatelessWidget {
children: [
Text(
account.accountType,
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: Theme.of(context).scaffoldBackgroundColor,
fontSize: 18,
fontWeight: FontWeight.bold,
),
@@ -49,20 +49,20 @@ class AccountCard extends StatelessWidget {
account.accountType == 'Savings'
? Icons.savings
: Icons.account_balance,
color: Colors.white,
color: Theme.of(context).scaffoldBackgroundColor,
),
],
),
const SizedBox(height: 20),
Text(
account.accountNumber,
style: const TextStyle(color: Colors.white70, fontSize: 16),
style: TextStyle(color: Theme.of(context).dialogBackgroundColor, fontSize: 16),
),
const SizedBox(height: 30),
Text(
'${account.currency} ${account.balance.toStringAsFixed(2)}',
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: Theme.of(context).scaffoldBackgroundColor,
fontSize: 22,
fontWeight: FontWeight.bold,
),