fixed colors for darkTheme

This commit is contained in:
llsajjad
2025-08-09 13:13:32 +03:30
parent 68a0bcd582
commit 080125b851
14 changed files with 44 additions and 35 deletions
+1
View File
@@ -121,6 +121,7 @@ class AppColors {
// Red variations (status colors) // Red variations (status colors)
static const Color red0 = Color(0xFFF8D6D6); static const Color red0 = Color(0xFFF8D6D6);
static const Color red10 = Color(0xFFC02525); static const Color red10 = Color(0xFFC02525);
static const Color red = Color(0xFFFF3B30);
// Other colors // Other colors
static const Color paleOrange = Color(0xFFfff7ee); static const Color paleOrange = Color(0xFFfff7ee);
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.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/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_action.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_card.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_card.dart';
@@ -13,7 +14,7 @@ class TenderDetailDesktopPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
appBar: _buildAppBar(context), appBar: _buildAppBar(context),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Padding( child: Padding(
@@ -24,7 +25,7 @@ class TenderDetailDesktopPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TenderDetailHeader(isBig: true,), TenderDetailHeader(isBig: true),
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
const TenderDetailCard(), const TenderDetailCard(),
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
@@ -42,7 +43,7 @@ class TenderDetailDesktopPage extends StatelessWidget {
return PreferredSize( return PreferredSize(
preferredSize: const Size.fromHeight(60), preferredSize: const Size.fromHeight(60),
child: AppBar( child: AppBar(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
elevation: 0, elevation: 0,
titleSpacing: 0, titleSpacing: 0,
leading: IconButton( leading: IconButton(
@@ -56,7 +57,7 @@ class TenderDetailDesktopPage extends StatelessWidget {
title: Text( title: Text(
AppStrings.tenderDetailTitle, AppStrings.tenderDetailTitle,
style: TextStyle( style: TextStyle(
color: Colors.black, color: AppColors.grey70,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 20.0.sp(), fontSize: 20.0.sp(),
), ),
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.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/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_action.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_card.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_card.dart';
@@ -13,7 +14,7 @@ class TenderDetailMobilePage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
appBar: _buildAppBar(context), appBar: _buildAppBar(context),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Padding( child: Padding(
@@ -37,7 +38,7 @@ class TenderDetailMobilePage extends StatelessWidget {
return PreferredSize( return PreferredSize(
preferredSize: const Size.fromHeight(60), preferredSize: const Size.fromHeight(60),
child: AppBar( child: AppBar(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
elevation: 0, elevation: 0,
titleSpacing: 0, titleSpacing: 0,
leading: IconButton( leading: IconButton(
@@ -51,7 +52,7 @@ class TenderDetailMobilePage extends StatelessWidget {
title: Text( title: Text(
AppStrings.tenderDetailTitle, AppStrings.tenderDetailTitle,
style: TextStyle( style: TextStyle(
color: Colors.black, color: AppColors.grey70,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 20.0.sp(), fontSize: 20.0.sp(),
), ),
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.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/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_action.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_card.dart'; import 'package:tm_app/views/detail/widgets/tender_detail_card.dart';
@@ -13,7 +14,7 @@ class TenderDetailTabletPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
appBar: _buildAppBar(context), appBar: _buildAppBar(context),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Padding( child: Padding(
@@ -24,7 +25,7 @@ class TenderDetailTabletPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TenderDetailHeader(isBig: true,), TenderDetailHeader(isBig: true),
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
const TenderDetailCard(), const TenderDetailCard(),
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
@@ -42,7 +43,7 @@ class TenderDetailTabletPage extends StatelessWidget {
return PreferredSize( return PreferredSize(
preferredSize: const Size.fromHeight(60), preferredSize: const Size.fromHeight(60),
child: AppBar( child: AppBar(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
elevation: 0, elevation: 0,
titleSpacing: 0, titleSpacing: 0,
leading: IconButton( leading: IconButton(
@@ -56,7 +57,7 @@ class TenderDetailTabletPage extends StatelessWidget {
title: Text( title: Text(
AppStrings.tenderDetailTitle, AppStrings.tenderDetailTitle,
style: TextStyle( style: TextStyle(
color: Colors.black, color: AppColors.grey70,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 20.0.sp(), fontSize: 20.0.sp(),
), ),
@@ -24,7 +24,7 @@ class TenderDetailActions extends StatelessWidget {
text: AppStrings.tenderRejectButton, text: AppStrings.tenderRejectButton,
borderColor: AppColors.red10, borderColor: AppColors.red10,
textColor: AppColors.red10, textColor: AppColors.red10,
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
borderWidth: 1, borderWidth: 1,
onPressed: () {}, onPressed: () {},
), ),
@@ -20,11 +20,11 @@ class TenderDetailCard extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
const Text( Text(
AppStrings.tenderMatchProfile, AppStrings.tenderMatchProfile,
style: TextStyle( style: TextStyle(
fontSize: 12.0, fontSize: 12.0.sp(),
color: Colors.black87, color: AppColors.grey80,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
@@ -46,7 +46,7 @@ class TenderDetailCard extends StatelessWidget {
value: 0.75, value: 0.75,
backgroundColor: AppColors.grey20, backgroundColor: AppColors.grey20,
valueColor: AlwaysStoppedAnimation<Color>(AppColors.jellyBean), valueColor: AlwaysStoppedAnimation<Color>(AppColors.jellyBean),
minHeight: 6, minHeight: 6.0.h(),
), ),
), ),
SizedBox(height: 16.0.h()), SizedBox(height: 16.0.h()),
@@ -54,26 +54,26 @@ class TenderDetailCard extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Icon(Icons.warning_rounded, color: Colors.red), const Icon(Icons.warning_rounded, color: AppColors.red),
SizedBox(width: 8.0.w()), SizedBox(width: 8.0.w()),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: const [ children: [
Text( Text(
AppStrings.tenderIncompleteResume, AppStrings.tenderIncompleteResume,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16.0, fontSize: 16.0.sp(),
color: Colors.black87, color: AppColors.grey80,
), ),
), ),
SizedBox(height: 4.0), SizedBox(height: 4.0.h()),
Text( Text(
AppStrings.tenderNoExperience, AppStrings.tenderNoExperience,
style: TextStyle( style: TextStyle(
fontSize: 14.0, fontSize: 14.0.sp(),
color: Colors.black54, color: AppColors.grey70,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
@@ -16,7 +16,7 @@ class TenderDetailHeader extends StatelessWidget {
return Container( return Container(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: AppColors.backgroundColor,
borderRadius: BorderRadius.circular(5), borderRadius: BorderRadius.circular(5),
border: Border.all(width: 0.5, color: AppColors.grey50), border: Border.all(width: 0.5, color: AppColors.grey50),
), ),
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.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/core/utils/size_config.dart';
class TenderDocumentSection extends StatelessWidget { class TenderDocumentSection extends StatelessWidget {
@@ -19,7 +20,7 @@ class TenderDocumentSection extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 16.0.sp(), fontSize: 16.0.sp(),
color: Colors.blue, color: AppColors.textBlue,
decoration: TextDecoration.underline, decoration: TextDecoration.underline,
), ),
), ),
@@ -1,6 +1,7 @@
// lib/views/login_desktop_screen.dart // lib/views/login_desktop_screen.dart
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tm_app/core/routes/app_routes.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/assets.dart';
import '../../../core/constants/strings.dart'; import '../../../core/constants/strings.dart';
@@ -34,7 +35,7 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig.init(context); SizeConfig.init(context);
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
body: Center( body: Center(
child: SingleChildScrollView( child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()), padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
+2 -1
View File
@@ -1,6 +1,7 @@
// lib/views/login_screen.dart // lib/views/login_screen.dart
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tm_app/core/routes/app_routes.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/assets.dart';
import '../../../core/constants/strings.dart'; import '../../../core/constants/strings.dart';
@@ -35,7 +36,7 @@ class _LoginMobilePageState extends State<LoginMobilePage> {
SizeConfig.init(context); SizeConfig.init(context);
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: AppColors.backgroundColor,
body: Center( body: Center(
child: SingleChildScrollView( child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()), padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
+2 -1
View File
@@ -1,6 +1,7 @@
// lib/views/login_tablet_screen.dart // lib/views/login_tablet_screen.dart
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tm_app/core/routes/app_routes.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/assets.dart';
import '../../../core/constants/strings.dart'; import '../../../core/constants/strings.dart';
@@ -34,7 +35,7 @@ class _LoginTabletPageState extends State<LoginTabletPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig.init(context); SizeConfig.init(context);
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor:AppColors.backgroundColor,
body: Center( body: Center(
child: SingleChildScrollView( child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()), padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
+3 -3
View File
@@ -38,8 +38,8 @@ class BaseButton extends StatelessWidget {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
backgroundColor ?? backgroundColor ??
(isEnabled ? AppColors.mainBlue : Colors.grey[300]), (isEnabled ? AppColors.mainBlue : AppColors.backgroundColor),
foregroundColor: textColor ?? Colors.white, foregroundColor: textColor ?? AppColors.backgroundColor,
elevation: elevation ?? 0, elevation: elevation ?? 0,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(borderRadius ?? 28.0.w()), borderRadius: BorderRadius.circular(borderRadius ?? 28.0.w()),
@@ -54,7 +54,7 @@ class BaseButton extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16.0.sp(), fontSize: 16.0.sp(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: textColor ?? Colors.white, color: textColor ?? AppColors.backgroundColor,
), ),
), ),
), ),
+2 -2
View File
@@ -52,7 +52,7 @@ class LoginTextField extends StatelessWidget {
width: 24.0.w(), width: 24.0.w(),
height: 24.0.h(), height: 24.0.h(),
colorFilter: ColorFilter.mode( colorFilter: ColorFilter.mode(
focusNode.hasFocus ? Colors.black87 : Colors.grey, focusNode.hasFocus ? AppColors.grey80 : AppColors.grey60,
BlendMode.srcIn, BlendMode.srcIn,
), ),
), ),
@@ -68,7 +68,7 @@ class LoginTextField extends StatelessWidget {
width: 24.0.w(), width: 24.0.w(),
height: 24.0.h(), height: 24.0.h(),
colorFilter: ColorFilter.mode( colorFilter: ColorFilter.mode(
focusNode.hasFocus ? Colors.black87 : Colors.grey, focusNode.hasFocus ? AppColors.grey80 : AppColors.grey60,
BlendMode.srcIn, BlendMode.srcIn,
), ),
), ),
+2 -1
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tm_app/core/theme/colors.dart';
import '../../../core/constants/strings.dart'; import '../../../core/constants/strings.dart';
import '../../../core/utils/size_config.dart'; import '../../../core/utils/size_config.dart';
@@ -20,7 +21,7 @@ class LoginTitle extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 14.0.sp(), fontSize: 14.0.sp(),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.grey, color: AppColors.grey60,
), ),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),