From 080125b85120b40b7b7836040cac25a63b16bacd Mon Sep 17 00:00:00 2001 From: llsajjad Date: Sat, 9 Aug 2025 13:13:32 +0330 Subject: [PATCH] fixed colors for darkTheme --- lib/core/theme/colors.dart | 1 + .../detail/pages/detail_desktop_page.dart | 9 +++---- .../detail/pages/detail_mobile_page.dart | 7 +++--- .../detail/pages/detail_tablet_page.dart | 9 +++---- .../detail/widgets/tender_detail_action.dart | 2 +- .../detail/widgets/tender_detail_card.dart | 24 +++++++++---------- .../detail/widgets/tender_detail_header.dart | 2 +- .../widgets/tender_document_section.dart | 3 ++- lib/views/login/pages/login_desktop_page.dart | 3 ++- lib/views/login/pages/login_mobile_page.dart | 3 ++- lib/views/login/pages/login_tablet_page.dart | 3 ++- lib/views/login/widgets/login_button.dart | 6 ++--- lib/views/login/widgets/login_textfield.dart | 4 ++-- lib/views/login/widgets/login_title.dart | 3 ++- 14 files changed, 44 insertions(+), 35 deletions(-) diff --git a/lib/core/theme/colors.dart b/lib/core/theme/colors.dart index 7cb19d1..6249f1c 100644 --- a/lib/core/theme/colors.dart +++ b/lib/core/theme/colors.dart @@ -121,6 +121,7 @@ class AppColors { // Red variations (status colors) static const Color red0 = Color(0xFFF8D6D6); static const Color red10 = Color(0xFFC02525); + static const Color red = Color(0xFFFF3B30); // Other colors static const Color paleOrange = Color(0xFFfff7ee); diff --git a/lib/views/detail/pages/detail_desktop_page.dart b/lib/views/detail/pages/detail_desktop_page.dart index 5b2efb5..651fbf5 100644 --- a/lib/views/detail/pages/detail_desktop_page.dart +++ b/lib/views/detail/pages/detail_desktop_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/strings.dart'; +import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_action.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_card.dart'; @@ -13,7 +14,7 @@ class TenderDetailDesktopPage extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, appBar: _buildAppBar(context), body: SingleChildScrollView( child: Padding( @@ -24,7 +25,7 @@ class TenderDetailDesktopPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - TenderDetailHeader(isBig: true,), + TenderDetailHeader(isBig: true), SizedBox(height: 24.0.h()), const TenderDetailCard(), SizedBox(height: 24.0.h()), @@ -42,7 +43,7 @@ class TenderDetailDesktopPage extends StatelessWidget { return PreferredSize( preferredSize: const Size.fromHeight(60), child: AppBar( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, elevation: 0, titleSpacing: 0, leading: IconButton( @@ -56,7 +57,7 @@ class TenderDetailDesktopPage extends StatelessWidget { title: Text( AppStrings.tenderDetailTitle, style: TextStyle( - color: Colors.black, + color: AppColors.grey70, fontWeight: FontWeight.w600, fontSize: 20.0.sp(), ), diff --git a/lib/views/detail/pages/detail_mobile_page.dart b/lib/views/detail/pages/detail_mobile_page.dart index 04c841e..829d12c 100644 --- a/lib/views/detail/pages/detail_mobile_page.dart +++ b/lib/views/detail/pages/detail_mobile_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/strings.dart'; +import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_action.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_card.dart'; @@ -13,7 +14,7 @@ class TenderDetailMobilePage extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, appBar: _buildAppBar(context), body: SingleChildScrollView( child: Padding( @@ -37,7 +38,7 @@ class TenderDetailMobilePage extends StatelessWidget { return PreferredSize( preferredSize: const Size.fromHeight(60), child: AppBar( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, elevation: 0, titleSpacing: 0, leading: IconButton( @@ -51,7 +52,7 @@ class TenderDetailMobilePage extends StatelessWidget { title: Text( AppStrings.tenderDetailTitle, style: TextStyle( - color: Colors.black, + color: AppColors.grey70, fontWeight: FontWeight.w600, fontSize: 20.0.sp(), ), diff --git a/lib/views/detail/pages/detail_tablet_page.dart b/lib/views/detail/pages/detail_tablet_page.dart index 21e193e..643cd7c 100644 --- a/lib/views/detail/pages/detail_tablet_page.dart +++ b/lib/views/detail/pages/detail_tablet_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/strings.dart'; +import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_action.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_card.dart'; @@ -13,7 +14,7 @@ class TenderDetailTabletPage extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, appBar: _buildAppBar(context), body: SingleChildScrollView( child: Padding( @@ -24,7 +25,7 @@ class TenderDetailTabletPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - TenderDetailHeader(isBig: true,), + TenderDetailHeader(isBig: true), SizedBox(height: 24.0.h()), const TenderDetailCard(), SizedBox(height: 24.0.h()), @@ -42,7 +43,7 @@ class TenderDetailTabletPage extends StatelessWidget { return PreferredSize( preferredSize: const Size.fromHeight(60), child: AppBar( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, elevation: 0, titleSpacing: 0, leading: IconButton( @@ -56,7 +57,7 @@ class TenderDetailTabletPage extends StatelessWidget { title: Text( AppStrings.tenderDetailTitle, style: TextStyle( - color: Colors.black, + color: AppColors.grey70, fontWeight: FontWeight.w600, fontSize: 20.0.sp(), ), diff --git a/lib/views/detail/widgets/tender_detail_action.dart b/lib/views/detail/widgets/tender_detail_action.dart index 0019d01..514ee7d 100644 --- a/lib/views/detail/widgets/tender_detail_action.dart +++ b/lib/views/detail/widgets/tender_detail_action.dart @@ -24,7 +24,7 @@ class TenderDetailActions extends StatelessWidget { text: AppStrings.tenderRejectButton, borderColor: AppColors.red10, textColor: AppColors.red10, - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, borderWidth: 1, onPressed: () {}, ), diff --git a/lib/views/detail/widgets/tender_detail_card.dart b/lib/views/detail/widgets/tender_detail_card.dart index 4b59081..59476fb 100644 --- a/lib/views/detail/widgets/tender_detail_card.dart +++ b/lib/views/detail/widgets/tender_detail_card.dart @@ -20,11 +20,11 @@ class TenderDetailCard extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - const Text( + Text( AppStrings.tenderMatchProfile, style: TextStyle( - fontSize: 12.0, - color: Colors.black87, + fontSize: 12.0.sp(), + color: AppColors.grey80, fontWeight: FontWeight.w400, ), ), @@ -46,7 +46,7 @@ class TenderDetailCard extends StatelessWidget { value: 0.75, backgroundColor: AppColors.grey20, valueColor: AlwaysStoppedAnimation(AppColors.jellyBean), - minHeight: 6, + minHeight: 6.0.h(), ), ), SizedBox(height: 16.0.h()), @@ -54,26 +54,26 @@ class TenderDetailCard extends StatelessWidget { Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const Icon(Icons.warning_rounded, color: Colors.red), + const Icon(Icons.warning_rounded, color: AppColors.red), SizedBox(width: 8.0.w()), Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: const [ + children: [ Text( AppStrings.tenderIncompleteResume, style: TextStyle( fontWeight: FontWeight.w600, - fontSize: 16.0, - color: Colors.black87, + fontSize: 16.0.sp(), + color: AppColors.grey80, ), ), - SizedBox(height: 4.0), + SizedBox(height: 4.0.h()), Text( AppStrings.tenderNoExperience, style: TextStyle( - fontSize: 14.0, - color: Colors.black54, + fontSize: 14.0.sp(), + color: AppColors.grey70, fontWeight: FontWeight.w400, ), ), @@ -86,4 +86,4 @@ class TenderDetailCard extends StatelessWidget { ), ); } -} \ No newline at end of file +} diff --git a/lib/views/detail/widgets/tender_detail_header.dart b/lib/views/detail/widgets/tender_detail_header.dart index 1d814d1..6ee55f7 100644 --- a/lib/views/detail/widgets/tender_detail_header.dart +++ b/lib/views/detail/widgets/tender_detail_header.dart @@ -16,7 +16,7 @@ class TenderDetailHeader extends StatelessWidget { return Container( padding: const EdgeInsets.all(16), decoration: BoxDecoration( - color: Colors.white, + color: AppColors.backgroundColor, borderRadius: BorderRadius.circular(5), border: Border.all(width: 0.5, color: AppColors.grey50), ), diff --git a/lib/views/detail/widgets/tender_document_section.dart b/lib/views/detail/widgets/tender_document_section.dart index f2e59aa..c716f2d 100644 --- a/lib/views/detail/widgets/tender_document_section.dart +++ b/lib/views/detail/widgets/tender_document_section.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/strings.dart'; +import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/utils/size_config.dart'; class TenderDocumentSection extends StatelessWidget { @@ -19,7 +20,7 @@ class TenderDocumentSection extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w400, fontSize: 16.0.sp(), - color: Colors.blue, + color: AppColors.textBlue, decoration: TextDecoration.underline, ), ), diff --git a/lib/views/login/pages/login_desktop_page.dart b/lib/views/login/pages/login_desktop_page.dart index d5fc7a1..12ea8a3 100644 --- a/lib/views/login/pages/login_desktop_page.dart +++ b/lib/views/login/pages/login_desktop_page.dart @@ -1,6 +1,7 @@ // lib/views/login_desktop_screen.dart import 'package:flutter/material.dart'; import 'package:tm_app/core/routes/app_routes.dart'; +import 'package:tm_app/core/theme/colors.dart'; import '../../../core/constants/assets.dart'; import '../../../core/constants/strings.dart'; @@ -34,7 +35,7 @@ class _LoginDesktopPageState extends State { Widget build(BuildContext context) { SizeConfig.init(context); return Scaffold( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, body: Center( child: SingleChildScrollView( padding: EdgeInsets.symmetric(horizontal: 24.0.w()), diff --git a/lib/views/login/pages/login_mobile_page.dart b/lib/views/login/pages/login_mobile_page.dart index bd68703..2f1ac24 100644 --- a/lib/views/login/pages/login_mobile_page.dart +++ b/lib/views/login/pages/login_mobile_page.dart @@ -1,6 +1,7 @@ // lib/views/login_screen.dart import 'package:flutter/material.dart'; import 'package:tm_app/core/routes/app_routes.dart'; +import 'package:tm_app/core/theme/colors.dart'; import '../../../core/constants/assets.dart'; import '../../../core/constants/strings.dart'; @@ -35,7 +36,7 @@ class _LoginMobilePageState extends State { SizeConfig.init(context); return Scaffold( - backgroundColor: Colors.white, + backgroundColor: AppColors.backgroundColor, body: Center( child: SingleChildScrollView( padding: EdgeInsets.symmetric(horizontal: 24.0.w()), diff --git a/lib/views/login/pages/login_tablet_page.dart b/lib/views/login/pages/login_tablet_page.dart index d6ab9cf..255b7c3 100644 --- a/lib/views/login/pages/login_tablet_page.dart +++ b/lib/views/login/pages/login_tablet_page.dart @@ -1,6 +1,7 @@ // lib/views/login_tablet_screen.dart import 'package:flutter/material.dart'; import 'package:tm_app/core/routes/app_routes.dart'; +import 'package:tm_app/core/theme/colors.dart'; import '../../../core/constants/assets.dart'; import '../../../core/constants/strings.dart'; @@ -34,7 +35,7 @@ class _LoginTabletPageState extends State { Widget build(BuildContext context) { SizeConfig.init(context); return Scaffold( - backgroundColor: Colors.white, + backgroundColor:AppColors.backgroundColor, body: Center( child: SingleChildScrollView( padding: EdgeInsets.symmetric(horizontal: 24.0.w()), diff --git a/lib/views/login/widgets/login_button.dart b/lib/views/login/widgets/login_button.dart index 10c58de..9b7d34a 100644 --- a/lib/views/login/widgets/login_button.dart +++ b/lib/views/login/widgets/login_button.dart @@ -38,8 +38,8 @@ class BaseButton extends StatelessWidget { style: ElevatedButton.styleFrom( backgroundColor: backgroundColor ?? - (isEnabled ? AppColors.mainBlue : Colors.grey[300]), - foregroundColor: textColor ?? Colors.white, + (isEnabled ? AppColors.mainBlue : AppColors.backgroundColor), + foregroundColor: textColor ?? AppColors.backgroundColor, elevation: elevation ?? 0, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(borderRadius ?? 28.0.w()), @@ -54,7 +54,7 @@ class BaseButton extends StatelessWidget { style: TextStyle( fontSize: 16.0.sp(), fontWeight: FontWeight.bold, - color: textColor ?? Colors.white, + color: textColor ?? AppColors.backgroundColor, ), ), ), diff --git a/lib/views/login/widgets/login_textfield.dart b/lib/views/login/widgets/login_textfield.dart index a98561a..696eb36 100644 --- a/lib/views/login/widgets/login_textfield.dart +++ b/lib/views/login/widgets/login_textfield.dart @@ -52,7 +52,7 @@ class LoginTextField extends StatelessWidget { width: 24.0.w(), height: 24.0.h(), colorFilter: ColorFilter.mode( - focusNode.hasFocus ? Colors.black87 : Colors.grey, + focusNode.hasFocus ? AppColors.grey80 : AppColors.grey60, BlendMode.srcIn, ), ), @@ -68,7 +68,7 @@ class LoginTextField extends StatelessWidget { width: 24.0.w(), height: 24.0.h(), colorFilter: ColorFilter.mode( - focusNode.hasFocus ? Colors.black87 : Colors.grey, + focusNode.hasFocus ? AppColors.grey80 : AppColors.grey60, BlendMode.srcIn, ), ), diff --git a/lib/views/login/widgets/login_title.dart b/lib/views/login/widgets/login_title.dart index 174a936..5ee7eca 100644 --- a/lib/views/login/widgets/login_title.dart +++ b/lib/views/login/widgets/login_title.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:tm_app/core/theme/colors.dart'; import '../../../core/constants/strings.dart'; import '../../../core/utils/size_config.dart'; @@ -20,7 +21,7 @@ class LoginTitle extends StatelessWidget { style: TextStyle( fontSize: 14.0.sp(), fontWeight: FontWeight.w400, - color: Colors.grey, + color: AppColors.grey60, ), textAlign: TextAlign.center, ),