diff --git a/lib/classes/colors.dart b/lib/classes/colors.dart index b747e19..fdb51df 100644 --- a/lib/classes/colors.dart +++ b/lib/classes/colors.dart @@ -44,8 +44,8 @@ class MyColors { static const Color borderCEColor = Color(0xffCECECE); //static const Color grey67Color = Color(0xff676767); static const Color whiteColor = Color(0xFFEEEEEE); - static const Color greenColor = Color(0xff1FA269); - static const Color lightGreenColor = Color(0xff2AB2AB); + static const Color greenColor = Color(0xcd1e536e); + static const Color lightGreenColor = Color(0xff1e536e); static const Color darkGreyColor = Color(0xff464646); static const Color greyA5Color = Color(0xffA5A5A5); static const Color blackColor = Color(0xff000014); @@ -54,10 +54,10 @@ class MyColors { static const Color lightGrayColor = Color(0xff808080); static const Color darkRedColor = Color(0xffD02127); 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 green9CColor = Color(0xff259CB8); - static const Color green2DColor = Color(0xff32D892); + static const Color green9CColor = Color(0xcd1e536e); + static const Color green2DColor = Color(0xcd1e536e); static const Color greyC4Color = Color(0xffC4C4C4); static const Color grey35Color = Color(0xff535353); static const Color grey9DColor = Color(0xff9D9D9D); diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index 2f4147d..78d53a7 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -402,7 +402,7 @@ class _DashboardScreenState extends State with WidgetsBindingOb height: 45, padding: const EdgeInsets.only(left: 10, right: 10), decoration: BoxDecoration( - color: const Color(0xff259EA4), + color: const Color(0xff1e536e), borderRadius: BorderRadius.only( bottomRight: AppState().isArabic(context) ? const Radius.circular(0) : const Radius.circular(15), bottomLeft: AppState().isArabic(context) ? const Radius.circular(15) : const Radius.circular(0), diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart index b9bdbc4..f1946b7 100644 --- a/lib/ui/landing/widget/app_drawer.dart +++ b/lib/ui/landing/widget/app_drawer.dart @@ -117,9 +117,9 @@ class _AppDrawerState extends State { Navigator.pushNamed(context, drawerMenuItemList[index].routeName); }); }), - menuItem("assets/images/drawer/employee_id.svg", LocaleKeys.employeeDigitalID.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: EmployeeDigitialIdDialog())), - 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/employee_id.svg", LocaleKeys.employeeDigitalID.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: EmployeeDigitialIdDialog())), + // 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/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,); ], diff --git a/lib/ui/landing/widget/menus_widget.dart b/lib/ui/landing/widget/menus_widget.dart index 0526bb9..5e101a0 100644 --- a/lib/ui/landing/widget/menus_widget.dart +++ b/lib/ui/landing/widget/menus_widget.dart @@ -19,7 +19,7 @@ import 'package:provider/provider.dart'; class MenusWidget extends StatelessWidget { @override Widget build(BuildContext context) { - List namesColor = [0xff125765, 0xff239D8F, 0xff2BB8A8, 0xff1D92AA]; + List namesColor = [0xff1e536e, 0xff1e536e, 0xff1e536e, 0xff1e536e]; return Consumer( builder: (cxt, data, child) { diff --git a/lib/ui/login/verify_last_login_screen.dart b/lib/ui/login/verify_last_login_screen.dart index 5c76092..030243a 100644 --- a/lib/ui/login/verify_last_login_screen.dart +++ b/lib/ui/login/verify_last_login_screen.dart @@ -69,25 +69,27 @@ class _VerifyLastLoginScreenState extends State { surfaceTintColor: Colors.transparent, backgroundColor: Colors.transparent, automaticallyImplyLeading: false, - title: (mobileLoginInfoListModel?.businessCardPrivilege ?? false) - ? LocaleKeys.viewBusinessCard.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { - showMDialog(context, child: const BusinessCardDialog()); - }) - : Container(), - actions: [ - Center( - - child: LocaleKeys.employeeDigitalID.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { - showMDialog(context, child: EmployeeDigitialIdDialog()); - }), - ), - 21.width, - ], + // title: + // // (mobileLoginInfoListModel?.businessCardPrivilege ?? false) + // // ? LocaleKeys.viewBusinessCard.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { + // // showMDialog(context, child: const BusinessCardDialog()); + // // }) + // // : + // Container(), + // actions: [ + // Center( + // + // child: LocaleKeys.employeeDigitalID.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { + // showMDialog(context, child: EmployeeDigitialIdDialog()); + // }), + // ), + // 21.width, + // ], ), body: Column( children: [ ListView( - padding: const EdgeInsets.all(21), + padding: const EdgeInsets.symmetric(horizontal: 21), physics: const BouncingScrollPhysics(), children: [ //12.height, diff --git a/lib/widgets/item_detail_view_widget.dart b/lib/widgets/item_detail_view_widget.dart index de82afe..88a254b 100644 --- a/lib/widgets/item_detail_view_widget.dart +++ b/lib/widgets/item_detail_view_widget.dart @@ -41,7 +41,7 @@ class ItemDetailViewCol extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - "$title:".toText12(isBold: true, color: const Color(0xff2BB8A6), maxLine: 2), + "$title:".toText12(isBold: true, color: MyColors.textMixColor, maxLine: 2), 4.width, Flexible(child: (value.isEmpty ? "--" : value).toText12(color: MyColors.normalTextColor, maxLine: null)), ], @@ -87,7 +87,7 @@ class ItemDetailViewGridItem extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, 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, type != null ? type!.toLowerCase() == "table"