feat: add Poultry Farm Inspection module with navigation and logic

android/local.properties

@@ -1,4 +1,4 @@
-sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
+sdk.dir=C:\\Users\\Housh11\\AppData\\Local\\Android\\sdk
 flutter.sdk=C:\\src\\flutter
 flutter.buildMode=debug
 flutter.versionName=1.3.33

packages/chicken/lib/presentation/pages/common/auth/logic.dart

@@ -122,6 +122,15 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
         var tmpRoles = result?.role
             ?.where((element) => element == 'PoultryScience' || element == 'Steward')
             .toList();
+
+        /*var tmpRoles = result?.role?.where((element) {
+          return element == 'PoultryScience' ||
+              element == 'Steward' ||
+              element == 'CityOperator' ||
+              element == 'CityJahad' ||
+              element.toLowerCase().contains("admin");
+        }).toList();*/
+
         await tokenStorageService.saveRoles(_module, tmpRoles ?? []);
         if (rememberMe.value) {
           await tokenStorageService.saveUserPass(

packages/chicken/lib/presentation/pages/common/role/view.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_chicken/data/common/fa_user_role.dart';
-import 'package:rasadyar_chicken/presentation/widget/app_bar.dart';
 import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
 import 'package:rasadyar_core/core.dart';
 
@@ -15,11 +14,7 @@ class RolePage extends GetView<RoleLogic> {
       isBase: true,
       child: Column(
         children: [
-          Assets.images.selectRole.image(
+          Assets.images.selectRole.image(height: 212.h, width: Get.width.w, fit: BoxFit.cover),
-            height: 212.h,
-            width: Get.width.w,
-            fit: BoxFit.cover,
-          ),
           ObxValue((data) {
             return Expanded(
               child: GridView.builder(
@@ -38,15 +33,9 @@ class RolePage extends GetView<RoleLogic> {
                     title: role.keys.first,
                     onTap: () async {
                       String route = role.values.first;
-                      await controller.gService.saveRoute(
+                      await controller.gService.saveRoute(Module.chicken, route);
-                        Module.chicken,
-                        route,
-                      );
 
-                      await controller.gService.saveRole(
+                      await controller.gService.saveRole(Module.chicken, data[index]);
-                        Module.chicken,
-                        data[index],
-                      );
                       Get.offAllNamed(route);
                     },
                   );
@@ -58,17 +47,9 @@ class RolePage extends GetView<RoleLogic> {
       ),
     );
   }
-
-
 }
 
-
+Widget roleCard({required String title, Function()? onTap, int? width, int? height}) {
-Widget roleCard({
-  required String title,
-  Function()? onTap,
-  int? width,
-  int? height,
-}) {
   return Container(
     width: width?.w ?? 128.w,
     height: height?.h ?? 48.h,
@@ -84,6 +65,7 @@ Widget roleCard({
         child: Text(
           title,
           style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal),
+          textAlign: TextAlign.center,
         ),
       ),
     ),

packages/chicken/lib/presentation/pages/poultry_farm_inspection/home/logic.dart

@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_core/core.dart';
+
+class PoultryFarmInspectionHomeLogic extends GetxController
+    with GetTickerProviderStateMixin {
+  RxInt selectedSegmentIndex = 0.obs;
+  RxList<Resource<PaginationModel<String>>> inspectionList = RxList([
+    Resource<PaginationModel<String>>.success(
+      PaginationModel(results: ["s", "b", "c", "d"]),
+    ),
+  ]);
+  RxList<Resource<PaginationModel<String>>> inactiveInspectionList = RxList([
+    Resource<PaginationModel<String>>.success(
+      PaginationModel(results: ["s", "b", "c", "d"]),
+    ),
+  ]);
+
+  RxInt expandedIndex = RxInt(-1);
+
+  late TabController tabController;
+
+  RxInt selectedTabIndex = 0.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    tabController = TabController(length: 4, vsync: this);
+  }
+
+  @override
+  void onReady() {
+    // TODO: implement onReady
+    super.onReady();
+  }
+
+  @override
+  void onClose() {
+    // TODO: implement onClose
+    super.onClose();
+  }
+
+  void toggleExpanded(int index) {
+    expandedIndex.value = expandedIndex.value == index ? -1 : index;
+  }
+
+  void changeSegmentIndex(int index) {
+    if (index == selectedSegmentIndex.value) {
+      return;
+    }
+    expandedIndex.value = -1;
+    selectedSegmentIndex.value = index;
+  }
+
+  void changeTab(int index) {
+    if (index == selectedTabIndex.value) {
+      return;
+    }
+    selectedTabIndex.value = index;
+  } 
+}

packages/chicken/lib/presentation/pages/poultry_farm_inspection/poultry_farm_inspection.dart

@@ -0,0 +1,2 @@
+export 'home/logic.dart';
+export 'home/view.dart';

packages/chicken/lib/presentation/pages/poultry_farm_inspection/root/logic.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:rasadyar_core/presentation/common/app_color.dart';
+
+class PoultryFarmInspectionRootLogic extends GetxController {
+  DateTime? _lastBackPressed;
+  final pages = [
+    Container(color: Colors.amber),
+    Container(color: Colors.blue),
+    Container(color: Colors.red),
+  ];
+
+  RxInt currentPage = 0.obs;
+
+  @override
+  void onReady() {
+    // TODO: implement onReady
+    super.onReady();
+  }
+
+  @override
+  void onClose() {
+    // TODO: implement onClose
+    super.onClose();
+  }
+
+  void changePage(int index) {
+    currentPage.value = index;
+  }
+
+  void popBackTaped() async {
+    final now = DateTime.now();
+    if (_lastBackPressed == null || now.difference(_lastBackPressed!) > Duration(seconds: 2)) {
+      _lastBackPressed = now;
+      Get.snackbar(
+        'خروج از برنامه',
+        'برای خروج دوباره بازگشت را بزنید',
+        snackPosition: SnackPosition.TOP,
+        duration: Duration(seconds: 2),
+        backgroundColor: AppColor.warning,
+      );
+    }
+  }
+}

packages/chicken/lib/presentation/pages/poultry_farm_inspection/root/view.dart

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+import 'logic.dart';
+
+class PoultryFarmInspectionRootPage extends GetView<PoultryFarmInspectionRootLogic> {
+  const PoultryFarmInspectionRootPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      isFullScreen: true,
+      onPopScopTaped: controller.popBackTaped,
+      child: ObxValue((data) {
+        return Stack(
+          children: [
+            IndexedStack(children: controller.pages, index: data.value),
+            Positioned(
+              right: 0,
+              left: 0,
+              bottom: 0,
+              child: RBottomNavigation(
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                items: [
+                  RBottomNavigationItem(
+                    label: 'بازرسی فعال',
+                    icon: Assets.vec.settingSvg.path,
+                    isSelected: controller.currentPage.value == 0,
+                    onTap: () {
+                      controller.changePage(0);
+                    },
+                  ),
+                  RBottomNavigationItem(
+                    label: 'خانه',
+                    icon: Assets.vec.homeSvg.path,
+                    isSelected: controller.currentPage.value == 1,
+                    onTap: () {
+                      controller.changePage(1);
+                    },
+                  ),
+                  RBottomNavigationItem(
+                    label: 'پروفایل',
+                    icon: Assets.vec.profileCircleSvg.path,
+                    isSelected: controller.currentPage.value == 2,
+                    onTap: () {
+                      controller.changePage(3);
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ],
+        );
+      }, controller.currentPage),
+    );
+  }
+}

packages/chicken/lib/presentation/pages/poultry_science/poultry_action/logic.dart

@@ -31,5 +31,11 @@ class PoultryActionLogic extends GetxController {
       route: ChickenRoutes.activeHatchingPoultryScience,
       icon: Assets.vec.activeFramSvg.path,
     ),
+
+    PoultryActionItem(
+      title: "بازرسی مزارع طیور",
+      route: ChickenRoutes.poultryFarmInspectionHome,
+      icon: Assets.vec.activeFramSvg.path,
+    ),
   ].obs;
 }

packages/chicken/lib/presentation/pages/poultry_science/poultry_action/view.dart

@@ -31,7 +31,6 @@ class PoultryActionPage extends GetView<PoultryActionLogic> {
             title: item.title,
             vecIcon: item.icon,
             onTap: () async {
-
               Get.toNamed(item.route, id: poultryFirstKey);
             },
           );

packages/chicken/lib/presentation/routes/pages.dart

@@ -2,6 +2,7 @@ import 'package:rasadyar_chicken/presentation/pages/common/auth/logic.dart';
 import 'package:rasadyar_chicken/presentation/pages/common/auth/view.dart';
 import 'package:rasadyar_chicken/presentation/pages/common/role/logic.dart';
 import 'package:rasadyar_chicken/presentation/pages/common/role/view.dart';
+import 'package:rasadyar_chicken/presentation/pages/poultry_farm_inspection/poultry_farm_inspection.dart';
 import 'package:rasadyar_chicken/presentation/pages/poultry_science/active_hatching/logic.dart';
 import 'package:rasadyar_chicken/presentation/pages/poultry_science/active_hatching/view.dart';
 import 'package:rasadyar_chicken/presentation/pages/poultry_science/farm/logic.dart';
@@ -69,7 +70,6 @@ sealed class ChickenPages {
       page: () => HomePage(),
       middlewares: [AuthMiddleware()],
       binding: BindingsBuilder(() {
-
         Get.put(HomeLogic());
         Get.lazyPut(() => BaseLogic());
       }),
@@ -223,5 +223,16 @@ sealed class ChickenPages {
       }),
     ),
     //endregion
+
+    //region Poultry Farm Inspection
+    GetPage(
+      name: ChickenRoutes.poultryFarmInspectionHome,
+      page: () => PoultryFarmInspectionHomePage(),
+      binding: BindingsBuilder(() {
+        Get.lazyPut(() => PoultryFarmInspectionHomeLogic());
+        Get.lazyPut(() => BaseLogic(), fenix: true);
+      }),
+    ),
+    //endregion
   ];
 }

packages/chicken/lib/presentation/routes/routes.dart

@@ -35,7 +35,11 @@ sealed class ChickenRoutes {
   static const genocidePoultryScience = '$_poultryScience/genocidePoultryScience';
   static const killingRegistrationPoultryScience = '$genocidePoultryScience/KillingRegistration';
 
+  //endregion
 
+  //region poultry Farm Inspection
+  static const _poultryFarmInspection = '$_base/poultryFarmInspection';
+  static const poultryFarmInspectionHome = '$_poultryFarmInspection/Home';
 
   //endregion
 }

packages/chicken/lib/presentation/widget/info_card/info_card.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_core/core.dart';
+
+Widget cardInfo({
+  required int value,
+  required String description,
+  required Color color,
+}) {
+  return Container(
+    width: 93.w,
+    height: 53.h,
+    decoration: BoxDecoration(
+      color: color,
+      borderRadius: BorderRadius.circular(8),
+      border: Border.all(
+        width: 0.50,
+        color: const Color.fromARGB(54, 169, 169, 169),
+      ),
+    ),
+    child: Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      spacing: 4,
+      children: [
+        Text(
+          value.separatedByCommaFa,
+          style: AppFonts.yekan13Bold.copyWith(color: AppColor.textColor),
+        ),
+        Text(
+          description,
+          style: AppFonts.yekan10.copyWith(color: AppColor.textColor),
+        ),
+      ],
+    ),
+  );
+}

packages/core/lib/presentation/common/app_color.dart

@@ -4,136 +4,319 @@ class AppColor {
   AppColor._();
 
   //region --- Blue Colors ---
-  static const Color blueLight = Color(0xFFeaefff); // #eaefff rgb(234, 239, 255)
+  static const Color blueLight = Color(
-  static const Color blueLightHover = Color(0xFFe0e7ff); // #e0e7ff rgb(224, 231, 255)
+    0xFFeaefff,
-  static const Color blueLightActive = Color(0xFFbecdff); // #becdff rgb(190, 205, 255)
+  ); // #eaefff rgb(234, 239, 255)
-  static const Color blueNormalOld = Color(0xFF2d5fff); // #2d5fff rgb(45, 95, 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 blueNormalOld = Color(
+    0xFF2d5fff,
+  ); // #2d5fff rgb(45, 95, 255)
   static const Color blueNormal = blueDark;
-  static const Color blueNormalHover = Color(0xFF2956e6); // #2956e6 rgb(41, 86, 230)
+  static const Color blueNormalHover = Color(
-  static const Color blueNormalActive = Color(0xFF244ccc); // #244ccc rgb(36, 76, 204)
+    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 blueDarkHover = Color(
-  static const Color blueDarkActive = Color(0xFF142b73); // #142b73 rgb(20, 43, 115)
+    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 greenLight = Color(
-  static const Color greenLightHover = Color(0xFFd9f7f0); // #d9f7f0 rgb(217, 247, 240)
+    0xFFe6faf5,
-  static const Color greenLightActive = Color(0xFFb0efdf); // #b0efdf rgb(176, 239, 223)
+  ); // #e6faf5 rgb(230, 250, 245)
-  static const Color greenNormal = Color(0xFF00cc99); // #00cc99 rgb(0, 204, 153)
+  static const Color greenLightHover = Color(
-  static const Color greenNormalHover = Color(0xFF00b88a); // #00b88a rgb(0, 184, 138)
+    0xFFd9f7f0,
-  static const Color greenNormalActive = Color(0xFF00a37a); // #00a37a rgb(0, 163, 122)
+  ); // #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 greenDarkHover = Color(
-  static const Color greenDarkActive = Color(0xFF005c45); // #005c45 rgb(0, 92, 69)
+    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 blackLight = Color(
-  static const Color blackLightHover = Color(0xFFd9d9d9); // #d9d9d9 rgb(217, 217, 217)
+    0xFFe6e6e6,
-  static const Color blackLightActive = Color(0xFFb0b0b0); // #b0b0b0 rgb(176, 176, 176)
+  ); // #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 blackNormalHover = Color(
-  static const Color blackNormalActive = Color(0xFF000000); // #000000 rgb(0, 0, 0)
+    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 darkGreyLight = Color(
-  static const Color darkGreyLightHover = Color(0xFFdfdfdf); // #dfdfdf rgb(223, 223, 223)
+    0xFFeaeaea,
-  static const Color darkGreyLightActive = Color(0xFFbdbdbd); // #bdbdbd rgb(189, 189, 189)
+  ); // #eaeaea rgb(234, 234, 234)
-  static const Color darkGreyNormal = Color(0xFF2a2a2a); // #2a2a2a rgb(42, 42, 42)
+  static const Color darkGreyLightHover = Color(
-  static const Color darkGreyNormalHover = Color(0xFF262626); // #262626 rgb(38, 38, 38)
+    0xFFdfdfdf,
-  static const Color darkGreyNormalActive = Color(0xFF222222); // #222222 rgb(34, 34, 34)
+  ); // #dfdfdf rgb(223, 223, 223)
-  static const Color darkGreyDark = Color(0xFF202020); // #202020 rgb(32, 32, 32)
+  static const Color darkGreyLightActive = Color(
-  static const Color darkGreyDarkHover = Color(0xFF191919); // #191919 rgb(25, 25, 25)
+    0xFFbdbdbd,
-  static const Color darkGreyDarkActive = Color(0xFF131313); // #131313 rgb(19, 19, 19)
+  ); // #bdbdbd rgb(189, 189, 189)
-  static const Color darkGreyDarker = Color(0xFF0f0f0f); // #0f0f0f rgb(15, 15, 15)
+  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 mediumGrey = Color(
-  static const Color mediumGreyLightHover = Color(0xFFeeeeee); // #eeeeee rgb(238, 238, 238)
+    0xFF979797,
-  static const Color mediumGreyLightActive = Color(0xFFdcdcdc); // #dcdcdc rgb(220, 220, 220)
+  ); // #979797 rgb(151, 151, 151)
-  static const Color mediumGreyNormal = Color(0xFF8f8f8f); // #8f8f8f rgb(143, 143, 143)
+  static const Color mediumGreyLight = Color(
-  static const Color mediumGreyNormalHover = Color(0xFF818181); // #818181 rgb(129, 129, 129)
+    0xFFf4f4f4,
-  static const Color mediumGreyNormalActive = Color(0xFF727272); // #727272 rgb(114, 114, 114)
+  ); // #f4f4f4 rgb(244, 244, 244)
-  static const Color mediumGreyDark = Color(0xFF6b6b6b); // #6b6b6b rgb(107, 107, 107)
+  static const Color mediumGreyLightHover = Color(
-  static const Color mediumGreyDarkHover = Color(0xFF565656); // #565656 rgb(86, 86, 86)
+    0xFFeeeeee,
-  static const Color mediumGreyDarkActive = Color(0xFF404040); // #404040 rgb(64, 64, 64)
+  ); // #eeeeee rgb(238, 238, 238)
-  static const Color mediumGreyDarker = Color(0xFF323232); // #323232 rgb(50, 50, 50)
+  static const Color mediumGreyLightActive = Color(
-  static const Color customGrey = Color(0xFF808081); // #808081 rgb(128, 128, 129)
+    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 lightGreyLight = Color(
-  static const Color lightGreyLightHover = Color(0xFFfcfcfc); // #fcfcfc rgb(252, 252, 252)
+    0xFFfdfdfd,
-  static const Color lightGreyLightActive = Color(0xFFfafafa); // #fafafa rgb(250, 250, 250)
+  ); // #fdfdfd rgb(253, 253, 253)
-  static const Color lightGreyNormal = Color(0xFFeeeeee); // #eeeeee rgb(238, 238, 238)
+  static const Color lightGreyLightHover = Color(
-  static const Color lightGreyNormalHover = Color(0xFFd6d6d6); // #d6d6d6 rgb(214, 214, 214)
+    0xFFfcfcfc,
-  static const Color lightGreyNormalActive = Color(0xFFbebebe); // #bebebe rgb(190, 190, 190)
+  ); // #fcfcfc rgb(252, 252, 252)
-  static const Color lightGreyDark = Color(0xFFb3b3b3); // #b3b3b3 rgb(179, 179, 179)
+  static const Color lightGreyLightActive = Color(
-  static const Color lightGreyDarkHover = Color(0xFF8f8f8f); // #8f8f8f rgb(143, 143, 143)
+    0xFFfafafa,
-  static const Color lightGreyDarkActive = Color(0xFF6b6b6b); // #6b6b6b rgb(107, 107, 107)
+  ); // #fafafa rgb(250, 250, 250)
-  static const Color lightGreyDarker = Color(0xFF535353); // #535353 rgb(83, 83, 83)
+  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 whiteGreyLight = Color(
-  static const Color whiteGreyLightHover = Color(0xFFfefefe); // #fefefe rgb(254, 254, 254)
+    0xFFfefefe,
-  static const Color whiteGreyLightActive = Color(0xFFfdfdfd); // #fdfdfd rgb(253, 253, 253)
+  ); // #fefefe rgb(254, 254, 254)
-  static const Color whiteGreyNormal = Color(0xFFf9f9f9); // #f9f9f9 rgb(249, 249, 249)
+  static const Color whiteGreyLightHover = Color(
-  static const Color whiteGreyNormalHover = Color(0xFFe0e0e0); // #e0e0e0 rgb(224, 224, 224)
+    0xFFfefefe,
-  static const Color whiteGreyNormalActive = Color(0xFFc7c7c7); // #c7c7c7 rgb(199, 199, 199)
+  ); // #fefefe rgb(254, 254, 254)
-  static const Color whiteGreyDark = Color(0xFFbbbbbb); // #bbbbbb rgb(187, 187, 187)
+  static const Color whiteGreyLightActive = Color(
-  static const Color whiteGreyDarkHover = Color(0xFF959595); // #959595 rgb(149, 149, 149)
+    0xFFfdfdfd,
-  static const Color whiteGreyDarkActive = Color(0xFF707070); // #707070 rgb(112, 112, 112)
+  ); // #fdfdfd rgb(253, 253, 253)
-  static const Color whiteGreyDarker = Color(0xFF575757); // #575757 rgb(87, 87, 87)
+  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 whiteLight = Color(
-  static const Color whiteLightHover = Color(0xFFffffff); // #ffffff rgb(255, 255, 255)
+    0xFFffffff,
-  static const Color whiteLightActive = Color(0xFFffffff); // #ffffff rgb(255, 255, 255)
+  ); // #ffffff rgb(255, 255, 255)
-  static const Color whiteNormal = Color(0xFFffffff); // #ffffff rgb(255, 255, 255)
+  static const Color whiteLightHover = Color(
-  static const Color whiteNormalHover = Color(0xFFe6e6e6); // #e6e6e6 rgb(230, 230, 230)
+    0xFFffffff,
-  static const Color whiteNormalActive = Color(0xFFcccccc); // #cccccc rgb(204, 204, 204)
+  ); // #ffffff rgb(255, 255, 255)
-  static const Color whiteDark = Color(0xFFbfbfbf); // #bfbfbf rgb(191, 191, 191)
+  static const Color whiteLightActive = Color(
-  static const Color whiteDarkHover = Color(0xFF999999); // #999999 rgb(153, 153, 153)
+    0xFFffffff,
-  static const Color whiteDarkActive = Color(0xFF737373); // #737373 rgb(115, 115, 115)
+  ); // #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 green1Light = Color(
-  static const Color green1LightHover = Color(0xFFd9f2ef); // #d9f2ef rgb(217, 242, 239)
+    0xFFe6f6f4,
-  static const Color green1LightActive = Color(0xFFb0e4dd); // #b0e4dd rgb(176, 228, 221)
+  ); // #e6f6f4 rgb(230, 246, 244)
-  static const Color green1Normal = Color(0xFF00a991); // #00a991 rgb(0, 169, 145)
+  static const Color green1LightHover = Color(
-  static const Color green1NormalHover = Color(0xFF009883); // #009883 rgb(0, 152, 131)
+    0xFFd9f2ef,
-  static const Color green1NormalActive = Color(0xFF008774); // #008774 rgb(0, 135, 116)
+  ); // #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 green1DarkHover = Color(
-  static const Color green1DarkActive = Color(0xFF004c41); // #004c41 rgb(0, 76, 65)
+    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 yellowLight = Color(
-  static const Color yellowLightHover = Color(0xFFfff6da); // #fff6da rgb(255, 246, 218)
+    0xFFfff9e6,
-  static const Color yellowLightActive = Color(0xFFffecb2); // #ffecb2 rgb(255, 236, 178)
+  ); // #fff9e6 rgb(255, 249, 230)
-  static const Color yellowNormal = Color(0xFFffc107); // #ffc107 rgb(255, 193, 7)
+  static const Color yellowLightHover = Color(
-  static const Color yellowNormal2 = Color(0xFFFF9800); // #FF9800 rgb(255, 152, 0)
+    0xFFfff6da,
-  static const Color yellowNormalHover = Color(0xFFe6ae06); // #e6ae06 rgb(230, 174, 6)
+  ); // #fff6da rgb(255, 246, 218)
-  static const Color yellowNormalActive = Color(0xFFcc9a06); // #cc9a06 rgb(204, 154, 6)
+  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 yellowNormal2 = Color(
+    0xFFFF9800,
+  ); // #FF9800 rgb(255, 152, 0)
+  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 yellowDarkHover = Color(
-  static const Color yellowDarkActive = Color(0xFF735703); // #735703 rgb(115, 87, 3)
+    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)
 
   // #594402 rgb(89, 68, 2)
@@ -141,31 +324,65 @@ class AppColor {
 
   //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 redLightHover = Color(
-  static const Color redLightActive = Color(0xFFf9cbcb); // #f9cbcb rgb(249, 203, 203)
+    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 redNormalHover = Color(
-  static const Color redNormalActive = Color(0xFFbc4646); // #bc4646 rgb(188, 70, 70)
+    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 redDarkHover = Color(
-  static const Color redDarkActive = Color(0xFF6a2727); // #6a2727 rgb(106, 39, 39)
+    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)
+  static const Color redDarkerText = Color(
+    0xFFD24E4E,
+  ); // #D34E4E rgba(211, 78, 78, 1)
 
-  static const Color redLight2 = Color(0xFFEDDCE0); // #EDDCE0 rgb(237, 220, 224)
+  static const Color redLight2 = Color(
-  static const Color redLightActive2 = Color(0xFFE0BCC5); // #E0BCC5 rgb(224, 188, 197)
+    0xFFEDDCE0,
+  ); // #EDDCE0 rgb(237, 220, 224)
+  static const Color redLightActive2 = Color(
+    0xFFE0BCC5,
+  ); // #E0BCC5 rgb(224, 188, 197)
   //endregion
 
   //region --- Teal Colors ---
-  static const Color tealLight = Color(0xFFe8f6f8); // #e8f6f8 rgb(232, 246, 248)
+  static const Color tealLight = Color(
-  static const Color tealLightHover = Color(0xFFdcf1f4); // #dcf1f4 rgb(220, 241, 244)
+    0xFFe8f6f8,
-  static const Color tealLightActive = Color(0xFFb7e2e9); // #b7e2e9 rgb(183, 226, 233)
+  ); // #e8f6f8 rgb(232, 246, 248)
-  static const Color tealNormal = Color(0xFF17a2b8); // #17a2b8 rgb(23, 162, 184)
+  static const Color tealLightHover = Color(
-  static const Color tealNormalHover = Color(0xFF1592a6); // #1592a6 rgb(21, 146, 166)
+    0xFFdcf1f4,
-  static const Color tealNormalActive = Color(0xFF128293); // #128293 rgb(18, 130, 147)
+  ); // #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 tealDarkHover = Color(
-  static const Color tealDarkActive = Color(0xFF0a4953); // #0a4953 rgb(10, 73, 83)
+    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)
@@ -175,10 +392,12 @@ class AppColor {
   static const Color labelTextColor = Color(0xFF808080);
   static const Color textColorLight = Color(0xFFB2B2B2);
   static const Color iconColor = Color(0xFF444444); // #444444 rgb(68, 68, 68)
-  static const Color borderColor = Color(0xFFC7CFCD); // #C7CFCD rgb(199, 207, 205)`
+  static const Color borderColor = Color(
+    0xFFC7CFCD,
+  ); // #C7CFCD rgb(199, 207, 205)`
   static const Color unselectTextColor = Color(0xFF888888); //
   static const Color accent1 = Color(0xffffe5ce); //
-
+  static const Color bgLight2 = Color(0xFFEFEFEF); // #EFEFEF rgb(239, 239, 239)
   //endregion
 
   //region --- category Colors ---