From e3e3005bba1a509ad5b7ca06a38999e6025703c3 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Sun, 20 Jul 2025 12:39:37 +0330 Subject: [PATCH] feat : ui change's like 1 - logout icon's color 2 - profile itemList change color 3 - change empty icon and vec 4 - reset nested navigation when change main page's changed --- assets/icons/cube_watting.svg | 7 + assets/icons/empty.svg | 123 +++--- assets/vec/cube_watting.svg.vec | Bin 0 -> 1620 bytes assets/vec/empty.svg.vec | Bin 12776 -> 12318 bytes .../lib/presentation/pages/home/view.dart | 325 +++++++------- .../lib/presentation/pages/profile/view.dart | 21 +- .../lib/presentation/pages/root/logic.dart | 3 +- .../lib/presentation/pages/root/view.dart | 19 +- .../lib/presentation/common/app_color.dart | 409 +++++------------- .../lib/presentation/common/assets.gen.dart | 8 + 10 files changed, 375 insertions(+), 540 deletions(-) create mode 100644 assets/icons/cube_watting.svg create mode 100644 assets/vec/cube_watting.svg.vec diff --git a/assets/icons/cube_watting.svg b/assets/icons/cube_watting.svg new file mode 100644 index 0000000..29cbdc8 --- /dev/null +++ b/assets/icons/cube_watting.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/icons/empty.svg b/assets/icons/empty.svg index b7bb9ce..9d67b54 100644 --- a/assets/icons/empty.svg +++ b/assets/icons/empty.svg @@ -1,68 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/vec/cube_watting.svg.vec b/assets/vec/cube_watting.svg.vec new file mode 100644 index 0000000000000000000000000000000000000000..8f061213a91d169d4b0565463d86a1ac9820b7c7 GIT binary patch literal 1620 zcmY*aZAg<*6u$4~j}S_Tk;G*CC+*<-=brPNyKT>k^UCrm zHBUS%)Ig!&RH{&@C}21(Jh?5U$`yv?&@ZPvVZm?bc6RX?1%nL1=7Y_4ajh0S7h`nn zmHM}&eSEsYWMtnwvCm}n?^*jyEbrAmK8bxwO=o-QQ@(^&tvW)B`v>hECuciJI; zlVGlAtJtTrb2i7h5})nwy^F{f%-JhP$^)i}&CFW*6dFfA z*U-gBY2b78y&Lyn#9rFhiFKDxTxx+WuO^4cPO`Hj_7!w7;z10Q;o< zraeIQnOCp}$kgGsoN5U-Q98=yVmJeA!N}0y>M-_ZNONb1x${+NV(yG5Nt%0KN{38uk;oyJ^bxw1^h| z(lEV?v1TpUpG00QG&wgSxXv0DJX{^8VDv0_qd5OERh(+0nUmM)>bX|r+fBzEEr=Ty z47)}J^HnKY^Na1eUbiYy%eZ{42J}$;6XUR0Bj;}RsM6dse7CQmZ%@E`3CO)VFWijY zNRO;tiJQpx0@l}1Ule;TNj@Bt>*@M$4|8a)C&JBV_=3DY3uM06MgG@_8jGYJj*F(+W} zL%tJu?ghsL=A9yT6|ocbJpykWF&W&ETgYV$ImJ;s_x3h?BRFRezg0tm)7dUTZzK+m sA$%udSSJK|k6x#+KMs2eYmV3XuJmvh3I&g)_|L)P(18C0UX=*^1+8OA?*IS* literal 0 HcmV?d00001 diff --git a/assets/vec/empty.svg.vec b/assets/vec/empty.svg.vec index f0a85a0d0a84ff59b1bf93dd706f0d3d0ebc0eff..b60778f125e37e85d38e9f7d1cfbc091db75eb5f 100644 GIT binary patch literal 12318 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 diff --git a/packages/chicken/lib/presentation/pages/home/view.dart b/packages/chicken/lib/presentation/pages/home/view.dart index d02fd50..03e804d 100644 --- a/packages/chicken/lib/presentation/pages/home/view.dart +++ b/packages/chicken/lib/presentation/pages/home/view.dart @@ -16,145 +16,149 @@ class HomePage extends GetView { return Scaffold( backgroundColor: AppColor.bgLight, appBar: chickenAppBar(hasBack: false, hasFilter: false, hasSearch: false), - body: Column( - spacing: 8, - children: [ - InkWell( - onTap: () { - controller.isExpanded.value = !controller.isExpanded.value; - }, - child: Card( - margin: EdgeInsetsGeometry.all(6), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), - side: BorderSide(width: 0.50, color: const Color(0xFFA9A9A9)), + body: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + spacing: 8, + children: [ + InkWell( + onTap: () { + controller.isExpanded.value = !controller.isExpanded.value; + }, + child: Card( + margin: EdgeInsetsGeometry.all(6), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + side: BorderSide(width: 0.50, color: const Color(0xFFA9A9A9)), + ), + + child: ObxValue((data) { + return AnimatedSize( + duration: Duration(milliseconds: 300), + child: data.value + ? Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + spacing: 8, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 40, + height: 40, + decoration: ShapeDecoration( + image: DecorationImage( + image: AssetImage(Assets.images.chicken.path), + fit: BoxFit.cover, + ), + shape: RoundedRectangleBorder( + side: BorderSide( + width: 0.25, + color: const Color(0xFFB0B0B0), + ), + borderRadius: BorderRadius.circular(4), + ), + ), + ), + Text( + 'مرغ گرم', + textAlign: TextAlign.right, + style: AppFonts.yekan16.copyWith( + color: AppColor.darkGreyDarkActive, + ), + ), + Spacer(), + AnimatedRotation( + turns: 180, + duration: Duration(milliseconds: 3000), + child: Icon(CupertinoIcons.chevron_up, size: 18), + ), + ], + ), + SizedBox(height: 8), + _todayShipmentWidget(), + + _inventoryWidget(), + + Row( + children: [ + Text( + 'اطلاعات بارها', + textAlign: TextAlign.right, + style: AppFonts.yekan16, + ), + ], + ), + + _informationShipment(), + + Row( + children: [ + Text( + 'اطلاعات توزیع', + textAlign: TextAlign.right, + style: AppFonts.yekan16, + ), + ], + ), + + distributionInformationWidget(), + ], + ), + ) + : Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + spacing: 8, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 40, + height: 40, + decoration: ShapeDecoration( + image: DecorationImage( + image: AssetImage(Assets.images.chicken.path), + fit: BoxFit.cover, + ), + shape: RoundedRectangleBorder( + side: BorderSide( + width: 0.25, + color: const Color(0xFFB0B0B0), + ), + borderRadius: BorderRadius.circular(4), + ), + ), + ), + Text( + 'مرغ گرم', + textAlign: TextAlign.right, + style: AppFonts.yekan16.copyWith( + color: AppColor.darkGreyDarkActive, + ), + ), + Spacer(), + Icon(CupertinoIcons.chevron_down, size: 18), + ], + ), + _todayShipmentWidget(), + _inventoryWidget(), + ], + ), + ), + ); + }, controller.isExpanded), ), - - child: ObxValue((data) { - return AnimatedSize( - duration: Duration(milliseconds: 300), - child: data.value - ? Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - spacing: 8, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 40, - height: 40, - decoration: ShapeDecoration( - image: DecorationImage( - image: AssetImage(Assets.images.chicken.path), - fit: BoxFit.cover, - ), - shape: RoundedRectangleBorder( - side: BorderSide( - width: 0.25, - color: const Color(0xFFB0B0B0), - ), - borderRadius: BorderRadius.circular(4), - ), - ), - ), - Text( - 'مرغ گرم', - textAlign: TextAlign.right, - style: AppFonts.yekan16.copyWith( - color: AppColor.darkGreyDarkActive, - ), - ), - Spacer(), - AnimatedRotation( - turns: 180, - duration: Duration(milliseconds: 3000), - child: Icon(CupertinoIcons.chevron_up, size: 18), - ), - ], - ), - SizedBox(height: 8), - _todayShipmentWidget(), - - _inventoryWidget(), - - Row( - children: [ - Text( - 'اطلاعات بارها', - textAlign: TextAlign.right, - style: AppFonts.yekan16, - ), - ], - ), - - _informationShipment(), - - Row( - children: [ - Text( - 'اطلاعات توزیع', - textAlign: TextAlign.right, - style: AppFonts.yekan16, - ), - ], - ), - - distributionInformationWidget(), - ], - ), - ) - : Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - spacing: 8, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 40, - height: 40, - decoration: ShapeDecoration( - image: DecorationImage( - image: AssetImage(Assets.images.chicken.path), - fit: BoxFit.cover, - ), - shape: RoundedRectangleBorder( - side: BorderSide( - width: 0.25, - color: const Color(0xFFB0B0B0), - ), - borderRadius: BorderRadius.circular(4), - ), - ), - ), - Text( - 'مرغ گرم', - textAlign: TextAlign.right, - style: AppFonts.yekan16.copyWith( - color: AppColor.darkGreyDarkActive, - ), - ), - Spacer(), - Icon(CupertinoIcons.chevron_down, size: 18), - ], - ), - _todayShipmentWidget(), - _inventoryWidget(), - ], - ), - ), - ); - }, controller.isExpanded), ), - ), - - WidelyUsedWidget(), - ], + + WidelyUsedWidget(), + SizedBox(height: 20,) + ], + ), ), ); } @@ -288,13 +292,18 @@ class HomePage extends GetView { Expanded( child: ObxValue( (data) => _informationLabelCard( - title: 'بارهای امروز', + title: 'بارهای امروز', + titleColor: AppColor.blueNormal, isLoading: data.value == null, description: data.value?.separatedByComma ?? '0', iconPath: Assets.vec.cubeSearchSvg.path, iconColor: AppColor.blueNormal, bgDescriptionColor: Colors.white, - bgLabelColor: Color(0xFFEAEFFF), + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [AppColor.blueLight, Colors.white], + ), ), controller.totalWeightTodayBars, ), @@ -305,30 +314,35 @@ class HomePage extends GetView { return _informationLabelCard( title: 'درانتظار تایید', isLoading: data.value == null, - description: '(${data.value?.totalNotEnteredBars.separatedByComma ?? '0'})', - unit: '(${data.value?.totalNotEnteredKillHouseRequestsWeight.separatedByComma})کیلوگرم', - iconPath: Assets.vec.cubeRotateSvg.path, - iconColor: Color(0xFF8F4124), - bgLabelColor: Color(0xFFF59770), - bgDescriptionColor: Color(0xFFF6DFD8), + description: data.value?.totalNotEnteredBars.separatedByComma ?? '0', + unit: + '(${data.value?.totalNotEnteredKillHouseRequestsWeight.separatedByComma})\nکیلوگرم', + iconPath: Assets.vec.cubeWattingSvg.path, + bgDescriptionColor: Colors.white, + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [const Color(0xFFFFE7BB), Colors.white], + ), ); }, controller.barInformation), ), ], ), ); - } Container _informationLabelCard({ required String title, required String description, + required String iconPath, + required Color bgDescriptionColor, String unit = 'کیلوگرم', bool isLoading = false, - required String iconPath, - required Color iconColor, - required Color bgDescriptionColor, - required Color bgLabelColor, + Color? iconColor, + Color? titleColor, + Color? bgLabelColor, + LinearGradient? gradient, }) { return Container( height: 82, @@ -341,11 +355,12 @@ class HomePage extends GetView { child: Container( height: 82, decoration: BoxDecoration( - color: bgLabelColor, + color: gradient == null ? bgLabelColor : null, borderRadius: BorderRadius.only( topRight: Radius.circular(8), bottomRight: Radius.circular(8), ), + gradient: gradient, ), child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -354,12 +369,16 @@ class HomePage extends GetView { SvgGenImage.vec(iconPath).svg( width: 24, height: 24, - colorFilter: ColorFilter.mode(iconColor, BlendMode.srcIn), + colorFilter: iconColor != null + ? ColorFilter.mode(iconColor, BlendMode.srcIn) + : null, ), Text( title, textAlign: TextAlign.right, - style: AppFonts.yekan14.copyWith(color: AppColor.mediumGreyDarkActive), + style: AppFonts.yekan14.copyWith( + color: titleColor ?? AppColor.mediumGreyDarkActive, + ), ), ], ), diff --git a/packages/chicken/lib/presentation/pages/profile/view.dart b/packages/chicken/lib/presentation/pages/profile/view.dart index f0cef35..59335f8 100644 --- a/packages/chicken/lib/presentation/pages/profile/view.dart +++ b/packages/chicken/lib/presentation/pages/profile/view.dart @@ -75,8 +75,8 @@ class ProfilePage extends GetView { title: 'خروج', selected: true, color: ColorFilter.mode(Colors.redAccent, BlendMode.srcIn), - cardColor:AppColor.error.withValues(alpha: 0.24), - textColor: Colors.red, + cardColor: Color(0xFFEFEFEF), + textColor: AppColor.redDarkerText, onPressed: () { Get.bottomSheet(exitBottomSheet(), isScrollControlled: true); }, @@ -187,9 +187,10 @@ class ProfilePage extends GetView { }) => Container( padding: EdgeInsets.symmetric(horizontal: 12.h, vertical: 6.h), decoration: BoxDecoration( - color: hasColoredBox ? AppColor.blueLight : Colors.transparent, + color: hasColoredBox ? AppColor.greenLight : Colors.transparent, + borderRadius: BorderRadius.circular(8), border: hasColoredBox - ? Border.all(width: 1, color: AppColor.blueLightHover) + ? Border.all(width: 0.25, color: AppColor.bgDark) : Border.all(width: 0, color: Colors.transparent), ), child: Row( @@ -199,14 +200,14 @@ class ProfilePage extends GetView { Padding( padding: const EdgeInsets.only(left: 8.0), child: SvgGenImage.vec(icon).svg( - width: 20, - height: 20, - colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn), + width: 20.w, + height: 20.h, + colorFilter: ColorFilter.mode(AppColor.mediumGreyNormalActive, BlendMode.srcIn), ), ), - Text(title, style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal)), + Text(title, style: AppFonts.yekan12.copyWith(color: AppColor.mediumGreyNormalActive)), Spacer(), - Text(content, style: AppFonts.yekan13.copyWith(color: AppColor.darkGreyNormalHover)), + Text(content, style: AppFonts.yekan13.copyWith(color: AppColor.mediumGreyNormalHover)), ], ), ); @@ -230,7 +231,7 @@ class ProfilePage extends GetView { height: 52, padding: EdgeInsets.all(8), decoration: ShapeDecoration( - color: cardColor??AppColor.blueLight, + color: cardColor ?? AppColor.blueLight, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), ), child: SvgGenImage.vec(icon).svg( diff --git a/packages/chicken/lib/presentation/pages/root/logic.dart b/packages/chicken/lib/presentation/pages/root/logic.dart index 380c3c7..1994afc 100644 --- a/packages/chicken/lib/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/presentation/pages/root/logic.dart @@ -59,7 +59,7 @@ class RootLogic extends GetxController { @override void onReady() { super.onReady(); - // Only call these methods if they haven't been called before + if (provinces.isEmpty) { getProvinces(); } @@ -157,4 +157,5 @@ class RootLogic extends GetxController { onError: (error, stacktrace) {}, ); } + } diff --git a/packages/chicken/lib/presentation/pages/root/view.dart b/packages/chicken/lib/presentation/pages/root/view.dart index 1419f22..6579a21 100644 --- a/packages/chicken/lib/presentation/pages/root/view.dart +++ b/packages/chicken/lib/presentation/pages/root/view.dart @@ -105,19 +105,32 @@ class RootPage extends GetView { label: 'خانه', icon: Assets.vec.homeSvg.path, isSelected: controller.currentPage.value == 2, - onTap: () => controller.changePage(2), + onTap: () { + Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst); + Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst); + controller.changePage(2); + }, ), RBottomNavigationItem( label: 'قطعه بندی', icon: Assets.vec.convertCubeSvg.path, isSelected: controller.currentPage.value == 3, - onTap: () => controller.changePage(3), + onTap: () { + Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst); + Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst); + controller.changePage(3); + }, ), RBottomNavigationItem( label: 'پروفایل', icon: Assets.vec.profileCircleSvg.path, isSelected: controller.currentPage.value == 4, - onTap: () => controller.changePage(4), + onTap: () { + Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst); + Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst); + + controller.changePage(4); + }, ), ], ), diff --git a/packages/core/lib/presentation/common/app_color.dart b/packages/core/lib/presentation/common/app_color.dart index 0b589f9..f676d19 100644 --- a/packages/core/lib/presentation/common/app_color.dart +++ b/packages/core/lib/presentation/common/app_color.dart @@ -4,364 +4,163 @@ class AppColor { AppColor._(); //region --- Blue Colors --- - static const Color blueLight = Color( - 0xFFeaefff, - ); // #eaefff rgb(234, 239, 255) - static const Color blueLightHover = Color( - 0xFFe0e7ff, - ); // #e0e7ff rgb(224, 231, 255) - static const Color blueLightActive = Color( - 0xFFbecdff, - ); // #becdff rgb(190, 205, 255) + static const Color blueLight = Color(0xFFeaefff); // #eaefff rgb(234, 239, 255) + static const Color blueLightHover = Color(0xFFe0e7ff); // #e0e7ff rgb(224, 231, 255) + static const Color blueLightActive = Color(0xFFbecdff); // #becdff rgb(190, 205, 255) static const Color blueNormal = Color(0xFF2d5fff); // #2d5fff rgb(45, 95, 255) - static const Color blueNormalHover = Color( - 0xFF2956e6, - ); // #2956e6 rgb(41, 86, 230) - static const Color blueNormalActive = Color( - 0xFF244ccc, - ); // #244ccc rgb(36, 76, 204) + static const Color blueNormalHover = Color(0xFF2956e6); // #2956e6 rgb(41, 86, 230) + static const Color blueNormalActive = Color(0xFF244ccc); // #244ccc rgb(36, 76, 204) static const Color blueDark = Color(0xFF2247bf); // #2247bf rgb(34, 71, 191) - static const Color blueDarkHover = Color( - 0xFF1b3999, - ); // #1b3999 rgb(27, 57, 153) - static const Color blueDarkActive = Color( - 0xFF142b73, - ); // #142b73 rgb(20, 43, 115) + static const Color blueDarkHover = Color(0xFF1b3999); // #1b3999 rgb(27, 57, 153) + static const Color blueDarkActive = Color(0xFF142b73); // #142b73 rgb(20, 43, 115) static const Color blueDarker = Color(0xFF102159); // #102159 rgb(16, 33, 89) - static const Color blueFlashing = Color(0xFF6F91FF); // #6F91FF rgb(111, 145, 255) + static const Color blueFlashing = Color(0xFF6F91FF); // #6F91FF rgb(111, 145, 255) //endregion //region --- Green Colors --- - static const Color greenLight = Color( - 0xFFe6faf5, - ); // #e6faf5 rgb(230, 250, 245) - static const Color greenLightHover = Color( - 0xFFd9f7f0, - ); // #d9f7f0 rgb(217, 247, 240) - static const Color greenLightActive = Color( - 0xFFb0efdf, - ); // #b0efdf rgb(176, 239, 223) - static const Color greenNormal = Color( - 0xFF00cc99, - ); // #00cc99 rgb(0, 204, 153) - static const Color greenNormalHover = Color( - 0xFF00b88a, - ); // #00b88a rgb(0, 184, 138) - static const Color greenNormalActive = Color( - 0xFF00a37a, - ); // #00a37a rgb(0, 163, 122) + static const Color greenLight = Color(0xFFe6faf5); // #e6faf5 rgb(230, 250, 245) + static const Color greenLightHover = Color(0xFFd9f7f0); // #d9f7f0 rgb(217, 247, 240) + static const Color greenLightActive = Color(0xFFb0efdf); // #b0efdf rgb(176, 239, 223) + static const Color greenNormal = Color(0xFF00cc99); // #00cc99 rgb(0, 204, 153) + static const Color greenNormalHover = Color(0xFF00b88a); // #00b88a rgb(0, 184, 138) + static const Color greenNormalActive = Color(0xFF00a37a); // #00a37a rgb(0, 163, 122) static const Color greenDark = Color(0xFF009973); // #009973 rgb(0, 153, 115) - static const Color greenDarkHover = Color( - 0xFF007a5c, - ); // #007a5c rgb(0, 122, 92) - static const Color greenDarkActive = Color( - 0xFF005c45, - ); // #005c45 rgb(0, 92, 69) + static const Color greenDarkHover = Color(0xFF007a5c); // #007a5c rgb(0, 122, 92) + static const Color greenDarkActive = Color(0xFF005c45); // #005c45 rgb(0, 92, 69) static const Color greenDarker = Color(0xFF004736); // #004736 rgb(0, 71, 54) //endregion //region --- Black Colors --- - static const Color blackLight = Color( - 0xFFe6e6e6, - ); // #e6e6e6 rgb(230, 230, 230) - static const Color blackLightHover = Color( - 0xFFd9d9d9, - ); // #d9d9d9 rgb(217, 217, 217) - static const Color blackLightActive = Color( - 0xFFb0b0b0, - ); // #b0b0b0 rgb(176, 176, 176) + static const Color blackLight = Color(0xFFe6e6e6); // #e6e6e6 rgb(230, 230, 230) + static const Color blackLightHover = Color(0xFFd9d9d9); // #d9d9d9 rgb(217, 217, 217) + static const Color blackLightActive = Color(0xFFb0b0b0); // #b0b0b0 rgb(176, 176, 176) static const Color blackNormal = Color(0xFF000000); // #000000 rgb(0, 0, 0) - static const Color blackNormalHover = Color( - 0xFF000000, - ); // #000000 rgb(0, 0, 0) - static const Color blackNormalActive = Color( - 0xFF000000, - ); // #000000 rgb(0, 0, 0) + static const Color blackNormalHover = Color(0xFF000000); // #000000 rgb(0, 0, 0) + static const Color blackNormalActive = Color(0xFF000000); // #000000 rgb(0, 0, 0) static const Color blackDark = Color(0xFF000000); // #000000 rgb(0, 0, 0) static const Color blackDarkHover = Color(0xFF000000); // #000000 rgb(0, 0, 0) - static const Color blackDarkActive = Color( - 0xFF000000, - ); // #000000 rgb(0, 0, 0) + static const Color blackDarkActive = Color(0xFF000000); // #000000 rgb(0, 0, 0) static const Color blackDarker = Color(0xFF000000); // #000000 rgb(0, 0, 0) //endregion //region --- Grey Colors --- - static const Color darkGreyLight = Color( - 0xFFeaeaea, - ); // #eaeaea rgb(234, 234, 234) - static const Color darkGreyLightHover = Color( - 0xFFdfdfdf, - ); // #dfdfdf rgb(223, 223, 223) - static const Color darkGreyLightActive = Color( - 0xFFbdbdbd, - ); // #bdbdbd rgb(189, 189, 189) - static const Color darkGreyNormal = Color( - 0xFF2a2a2a, - ); // #2a2a2a rgb(42, 42, 42) - static const Color darkGreyNormalHover = Color( - 0xFF262626, - ); // #262626 rgb(38, 38, 38) - static const Color darkGreyNormalActive = Color( - 0xFF222222, - ); // #222222 rgb(34, 34, 34) - static const Color darkGreyDark = Color( - 0xFF202020, - ); // #202020 rgb(32, 32, 32) - static const Color darkGreyDarkHover = Color( - 0xFF191919, - ); // #191919 rgb(25, 25, 25) - static const Color darkGreyDarkActive = Color( - 0xFF131313, - ); // #131313 rgb(19, 19, 19) - static const Color darkGreyDarker = Color( - 0xFF0f0f0f, - ); // #0f0f0f rgb(15, 15, 15) + static const Color darkGreyLight = Color(0xFFeaeaea); // #eaeaea rgb(234, 234, 234) + static const Color darkGreyLightHover = Color(0xFFdfdfdf); // #dfdfdf rgb(223, 223, 223) + static const Color darkGreyLightActive = Color(0xFFbdbdbd); // #bdbdbd rgb(189, 189, 189) + static const Color darkGreyNormal = Color(0xFF2a2a2a); // #2a2a2a rgb(42, 42, 42) + static const Color darkGreyNormalHover = Color(0xFF262626); // #262626 rgb(38, 38, 38) + static const Color darkGreyNormalActive = Color(0xFF222222); // #222222 rgb(34, 34, 34) + static const Color darkGreyDark = Color(0xFF202020); // #202020 rgb(32, 32, 32) + static const Color darkGreyDarkHover = Color(0xFF191919); // #191919 rgb(25, 25, 25) + static const Color darkGreyDarkActive = Color(0xFF131313); // #131313 rgb(19, 19, 19) + static const Color darkGreyDarker = Color(0xFF0f0f0f); // #0f0f0f rgb(15, 15, 15) //endregion //region ---Medium Grey Colors --- - static const Color mediumGreyLight = Color( - 0xFFf4f4f4, - ); // #f4f4f4 rgb(244, 244, 244) - static const Color mediumGreyLightHover = Color( - 0xFFeeeeee, - ); // #eeeeee rgb(238, 238, 238) - static const Color mediumGreyLightActive = Color( - 0xFFdcdcdc, - ); // #dcdcdc rgb(220, 220, 220) - static const Color mediumGreyNormal = Color( - 0xFF8f8f8f, - ); // #8f8f8f rgb(143, 143, 143) - static const Color mediumGreyNormalHover = Color( - 0xFF818181, - ); // #818181 rgb(129, 129, 129) - static const Color mediumGreyNormalActive = Color( - 0xFF727272, - ); // #727272 rgb(114, 114, 114) - static const Color mediumGreyDark = Color( - 0xFF6b6b6b, - ); // #6b6b6b rgb(107, 107, 107) - static const Color mediumGreyDarkHover = Color( - 0xFF565656, - ); // #565656 rgb(86, 86, 86) - static const Color mediumGreyDarkActive = Color( - 0xFF404040, - ); // #404040 rgb(64, 64, 64) - static const Color mediumGreyDarker = Color( - 0xFF323232, - ); // #323232 rgb(50, 50, 50) + static const Color mediumGreyLight = Color(0xFFf4f4f4); // #f4f4f4 rgb(244, 244, 244) + static const Color mediumGreyLightHover = Color(0xFFeeeeee); // #eeeeee rgb(238, 238, 238) + static const Color mediumGreyLightActive = Color(0xFFdcdcdc); // #dcdcdc rgb(220, 220, 220) + static const Color mediumGreyNormal = Color(0xFF8f8f8f); // #8f8f8f rgb(143, 143, 143) + static const Color mediumGreyNormalHover = Color(0xFF818181); // #818181 rgb(129, 129, 129) + static const Color mediumGreyNormalActive = Color(0xFF727272); // #727272 rgb(114, 114, 114) + static const Color mediumGreyDark = Color(0xFF6b6b6b); // #6b6b6b rgb(107, 107, 107) + static const Color mediumGreyDarkHover = Color(0xFF565656); // #565656 rgb(86, 86, 86) + static const Color mediumGreyDarkActive = Color(0xFF404040); // #404040 rgb(64, 64, 64) + static const Color mediumGreyDarker = Color(0xFF323232); // #323232 rgb(50, 50, 50) static const Color customGrey = Color(0xFF808081); // #808081 rgb(128, 128, 129) //endregion //region ---Light Grey Colors --- - static const Color lightGreyLight = Color( - 0xFFfdfdfd, - ); // #fdfdfd rgb(253, 253, 253) - static const Color lightGreyLightHover = Color( - 0xFFfcfcfc, - ); // #fcfcfc rgb(252, 252, 252) - static const Color lightGreyLightActive = Color( - 0xFFfafafa, - ); // #fafafa rgb(250, 250, 250) - static const Color lightGreyNormal = Color( - 0xFFeeeeee, - ); // #eeeeee rgb(238, 238, 238) - static const Color lightGreyNormalHover = Color( - 0xFFd6d6d6, - ); // #d6d6d6 rgb(214, 214, 214) - static const Color lightGreyNormalActive = Color( - 0xFFbebebe, - ); // #bebebe rgb(190, 190, 190) - static const Color lightGreyDark = Color( - 0xFFb3b3b3, - ); // #b3b3b3 rgb(179, 179, 179) - static const Color lightGreyDarkHover = Color( - 0xFF8f8f8f, - ); // #8f8f8f rgb(143, 143, 143) - static const Color lightGreyDarkActive = Color( - 0xFF6b6b6b, - ); // #6b6b6b rgb(107, 107, 107) - static const Color lightGreyDarker = Color( - 0xFF535353, - ); // #535353 rgb(83, 83, 83) + static const Color lightGreyLight = Color(0xFFfdfdfd); // #fdfdfd rgb(253, 253, 253) + static const Color lightGreyLightHover = Color(0xFFfcfcfc); // #fcfcfc rgb(252, 252, 252) + static const Color lightGreyLightActive = Color(0xFFfafafa); // #fafafa rgb(250, 250, 250) + static const Color lightGreyNormal = Color(0xFFeeeeee); // #eeeeee rgb(238, 238, 238) + static const Color lightGreyNormalHover = Color(0xFFd6d6d6); // #d6d6d6 rgb(214, 214, 214) + static const Color lightGreyNormalActive = Color(0xFFbebebe); // #bebebe rgb(190, 190, 190) + static const Color lightGreyDark = Color(0xFFb3b3b3); // #b3b3b3 rgb(179, 179, 179) + static const Color lightGreyDarkHover = Color(0xFF8f8f8f); // #8f8f8f rgb(143, 143, 143) + static const Color lightGreyDarkActive = Color(0xFF6b6b6b); // #6b6b6b rgb(107, 107, 107) + static const Color lightGreyDarker = Color(0xFF535353); // #535353 rgb(83, 83, 83) //endregion //region ---WhiteGrey Colors --- - static const Color whiteGreyLight = Color( - 0xFFfefefe, - ); // #fefefe rgb(254, 254, 254) - static const Color whiteGreyLightHover = Color( - 0xFFfefefe, - ); // #fefefe rgb(254, 254, 254) - static const Color whiteGreyLightActive = Color( - 0xFFfdfdfd, - ); // #fdfdfd rgb(253, 253, 253) - static const Color whiteGreyNormal = Color( - 0xFFf9f9f9, - ); // #f9f9f9 rgb(249, 249, 249) - static const Color whiteGreyNormalHover = Color( - 0xFFe0e0e0, - ); // #e0e0e0 rgb(224, 224, 224) - static const Color whiteGreyNormalActive = Color( - 0xFFc7c7c7, - ); // #c7c7c7 rgb(199, 199, 199) - static const Color whiteGreyDark = Color( - 0xFFbbbbbb, - ); // #bbbbbb rgb(187, 187, 187) - static const Color whiteGreyDarkHover = Color( - 0xFF959595, - ); // #959595 rgb(149, 149, 149) - static const Color whiteGreyDarkActive = Color( - 0xFF707070, - ); // #707070 rgb(112, 112, 112) - static const Color whiteGreyDarker = Color( - 0xFF575757, - ); // #575757 rgb(87, 87, 87) + static const Color whiteGreyLight = Color(0xFFfefefe); // #fefefe rgb(254, 254, 254) + static const Color whiteGreyLightHover = Color(0xFFfefefe); // #fefefe rgb(254, 254, 254) + static const Color whiteGreyLightActive = Color(0xFFfdfdfd); // #fdfdfd rgb(253, 253, 253) + static const Color whiteGreyNormal = Color(0xFFf9f9f9); // #f9f9f9 rgb(249, 249, 249) + static const Color whiteGreyNormalHover = Color(0xFFe0e0e0); // #e0e0e0 rgb(224, 224, 224) + static const Color whiteGreyNormalActive = Color(0xFFc7c7c7); // #c7c7c7 rgb(199, 199, 199) + static const Color whiteGreyDark = Color(0xFFbbbbbb); // #bbbbbb rgb(187, 187, 187) + static const Color whiteGreyDarkHover = Color(0xFF959595); // #959595 rgb(149, 149, 149) + static const Color whiteGreyDarkActive = Color(0xFF707070); // #707070 rgb(112, 112, 112) + static const Color whiteGreyDarker = Color(0xFF575757); // #575757 rgb(87, 87, 87) //endregion //region ---White Colors --- - static const Color whiteLight = Color( - 0xFFffffff, - ); // #ffffff rgb(255, 255, 255) - static const Color whiteLightHover = Color( - 0xFFffffff, - ); // #ffffff rgb(255, 255, 255) - static const Color whiteLightActive = Color( - 0xFFffffff, - ); // #ffffff rgb(255, 255, 255) - static const Color whiteNormal = Color( - 0xFFffffff, - ); // #ffffff rgb(255, 255, 255) - static const Color whiteNormalHover = Color( - 0xFFe6e6e6, - ); // #e6e6e6 rgb(230, 230, 230) - static const Color whiteNormalActive = Color( - 0xFFcccccc, - ); // #cccccc rgb(204, 204, 204) - static const Color whiteDark = Color( - 0xFFbfbfbf, - ); // #bfbfbf rgb(191, 191, 191) - static const Color whiteDarkHover = Color( - 0xFF999999, - ); // #999999 rgb(153, 153, 153) - static const Color whiteDarkActive = Color( - 0xFF737373, - ); // #737373 rgb(115, 115, 115) + static const Color whiteLight = Color(0xFFffffff); // #ffffff rgb(255, 255, 255) + static const Color whiteLightHover = Color(0xFFffffff); // #ffffff rgb(255, 255, 255) + static const Color whiteLightActive = Color(0xFFffffff); // #ffffff rgb(255, 255, 255) + static const Color whiteNormal = Color(0xFFffffff); // #ffffff rgb(255, 255, 255) + static const Color whiteNormalHover = Color(0xFFe6e6e6); // #e6e6e6 rgb(230, 230, 230) + static const Color whiteNormalActive = Color(0xFFcccccc); // #cccccc rgb(204, 204, 204) + static const Color whiteDark = Color(0xFFbfbfbf); // #bfbfbf rgb(191, 191, 191) + static const Color whiteDarkHover = Color(0xFF999999); // #999999 rgb(153, 153, 153) + static const Color whiteDarkActive = Color(0xFF737373); // #737373 rgb(115, 115, 115) static const Color whiteDarker = Color(0xFF595959); // #595959 rgb(89, 89, 89) //endregion //region --- green1 Colors --- - static const Color green1Light = Color( - 0xFFe6f6f4, - ); // #e6f6f4 rgb(230, 246, 244) - static const Color green1LightHover = Color( - 0xFFd9f2ef, - ); // #d9f2ef rgb(217, 242, 239) - static const Color green1LightActive = Color( - 0xFFb0e4dd, - ); // #b0e4dd rgb(176, 228, 221) - static const Color green1Normal = Color( - 0xFF00a991, - ); // #00a991 rgb(0, 169, 145) - static const Color green1NormalHover = Color( - 0xFF009883, - ); // #009883 rgb(0, 152, 131) - static const Color green1NormalActive = Color( - 0xFF008774, - ); // #008774 rgb(0, 135, 116) + static const Color green1Light = Color(0xFFe6f6f4); // #e6f6f4 rgb(230, 246, 244) + static const Color green1LightHover = Color(0xFFd9f2ef); // #d9f2ef rgb(217, 242, 239) + static const Color green1LightActive = Color(0xFFb0e4dd); // #b0e4dd rgb(176, 228, 221) + static const Color green1Normal = Color(0xFF00a991); // #00a991 rgb(0, 169, 145) + static const Color green1NormalHover = Color(0xFF009883); // #009883 rgb(0, 152, 131) + static const Color green1NormalActive = Color(0xFF008774); // #008774 rgb(0, 135, 116) static const Color green1Dark = Color(0xFF007f6d); // #007f6d rgb(0, 127, 109) - static const Color green1DarkHover = Color( - 0xFF006557, - ); // #006557 rgb(0, 101, 87) - static const Color green1DarkActive = Color( - 0xFF004c41, - ); // #004c41 rgb(0, 76, 65) + static const Color green1DarkHover = Color(0xFF006557); // #006557 rgb(0, 101, 87) + static const Color green1DarkActive = Color(0xFF004c41); // #004c41 rgb(0, 76, 65) static const Color green1Darker = Color(0xFF003b33); // #003b33 rgb(0, 59, 51) //endregion //region --- Yellow Colors --- - static const Color yellowLight = Color( - 0xFFfff9e6, - ); // #fff9e6 rgb(255, 249, 230) - static const Color yellowLightHover = Color( - 0xFFfff6da, - ); // #fff6da rgb(255, 246, 218) - static const Color yellowLightActive = Color( - 0xFFffecb2, - ); // #ffecb2 rgb(255, 236, 178) - static const Color yellowNormal = Color( - 0xFFffc107, - ); // #ffc107 rgb(255, 193, 7) - static const Color yellowNormalHover = Color( - 0xFFe6ae06, - ); // #e6ae06 rgb(230, 174, 6) - static const Color yellowNormalActive = Color( - 0xFFcc9a06, - ); // #cc9a06 rgb(204, 154, 6) + static const Color yellowLight = Color(0xFFfff9e6); // #fff9e6 rgb(255, 249, 230) + static const Color yellowLightHover = Color(0xFFfff6da); // #fff6da rgb(255, 246, 218) + static const Color yellowLightActive = Color(0xFFffecb2); // #ffecb2 rgb(255, 236, 178) + static const Color yellowNormal = Color(0xFFffc107); // #ffc107 rgb(255, 193, 7) + static const Color yellowNormalHover = Color(0xFFe6ae06); // #e6ae06 rgb(230, 174, 6) + static const Color yellowNormalActive = Color(0xFFcc9a06); // #cc9a06 rgb(204, 154, 6) static const Color yellowDark = Color(0xFFbf9105); // #bf9105 rgb(191, 145, 5) - static const Color yellowDarkHover = Color( - 0xFF997404, - ); // #997404 rgb(153, 116, 4) - static const Color yellowDarkActive = Color( - 0xFF735703, - ); // #735703 rgb(115, 87, 3) + static const Color yellowDarkHover = Color(0xFF997404); // #997404 rgb(153, 116, 4) + static const Color yellowDarkActive = Color(0xFF735703); // #735703 rgb(115, 87, 3) static const Color yellowDarker = Color(0xFF594402); // #594402 rgb(89, 68, 2) //endregion //region --- red Colors --- static const Color redLight = Color(0xFFfdeeee); // #fdeeee rgb(253, 238, 238) - static const Color redLightHover = Color( - 0xFFfce6e6, - ); // #fce6e6 rgb(252, 230, 230) - static const Color redLightActive = Color( - 0xFFf9cbcb, - ); // #f9cbcb rgb(249, 203, 203) + static const Color redLightHover = Color(0xFFfce6e6); // #fce6e6 rgb(252, 230, 230) + static const Color redLightActive = Color(0xFFf9cbcb); // #f9cbcb rgb(249, 203, 203) static const Color redNormal = Color(0xFFeb5757); // #eb5757 rgb(235, 87, 87) - static const Color redNormalHover = Color( - 0xFFd44e4e, - ); // #d44e4e rgb(212, 78, 78) - static const Color redNormalActive = Color( - 0xFFbc4646, - ); // #bc4646 rgb(188, 70, 70) + static const Color redNormalHover = Color(0xFFd44e4e); // #d44e4e rgb(212, 78, 78) + static const Color redNormalActive = Color(0xFFbc4646); // #bc4646 rgb(188, 70, 70) static const Color redDark = Color(0xFFb04141); // #b04141 rgb(176, 65, 65) - static const Color redDarkHover = Color( - 0xFF8d3434, - ); // #8d3434 rgb(141, 52, 52) - static const Color redDarkActive = Color( - 0xFF6a2727, - ); // #6a2727 rgb(106, 39, 39) + static const Color redDarkHover = Color(0xFF8d3434); // #8d3434 rgb(141, 52, 52) + static const Color redDarkActive = Color(0xFF6a2727); // #6a2727 rgb(106, 39, 39) static const Color redDarker = Color(0xFF521e1e); // #521e1e rgb(82, 30, 30) + static const Color redDarkerText = Color(0xFFD24E4E); // #D34E4E rgba(211, 78, 78, 1) //endregion //region --- Teal Colors --- - static const Color tealLight = Color( - 0xFFe8f6f8, - ); // #e8f6f8 rgb(232, 246, 248) - static const Color tealLightHover = Color( - 0xFFdcf1f4, - ); // #dcf1f4 rgb(220, 241, 244) - static const Color tealLightActive = Color( - 0xFFb7e2e9, - ); // #b7e2e9 rgb(183, 226, 233) - static const Color tealNormal = Color( - 0xFF17a2b8, - ); // #17a2b8 rgb(23, 162, 184) - static const Color tealNormalHover = Color( - 0xFF1592a6, - ); // #1592a6 rgb(21, 146, 166) - static const Color tealNormalActive = Color( - 0xFF128293, - ); // #128293 rgb(18, 130, 147) + static const Color tealLight = Color(0xFFe8f6f8); // #e8f6f8 rgb(232, 246, 248) + static const Color tealLightHover = Color(0xFFdcf1f4); // #dcf1f4 rgb(220, 241, 244) + static const Color tealLightActive = Color(0xFFb7e2e9); // #b7e2e9 rgb(183, 226, 233) + static const Color tealNormal = Color(0xFF17a2b8); // #17a2b8 rgb(23, 162, 184) + static const Color tealNormalHover = Color(0xFF1592a6); // #1592a6 rgb(21, 146, 166) + static const Color tealNormalActive = Color(0xFF128293); // #128293 rgb(18, 130, 147) static const Color tealDark = Color(0xFF117a8a); // #117a8a rgb(17, 122, 138) - static const Color tealDarkHover = Color( - 0xFF0e616e, - ); // #0e616e rgb(14, 97, 110) - static const Color tealDarkActive = Color( - 0xFF0a4953, - ); // #0a4953 rgb(10, 73, 83) + static const Color tealDarkHover = Color(0xFF0e616e); // #0e616e rgb(14, 97, 110) + static const Color tealDarkActive = Color(0xFF0a4953); // #0a4953 rgb(10, 73, 83) static const Color tealDarker = Color(0xFF083940); // #083940 rgb(8, 57, 64) - - static const Color bgLight = Color(0xFFF5F5F5); // #083940 rgb(8, 57, 64) static const Color bgIcon = Color(0xFF797979); // #797979 static const Color bgDark = Color(0xFF979797); // #083940 rgb(8, 57, 64) @@ -372,8 +171,8 @@ class AppColor { //region --- category Colors --- static const Color confirm = greenNormalActive; - static const Color warning =yellowNormal; - static const Color error =redNormal; + static const Color warning = yellowNormal; + static const Color error = redNormal; static const Color info = tealNormal; //endregion } diff --git a/packages/core/lib/presentation/common/assets.gen.dart b/packages/core/lib/presentation/common/assets.gen.dart index 59e9001..1e6f6ef 100644 --- a/packages/core/lib/presentation/common/assets.gen.dart +++ b/packages/core/lib/presentation/common/assets.gen.dart @@ -101,6 +101,9 @@ class $AssetsIconsGen { /// File path: assets/icons/cube_top_rotation.svg SvgGenImage get cubeTopRotation => const SvgGenImage('assets/icons/cube_top_rotation.svg'); + /// File path: assets/icons/cube_watting.svg + SvgGenImage get cubeWatting => const SvgGenImage('assets/icons/cube_watting.svg'); + /// File path: assets/icons/diagram.svg SvgGenImage get diagram => const SvgGenImage('assets/icons/diagram.svg'); @@ -268,6 +271,7 @@ class $AssetsIconsGen { cubeScan, cubeSearch, cubeTopRotation, + cubeWatting, diagram, download, edit, @@ -422,6 +426,9 @@ class $AssetsVecGen { /// File path: assets/vec/cube_top_rotation.svg.vec SvgGenImage get cubeTopRotationSvg => const SvgGenImage.vec('assets/vec/cube_top_rotation.svg.vec'); + /// File path: assets/vec/cube_watting.svg.vec + SvgGenImage get cubeWattingSvg => const SvgGenImage.vec('assets/vec/cube_watting.svg.vec'); + /// File path: assets/vec/diagram.svg.vec SvgGenImage get diagramSvg => const SvgGenImage.vec('assets/vec/diagram.svg.vec'); @@ -589,6 +596,7 @@ class $AssetsVecGen { cubeScanSvg, cubeSearchSvg, cubeTopRotationSvg, + cubeWattingSvg, diagramSvg, downloadSvg, editSvg,