refactor: update color constants and clean up unused menu items

master
tahaalam 1 month ago
parent 2f49663e74
commit d0ea12262d

@ -44,8 +44,8 @@ class MyColors {
static const Color borderCEColor = Color(0xffCECECE); static const Color borderCEColor = Color(0xffCECECE);
//static const Color grey67Color = Color(0xff676767); //static const Color grey67Color = Color(0xff676767);
static const Color whiteColor = Color(0xFFEEEEEE); static const Color whiteColor = Color(0xFFEEEEEE);
static const Color greenColor = Color(0xff1FA269); static const Color greenColor = Color(0xcd1e536e);
static const Color lightGreenColor = Color(0xff2AB2AB); static const Color lightGreenColor = Color(0xff1e536e);
static const Color darkGreyColor = Color(0xff464646); static const Color darkGreyColor = Color(0xff464646);
static const Color greyA5Color = Color(0xffA5A5A5); static const Color greyA5Color = Color(0xffA5A5A5);
static const Color blackColor = Color(0xff000014); static const Color blackColor = Color(0xff000014);
@ -54,10 +54,10 @@ class MyColors {
static const Color lightGrayColor = Color(0xff808080); static const Color lightGrayColor = Color(0xff808080);
static const Color darkRedColor = Color(0xffD02127); static const Color darkRedColor = Color(0xffD02127);
static const Color lightGreyColor = Color(0xffC7C7C7); static const Color lightGreyColor = Color(0xffC7C7C7);
static const Color green69Color = Color(0xff1FA169); static const Color green69Color = Color(0xcd1e536e);
static const Color redA3Color = Color(0xffCA3332); static const Color redA3Color = Color(0xffCA3332);
static const Color green9CColor = Color(0xff259CB8); static const Color green9CColor = Color(0xcd1e536e);
static const Color green2DColor = Color(0xff32D892); static const Color green2DColor = Color(0xcd1e536e);
static const Color greyC4Color = Color(0xffC4C4C4); static const Color greyC4Color = Color(0xffC4C4C4);
static const Color grey35Color = Color(0xff535353); static const Color grey35Color = Color(0xff535353);
static const Color grey9DColor = Color(0xff9D9D9D); static const Color grey9DColor = Color(0xff9D9D9D);

@ -402,7 +402,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
height: 45, height: 45,
padding: const EdgeInsets.only(left: 10, right: 10), padding: const EdgeInsets.only(left: 10, right: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: const Color(0xff259EA4), color: const Color(0xff1e536e),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
bottomRight: AppState().isArabic(context) ? const Radius.circular(0) : const Radius.circular(15), bottomRight: AppState().isArabic(context) ? const Radius.circular(0) : const Radius.circular(15),
bottomLeft: AppState().isArabic(context) ? const Radius.circular(15) : const Radius.circular(0), bottomLeft: AppState().isArabic(context) ? const Radius.circular(15) : const Radius.circular(0),

@ -117,9 +117,9 @@ class _AppDrawerState extends State<AppDrawer> {
Navigator.pushNamed(context, drawerMenuItemList[index].routeName); Navigator.pushNamed(context, drawerMenuItemList[index].routeName);
}); });
}), }),
menuItem("assets/images/drawer/employee_id.svg", LocaleKeys.employeeDigitalID.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: EmployeeDigitialIdDialog())), // menuItem("assets/images/drawer/employee_id.svg", LocaleKeys.employeeDigitalID.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: EmployeeDigitialIdDialog())),
if (AppState().businessCardPrivilege) // if (AppState().businessCardPrivilege)
menuItem("assets/images/drawer/view_business_card.svg", LocaleKeys.viewBusinessCard.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: BusinessCardDialog(), isBusniessCard: true)), // menuItem("assets/images/drawer/view_business_card.svg", LocaleKeys.viewBusinessCard.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: BusinessCardDialog(), isBusniessCard: true)),
menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: (){Utils.performLogout(context, chatData);}), menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: (){Utils.performLogout(context, chatData);}),
// menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: () {Navigator.pushNamed(context, AppRoutes.survey,); // menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: () {Navigator.pushNamed(context, AppRoutes.survey,);
], ],

@ -19,7 +19,7 @@ import 'package:provider/provider.dart';
class MenusWidget extends StatelessWidget { class MenusWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<int> namesColor = [0xff125765, 0xff239D8F, 0xff2BB8A8, 0xff1D92AA]; List<int> namesColor = [0xff1e536e, 0xff1e536e, 0xff1e536e, 0xff1e536e];
return Consumer<DashboardProviderModel>( return Consumer<DashboardProviderModel>(
builder: (cxt, data, child) { builder: (cxt, data, child) {

@ -69,25 +69,27 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
surfaceTintColor: Colors.transparent, surfaceTintColor: Colors.transparent,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: (mobileLoginInfoListModel?.businessCardPrivilege ?? false) // title:
? LocaleKeys.viewBusinessCard.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { // // (mobileLoginInfoListModel?.businessCardPrivilege ?? false)
showMDialog(context, child: const BusinessCardDialog()); // // ? LocaleKeys.viewBusinessCard.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() {
}) // // showMDialog(context, child: const BusinessCardDialog());
: Container(), // // })
actions: [ // // :
Center( // Container(),
// actions: [
child: LocaleKeys.employeeDigitalID.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { // Center(
showMDialog(context, child: EmployeeDigitialIdDialog()); //
}), // child: LocaleKeys.employeeDigitalID.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() {
), // showMDialog(context, child: EmployeeDigitialIdDialog());
21.width, // }),
], // ),
// 21.width,
// ],
), ),
body: Column( body: Column(
children: [ children: [
ListView( ListView(
padding: const EdgeInsets.all(21), padding: const EdgeInsets.symmetric(horizontal: 21),
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
children: [ children: [
//12.height, //12.height,

@ -41,7 +41,7 @@ class ItemDetailViewCol extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
"$title:".toText12(isBold: true, color: const Color(0xff2BB8A6), maxLine: 2), "$title:".toText12(isBold: true, color: MyColors.textMixColor, maxLine: 2),
4.width, 4.width,
Flexible(child: (value.isEmpty ? "--" : value).toText12(color: MyColors.normalTextColor, maxLine: null)), Flexible(child: (value.isEmpty ? "--" : value).toText12(color: MyColors.normalTextColor, maxLine: null)),
], ],
@ -87,7 +87,7 @@ class ItemDetailViewGridItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
title != null ? Flexible(child: "$title:".toText12(isBold: true, color: const Color(0xff2BB8A6))) : Container(), title != null ? Flexible(child: "$title:".toText12(isBold: true, color: MyColors.textMixColor)) : Container(),
4.width, 4.width,
type != null type != null
? type!.toLowerCase() == "table" ? type!.toLowerCase() == "table"

Loading…
Cancel
Save