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 0000000..8f06121 Binary files /dev/null and b/assets/vec/cube_watting.svg.vec differ diff --git a/assets/vec/empty.svg.vec b/assets/vec/empty.svg.vec index f0a85a0..b60778f 100644 Binary files a/assets/vec/empty.svg.vec and b/assets/vec/empty.svg.vec differ 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,