diff --git a/packages/chicken/lib/data/common/fa_user_role.dart b/packages/chicken/lib/data/common/fa_user_role.dart index 309ccda..311bd5d 100644 --- a/packages/chicken/lib/data/common/fa_user_role.dart +++ b/packages/chicken/lib/data/common/fa_user_role.dart @@ -1,4 +1,5 @@ import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; String getFaUserRole(String? role) { @@ -151,7 +152,7 @@ Map getFaUserRoleWithOnTap(String? role) { case "LiveStockProvinceJahad": return {"جهاد استان": null}; case "Steward": - return {"مباشر": ChickenRoutes.initSteward}; + return {"مباشر": StewardRoutes.initSteward}; case "PoultryScience": return {"کارشناس طیور": PoultryScienceRoutes.initPoultryScience}; default: diff --git a/packages/chicken/lib/data/data_source/local/chicken_local_imp.dart b/packages/chicken/lib/data/data_source/local/chicken_local_imp.dart index f66c786..e792a29 100644 --- a/packages/chicken/lib/data/data_source/local/chicken_local_imp.dart +++ b/packages/chicken/lib/data/data_source/local/chicken_local_imp.dart @@ -1,4 +1,5 @@ import 'package:rasadyar_chicken/data/models/local/widely_used_local_model.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_core/core.dart'; import 'chicken_local.dart'; @@ -22,7 +23,7 @@ class ChickenLocalDataSourceImp implements ChickenLocalDataSource { color: AppColor.greenLightActive.toARGB32(), iconColor: AppColor.greenNormal.toARGB32(), iconPath: Assets.vec.cubeSearchSvg.path, - path: ChickenRoutes.buysInProvinceSteward, + path: StewardRoutes.buysInProvinceSteward, ), WidelyUsedLocalItem( index: 1, @@ -31,7 +32,7 @@ class ChickenLocalDataSourceImp implements ChickenLocalDataSource { color: AppColor.blueLightActive.toARGB32(), iconColor: AppColor.blueNormal.toARGB32(), iconPath: Assets.vec.cubeSvg.path, - path: ChickenRoutes.salesInProvinceSteward, + path: StewardRoutes.salesInProvinceSteward, ), WidelyUsedLocalItem( @@ -40,7 +41,7 @@ class ChickenLocalDataSourceImp implements ChickenLocalDataSource { color: AppColor.blueLightActive.toARGB32(), iconColor: AppColor.blueNormal.toARGB32(), iconPath: Assets.vec.cubeRotateSvg.path, - path: ChickenRoutes.buysInProvinceSteward, + path: StewardRoutes.buysInProvinceSteward, ), ]; */ } diff --git a/packages/chicken/lib/data/di/chicken_di.dart b/packages/chicken/lib/data/di/chicken_di.dart index f8e4ad3..cf9a523 100644 --- a/packages/chicken/lib/data/di/chicken_di.dart +++ b/packages/chicken/lib/data/di/chicken_di.dart @@ -1,5 +1,6 @@ import 'package:rasadyar_chicken/chicken.dart'; import 'package:rasadyar_chicken/data/common/dio_error_handler.dart'; +import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/data/data_source/local/chicken_local.dart'; import 'package:rasadyar_chicken/data/data_source/local/chicken_local_imp.dart'; import 'package:rasadyar_chicken/data/data_source/remote/auth/auth_remote.dart'; @@ -40,7 +41,7 @@ Future setupChickenDI() async { }, clearTokenCallback: () async { await tokenService.deleteModuleTokens(Module.chicken); - Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken); + Get.offAllNamed(CommonRoutes.auth, arguments: Module.chicken); }, ), instanceName: 'chickenInterceptor', @@ -51,14 +52,18 @@ Future setupChickenDI() async { diChicken.registerLazySingleton( () => DioRemote( baseUrl: baseUrl, - interceptors: diChicken.get(instanceName: 'chickenInterceptor'), + interceptors: diChicken.get( + instanceName: 'chickenInterceptor', + ), ), ); final dioRemote = diChicken.get(); await dioRemote.init(); - diChicken.registerLazySingleton(() => AuthRemoteDataSourceImp(dioRemote)); + diChicken.registerLazySingleton( + () => AuthRemoteDataSourceImp(dioRemote), + ); diChicken.registerLazySingleton( () => AuthRepositoryImpl(diChicken.get()), @@ -68,7 +73,9 @@ Future setupChickenDI() async { () => ChickenRemoteDatasourceImp(diChicken.get()), ); - diChicken.registerLazySingleton(() => ChickenLocalDataSourceImp()); + diChicken.registerLazySingleton( + () => ChickenLocalDataSourceImp(), + ); diChicken.registerLazySingleton( () => ChickenRepositoryImp( @@ -82,7 +89,9 @@ Future setupChickenDI() async { ); diChicken.registerLazySingleton( - () => PoultryScienceRepositoryImp(diChicken.get()), + () => PoultryScienceRepositoryImp( + diChicken.get(), + ), ); //region kill house module DI @@ -102,8 +111,12 @@ Future newSetupAuthDI(String newUrl) async { await tokenService.saveBaseUrl(Module.chicken, newUrl); // Re-register AppInterceptor - if (diChicken.isRegistered(instanceName: 'chickenInterceptor')) { - await diChicken.unregister(instanceName: 'chickenInterceptor'); + if (diChicken.isRegistered( + instanceName: 'chickenInterceptor', + )) { + await diChicken.unregister( + instanceName: 'chickenInterceptor', + ); } diChicken.registerLazySingleton( () => AppInterceptor( @@ -113,7 +126,7 @@ Future newSetupAuthDI(String newUrl) async { }, clearTokenCallback: () async { await tokenService.deleteModuleTokens(Module.chicken); - Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken); + Get.offAllNamed(CommonRoutes.auth, arguments: Module.chicken); }, ), instanceName: 'chickenInterceptor', @@ -126,16 +139,24 @@ Future newSetupAuthDI(String newUrl) async { diChicken.registerLazySingleton( () => DioRemote( baseUrl: newUrl, - interceptors: diChicken.get(instanceName: 'chickenInterceptor'), + interceptors: diChicken.get( + instanceName: 'chickenInterceptor', + ), ), ); final dioRemote = diChicken.get(); await dioRemote.init(); // Re-register dependent layers - await reRegister(() => AuthRemoteDataSourceImp(dioRemote)); - await reRegister(() => AuthRepositoryImpl(diChicken.get())); - await reRegister(() => ChickenRemoteDatasourceImp(dioRemote)); + await reRegister( + () => AuthRemoteDataSourceImp(dioRemote), + ); + await reRegister( + () => AuthRepositoryImpl(diChicken.get()), + ); + await reRegister( + () => ChickenRemoteDatasourceImp(dioRemote), + ); await reRegister(() => ChickenLocalDataSourceImp()); await reRegister( () => ChickenRepositoryImp( @@ -148,7 +169,9 @@ Future newSetupAuthDI(String newUrl) async { () => PoultryScienceRemoteDatasourceImp(dioRemote), ); await reRegister( - () => PoultryScienceRepositoryImp(diChicken.get()), + () => PoultryScienceRepositoryImp( + diChicken.get(), + ), ); } diff --git a/packages/chicken/lib/features/common/common.dart b/packages/chicken/lib/features/common/common.dart new file mode 100644 index 0000000..7aa6fff --- /dev/null +++ b/packages/chicken/lib/features/common/common.dart @@ -0,0 +1,2 @@ +export 'presentation/routes/routes.dart'; +export 'presentation/routes/pages.dart'; diff --git a/packages/chicken/lib/features/common/data/datasources/remote/chicken_remote_data_source.dart b/packages/chicken/lib/features/common/data/datasources/remote/chicken_remote_data_source.dart new file mode 100644 index 0000000..ddf9315 --- /dev/null +++ b/packages/chicken/lib/features/common/data/datasources/remote/chicken_remote_data_source.dart @@ -0,0 +1,3 @@ +abstract class ChickenRemoteDataSource { + Future getChickens(); +} \ No newline at end of file diff --git a/packages/chicken/lib/presentation/pages/common/auth/logic.dart b/packages/chicken/lib/features/common/presentation/page/auth/logic.dart similarity index 87% rename from packages/chicken/lib/presentation/pages/common/auth/logic.dart rename to packages/chicken/lib/features/common/presentation/page/auth/logic.dart index 6c349d6..e8a515a 100644 --- a/packages/chicken/lib/presentation/pages/common/auth/logic.dart +++ b/packages/chicken/lib/features/common/presentation/page/auth/logic.dart @@ -7,7 +7,8 @@ import 'package:rasadyar_chicken/data/di/chicken_di.dart'; import 'package:rasadyar_chicken/data/models/response/user_info/user_info_model.dart'; import 'package:rasadyar_chicken/data/models/response/user_profile_model/user_profile_model.dart'; import 'package:rasadyar_chicken/data/repositories/auth/auth_repository.dart'; -import 'package:rasadyar_chicken/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart'; import 'package:rasadyar_core/core.dart'; @@ -28,7 +29,8 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin { Rx> formKeySentOtp = GlobalKey().obs; Rx usernameController = TextEditingController().obs; Rx passwordController = TextEditingController().obs; - Rx phoneOtpNumberController = TextEditingController().obs; + Rx phoneOtpNumberController = + TextEditingController().obs; Rx otpCodeController = TextEditingController().obs; var captchaController = Get.find(); @@ -56,12 +58,18 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin { void onInit() { super.onInit(); _textAnimationController = - AnimationController(vsync: this, duration: const Duration(milliseconds: 1200)) + AnimationController( + vsync: this, + duration: const Duration(milliseconds: 1200), + ) ..repeat(reverse: true, count: 2).whenComplete(() { showCard.value = true; }); - textAnimation = CurvedAnimation(parent: _textAnimationController, curve: Curves.easeInOut); + textAnimation = CurvedAnimation( + parent: _textAnimationController, + curve: Curves.easeInOut, + ); initUserPassData(); getDeviceModel(); @@ -98,7 +106,8 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin { } bool _isFormValid() { - final isCaptchaValid = captchaController.formKey.currentState?.validate() ?? false; + final isCaptchaValid = + captchaController.formKey.currentState?.validate() ?? false; final isFormValid = formKey.currentState?.validate() ?? false; return isCaptchaValid && isFormValid; } @@ -117,8 +126,14 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin { onSuccess: (result) async { await gService.saveSelectedModule(_module); await tokenStorageService.saveModule(_module); - await tokenStorageService.saveAccessToken(_module, result?.accessToken ?? ''); - await tokenStorageService.saveRefreshToken(_module, result?.accessToken ?? ''); + await tokenStorageService.saveAccessToken( + _module, + result?.accessToken ?? '', + ); + await tokenStorageService.saveRefreshToken( + _module, + result?.accessToken ?? '', + ); var tmpRoles = result?.role?.where((element) { final allowedRoles = {'poultryscience', 'steward', 'killhouse'}; final lowerElement = element.toString().toLowerCase().trim(); @@ -143,9 +158,9 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin { ); if (tmpRoles!.length > 1) { - Get.offAndToNamed(ChickenRoutes.role); + Get.offAndToNamed(CommonRoutes.role); } else { - Get.offAllNamed(ChickenRoutes.initSteward); + Get.offAllNamed(StewardRoutes.initSteward); } }, onError: (error, stackTrace) { @@ -183,7 +198,9 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin { } void initUserPassData() { - UserLocalModel? userLocalModel = tokenStorageService.getUserLocal(Module.chicken); + UserLocalModel? userLocalModel = tokenStorageService.getUserLocal( + Module.chicken, + ); if (userLocalModel?.username != null && userLocalModel?.password != null) { usernameController.value.text = userLocalModel?.username ?? ''; passwordController.value.text = userLocalModel?.password ?? ''; diff --git a/packages/chicken/lib/presentation/pages/common/auth/view.dart b/packages/chicken/lib/features/common/presentation/page/auth/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/common/auth/view.dart rename to packages/chicken/lib/features/common/presentation/page/auth/view.dart diff --git a/packages/chicken/lib/presentation/pages/common/profile/logic.dart b/packages/chicken/lib/features/common/presentation/page/profile/logic.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/common/profile/logic.dart rename to packages/chicken/lib/features/common/presentation/page/profile/logic.dart diff --git a/packages/chicken/lib/presentation/pages/common/profile/view.dart b/packages/chicken/lib/features/common/presentation/page/profile/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/common/profile/view.dart rename to packages/chicken/lib/features/common/presentation/page/profile/view.dart diff --git a/packages/chicken/lib/presentation/pages/common/role/logic.dart b/packages/chicken/lib/features/common/presentation/page/role/logic.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/common/role/logic.dart rename to packages/chicken/lib/features/common/presentation/page/role/logic.dart diff --git a/packages/chicken/lib/presentation/pages/common/role/view.dart b/packages/chicken/lib/features/common/presentation/page/role/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/common/role/view.dart rename to packages/chicken/lib/features/common/presentation/page/role/view.dart diff --git a/packages/chicken/lib/features/common/presentation/routes/pages.dart b/packages/chicken/lib/features/common/presentation/routes/pages.dart new file mode 100644 index 0000000..eb1bd53 --- /dev/null +++ b/packages/chicken/lib/features/common/presentation/routes/pages.dart @@ -0,0 +1,34 @@ +import 'package:rasadyar_chicken/features/common/presentation/page/auth/logic.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/auth/view.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/logic.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/role/logic.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/role/view.dart'; +import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart'; +import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart'; +import 'package:rasadyar_core/core.dart'; + +class CommonPages { + CommonPages._(); + + static List get pages => [ + GetPage( + name: CommonRoutes.auth, + page: () => AuthPage(), + binding: BindingsBuilder(() { + Get.lazyPut(() => AuthLogic()); + Get.lazyPut(() => CaptchaWidgetLogic()); + Get.lazyPut(() => ChickenBaseLogic(), fenix: true); + }), + ), + GetPage( + name: CommonRoutes.role, + page: () => RolePage(), + binding: BindingsBuilder(() { + Get.lazyPut(() => RoleLogic()); + Get.lazyPut(() => ChickenBaseLogic(), fenix: true); + }), + ), + ]; +} diff --git a/packages/chicken/lib/features/common/presentation/routes/routes.dart b/packages/chicken/lib/features/common/presentation/routes/routes.dart new file mode 100644 index 0000000..17606e7 --- /dev/null +++ b/packages/chicken/lib/features/common/presentation/routes/routes.dart @@ -0,0 +1,8 @@ +sealed class CommonRoutes { + CommonRoutes._(); + + static const auth = '/AuthChicken'; + static const _base = '/chicken'; + static const role = '$_base/role'; + static const String profile = '$_base/profile'; +} diff --git a/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart b/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart index 2531781..ef4d1bb 100644 --- a/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:rasadyar_chicken/data/di/chicken_di.dart'; import 'package:rasadyar_chicken/data/repositories/poultry_science/poultry_science_repository.dart'; import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/home/view.dart'; -import 'package:rasadyar_chicken/presentation/pages/common/profile/view.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart'; import 'package:rasadyar_chicken/presentation/routes/pages.dart'; import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/buy/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/buy/logic.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/steward/buy/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy/logic.dart diff --git a/packages/chicken/lib/presentation/pages/steward/buy/view.dart b/packages/chicken/lib/features/steward/presentation/pages/buy/view.dart similarity index 81% rename from packages/chicken/lib/presentation/pages/steward/buy/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy/view.dart index b25e79f..5e2b372 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/buy/view.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; import 'package:rasadyar_core/core.dart'; @@ -30,7 +30,10 @@ class BuyPage extends GetView { end: AlignmentGeometry.bottomRight, ), onTap: () { - Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: stewardFirstKey); + Get.toNamed( + StewardRoutes.buysInProvinceSteward, + id: stewardFirstKey, + ); }, ), GlassMorphismCardIcon( @@ -43,7 +46,10 @@ class BuyPage extends GetView { end: AlignmentGeometry.bottomRight, ), onTap: () { - Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: stewardFirstKey); + Get.toNamed( + StewardRoutes.buysOutOfProvinceSteward, + id: stewardFirstKey, + ); }, ), ], diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province/logic.dart similarity index 87% rename from packages/chicken/lib/presentation/pages/steward/buy_in_province/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_in_province/logic.dart index 28f5734..f8cbf1e 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_in_province/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province/logic.dart @@ -1,7 +1,7 @@ -import 'package:rasadyar_chicken/presentation/pages/steward/buy/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/buy_in_province_all/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/buy_in_province_waiting/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_all/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_waiting/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_core/core.dart'; class BuyInProvinceLogic extends GetxController { diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province/view.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province/view.dart similarity index 93% rename from packages/chicken/lib/presentation/pages/steward/buy_in_province/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_in_province/view.dart index 4802b8e..1360370 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_in_province/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province/view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/buy_in_province_all/view.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/buy_in_province_waiting/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_all/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_waiting/view.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; import 'package:rasadyar_chicken/presentation/widget/steward/inventory_widget.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province_all/logic.dart similarity index 98% rename from packages/chicken/lib/presentation/pages/steward/buy_in_province_all/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_in_province_all/logic.dart index 0c23aa9..150e4ab 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province_all/logic.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/data/models/request/steward_allocation/steward_allocation_request.dart'; import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_core/core.dart'; class BuyInProvinceAllLogic extends GetxController { diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/view.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province_all/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/steward/buy_in_province_all/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_in_province_all/view.dart diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province_waiting/logic.dart similarity index 98% rename from packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_in_province_waiting/logic.dart index a8dab30..9cd4ca2 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province_waiting/logic.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/data/models/request/steward_allocation/steward_allocation_request.dart'; import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_in_province_waiting/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_in_province_waiting/view.dart diff --git a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_out_of_province/logic.dart similarity index 97% rename from packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_out_of_province/logic.dart index e465673..0237e60 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/buy_out_of_province/logic.dart @@ -3,9 +3,9 @@ import 'package:rasadyar_chicken/data/models/request/create_steward_free_bar/cre import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_bar/steward_free_bar.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/buy/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sale/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sale/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart b/packages/chicken/lib/features/steward/presentation/pages/buy_out_of_province/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/buy_out_of_province/view.dart diff --git a/packages/chicken/lib/presentation/pages/steward/home/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/home/logic.dart similarity index 97% rename from packages/chicken/lib/presentation/pages/steward/home/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/home/logic.dart index b0ef74a..3cb3d08 100644 --- a/packages/chicken/lib/presentation/pages/steward/home/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/home/logic.dart @@ -1,6 +1,6 @@ import 'package:rasadyar_chicken/data/models/response/bar_information/bar_information.dart'; import 'package:rasadyar_chicken/data/models/response/kill_house_distribution_info/kill_house_distribution_info.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_core/core.dart'; class HomeLogic extends GetxController { diff --git a/packages/chicken/lib/presentation/pages/steward/home/view.dart b/packages/chicken/lib/features/steward/presentation/pages/home/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/steward/home/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/home/view.dart diff --git a/packages/chicken/lib/presentation/pages/steward/root/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart similarity index 83% rename from packages/chicken/lib/presentation/pages/steward/root/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/root/logic.dart index 1d6bd06..7c4df1b 100644 --- a/packages/chicken/lib/presentation/pages/steward/root/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart @@ -13,11 +13,12 @@ import 'package:rasadyar_chicken/data/models/response/steward_sales_info_dashboa import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart' hide ProductModel; import 'package:rasadyar_chicken/data/repositories/chicken/chicken_repository.dart'; -import 'package:rasadyar_chicken/presentation/pages/common/profile/view.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/buy/view.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/home/view.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sale/view.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/segmentation/view.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/buy/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/home/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sale/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/segmentation/view.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; @@ -28,12 +29,22 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class StewardRootLogic extends GetxController { DateTime? _lastBackPressed; RxInt currentPage = 2.obs; - List pages = [BuyPage(), SalePage(), HomePage(), SegmentationPage(), ProfilePage()]; + List pages = [ + BuyPage(), + SalePage(), + HomePage(), + SegmentationPage(), + ProfilePage(), + ]; - final defaultRoutes = {0: ChickenRoutes.buySteward, 1: ChickenRoutes.saleSteward}; + final defaultRoutes = { + 0: StewardRoutes.buySteward, + 1: StewardRoutes.saleSteward, + }; RxList rolesProductsModel = RxList(); Rxn widelyUsedList = Rxn(); - Rxn stewardSalesInfoDashboard = Rxn(); + Rxn stewardSalesInfoDashboard = + Rxn(); Rxn stewardRemainWeight = Rxn(); late DioRemote dioRemote; @@ -75,7 +86,9 @@ class StewardRootLogic extends GetxController { if (widelyUsedList.value?.hasInit != true) { //TODO - localDatasource.initWidleyUsed().then((value) => localDatasource.getAllWidely()); + localDatasource.initWidleyUsed().then( + (value) => localDatasource.getAllWidely(), + ); } } @@ -146,7 +159,9 @@ class StewardRootLogic extends GetxController { _provincesCancelToken = CancelToken(); try { - final res = await chickenRepository.getProvince(cancelToken: _provincesCancelToken); + final res = await chickenRepository.getProvince( + cancelToken: _provincesCancelToken, + ); if (res != null) { provinces.clear(); provinces.value = res; @@ -162,8 +177,9 @@ class StewardRootLogic extends GetxController { Future getRolesProducts() async { safeCall( - call: () async => - await chickenRepository.getRolesProducts(token: tokenService.accessToken.value!), + call: () async => await chickenRepository.getRolesProducts( + token: tokenService.accessToken.value!, + ), onSuccess: (result) { if (result != null) { rolesProductsModel.value = result; @@ -190,8 +206,9 @@ class StewardRootLogic extends GetxController { Future getStewardRemainWeightData() async { safeCall( - call: () async => - await chickenRepository.getStewardRemainWeight(token: tokenService.accessToken.value!), + call: () async => await chickenRepository.getStewardRemainWeight( + token: tokenService.accessToken.value!, + ), onSuccess: (result) { if (result != null) { stewardRemainWeight.value = result; @@ -231,7 +248,8 @@ class StewardRootLogic extends GetxController { currentNestedKey?.currentState?.popUntil((route) => route.isFirst); } else { final now = DateTime.now(); - if (_lastBackPressed == null || now.difference(_lastBackPressed!) > Duration(seconds: 2)) { + if (_lastBackPressed == null || + now.difference(_lastBackPressed!) > Duration(seconds: 2)) { _lastBackPressed = now; Get.snackbar( 'خروج از برنامه', diff --git a/packages/chicken/lib/presentation/pages/steward/root/view.dart b/packages/chicken/lib/features/steward/presentation/pages/root/view.dart similarity index 98% rename from packages/chicken/lib/presentation/pages/steward/root/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/root/view.dart index ea2af0f..d6d208d 100644 --- a/packages/chicken/lib/presentation/pages/steward/root/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/root/view.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/chicken.dart'; import 'package:rasadyar_chicken/data/models/response/kill_house_distribution_info/kill_house_distribution_info.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; import 'package:rasadyar_core/core.dart'; @@ -26,7 +27,7 @@ class StewardRootPage extends GetView { final page = ChickenPages.pages.firstWhere( (e) => e.name == settings.name, orElse: () => ChickenPages.pages.firstWhere( - (e) => e.name == ChickenRoutes.buySteward, + (e) => e.name == StewardRoutes.buySteward, ), ); @@ -39,7 +40,7 @@ class StewardRootPage extends GetView { final page = ChickenPages.pages.firstWhere( (e) => e.name == settings.name, orElse: () => ChickenPages.pages.firstWhere( - (e) => e.name == ChickenRoutes.saleSteward, + (e) => e.name == StewardRoutes.saleSteward, ), ); diff --git a/packages/chicken/lib/presentation/pages/steward/sale/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/sale/logic.dart similarity index 97% rename from packages/chicken/lib/presentation/pages/steward/sale/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/sale/logic.dart index cbb403a..2ba3b70 100644 --- a/packages/chicken/lib/presentation/pages/steward/sale/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sale/logic.dart @@ -5,7 +5,7 @@ import 'package:rasadyar_chicken/data/models/response/allocated_made/allocated_m import 'package:rasadyar_chicken/data/models/response/guild/guild_model.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_bar_dashboard/steward_free_bar_dashboard.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_core/core.dart'; class SaleLogic extends GetxController { diff --git a/packages/chicken/lib/presentation/pages/steward/sale/view.dart b/packages/chicken/lib/features/steward/presentation/pages/sale/view.dart similarity index 77% rename from packages/chicken/lib/presentation/pages/steward/sale/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/sale/view.dart index 055b800..35cb983 100644 --- a/packages/chicken/lib/presentation/pages/steward/sale/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sale/view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/chicken.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_bar_dashboard/steward_free_bar_dashboard.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; import 'package:rasadyar_core/core.dart'; @@ -25,14 +25,20 @@ class SalePage extends GetView { title: 'فروش داخل استان', vecIcon: Assets.vec.map2Svg.path, onTap: () { - Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: stewardSecondKey); + Get.toNamed( + StewardRoutes.salesInProvinceSteward, + id: stewardSecondKey, + ); }, ), GlassMorphismCardIcon( title: 'فروش خارج استان', vecIcon: Assets.vec.saleOutProvinceSvg.path, onTap: () { - Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: stewardSecondKey); + Get.toNamed( + StewardRoutes.salesOutOfProvinceSteward, + id: stewardSecondKey, + ); }, ), ], @@ -89,14 +95,20 @@ class SalePage extends GetView { child: SvgGenImage.vec(iconPath).svg( width: 45, height: 45, - colorFilter: ColorFilter.mode(foregroundColor, BlendMode.srcIn), + colorFilter: ColorFilter.mode( + foregroundColor, + BlendMode.srcIn, + ), ), ), Assets.vec.shoppingBasketSvg.svg( width: 55, height: 60, - colorFilter: ColorFilter.mode(foregroundColor, BlendMode.srcIn), + colorFilter: ColorFilter.mode( + foregroundColor, + BlendMode.srcIn, + ), fit: BoxFit.cover, ), ], @@ -123,7 +135,9 @@ class SalePage extends GetView { children: [ Text( 'خلاصه اطلاعات', - style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal), + style: AppFonts.yekan16Bold.copyWith( + color: AppColor.blueNormal, + ), ), ], ), @@ -144,9 +158,15 @@ class SalePage extends GetView { spacing: 10, children: [ const SizedBox(height: 12), - buildRow('تعداد کل بارها', model.totalQuantity?.toString() ?? '0'), + buildRow( + 'تعداد کل بارها', + model.totalQuantity?.toString() ?? '0', + ), buildRow('تعداد کل', model.totalBars?.toString() ?? '0'), - buildRow('وزن کل (کیلوگرم)', model.totalWeight?.toString() ?? '0'), + buildRow( + 'وزن کل (کیلوگرم)', + model.totalWeight?.toString() ?? '0', + ), ], ), ), @@ -165,7 +185,9 @@ class SalePage extends GetView { child: Text( title, textAlign: TextAlign.right, - style: AppFonts.yekan14.copyWith(color: AppColor.darkGreyDarkHover), + style: AppFonts.yekan14.copyWith( + color: AppColor.darkGreyDarkHover, + ), ), ), Flexible( @@ -173,7 +195,9 @@ class SalePage extends GetView { child: Text( value, textAlign: TextAlign.left, - style: AppFonts.yekan14.copyWith(color: AppColor.darkGreyDarkHover), + style: AppFonts.yekan14.copyWith( + color: AppColor.darkGreyDarkHover, + ), ), ), ], diff --git a/packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_in_province/logic.dart similarity index 98% rename from packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_in_province/logic.dart index 9ef9ed9..010e50c 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_in_province/logic.dart @@ -9,8 +9,8 @@ import 'package:rasadyar_chicken/data/models/response/guild/guild_model.dart'; import 'package:rasadyar_chicken/data/models/response/guild_profile/guild_profile.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_remain_weight/steward_remain_weight.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sale/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sale/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/string_utils.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_in_province/view.dart similarity index 99% rename from packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_in_province/view.dart index e6d2286..0cc6166 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_in_province/view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/data/models/response/allocated_made/allocated_made.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sales_in_province/widgets/cu_sale_in_provience.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sales_in_province/widgets/cu_sale_in_provience.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/utils/string_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/sales_in_province/widgets/cu_sale_in_provience.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_in_province/widgets/cu_sale_in_provience.dart similarity index 99% rename from packages/chicken/lib/presentation/pages/steward/sales_in_province/widgets/cu_sale_in_provience.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_in_province/widgets/cu_sale_in_provience.dart index eee86cc..2aba1e0 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/widgets/cu_sale_in_provience.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_in_province/widgets/cu_sale_in_provience.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sales_in_province/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sales_in_province/logic.dart'; import 'package:rasadyar_core/core.dart'; Widget addOrEditBottomSheet(SalesInProvinceLogic controller, {bool isEditMode = false}) { diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province/logic.dart similarity index 97% rename from packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province/logic.dart index 0a53647..2456d7d 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province/logic.dart @@ -6,10 +6,10 @@ import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buy import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart'; import 'package:rasadyar_chicken/data/models/response/steward_remain_weight/steward_remain_weight.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sale/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sales_out_of_province_buyers/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sale/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sales_out_of_province_buyers/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sales_out_of_province_sales_list/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province/view.dart similarity index 99% rename from packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province/view.dart index 9ece4a9..ac3d5d7 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province/view.dart @@ -4,7 +4,7 @@ import 'package:flutter/services.dart'; import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart'; -import 'package:rasadyar_chicken/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/utils/string_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; @@ -89,7 +89,7 @@ class SalesOutOfProvincePage extends GetView { backgroundColor: AppColor.blueNormal, onPressed: () { Get.toNamed( - ChickenRoutes.salesOutOfProvinceBuyerSteward, + StewardRoutes.salesOutOfProvinceBuyerSteward, id: stewardSecondKey, ); }, diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_buyers/logic.dart similarity index 96% rename from packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_buyers/logic.dart index 4a441b4..4c992d8 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_buyers/logic.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart'; import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sale/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sales_out_of_province/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sale/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sales_out_of_province/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_buyers/view.dart similarity index 100% rename from packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_buyers/view.dart diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_sales_list/logic.dart similarity index 96% rename from packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_sales_list/logic.dart index f10fedc..d6a82cd 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_sales_list/logic.dart @@ -4,9 +4,9 @@ import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_pr import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sale/logic.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/sales_out_of_province_buyers/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sale/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/sales_out_of_province_buyers/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_sales_list/view.dart similarity index 89% rename from packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart rename to packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_sales_list/view.dart index 9286789..e1335db 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/sales_out_of_province_sales_list/view.dart @@ -4,12 +4,13 @@ import 'package:flutter/services.dart'; import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart'; import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart'; -import 'package:rasadyar_chicken/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_core/core.dart'; import 'logic.dart'; -class SalesOutOfProvinceSalesListPage extends GetView { +class SalesOutOfProvinceSalesListPage + extends GetView { const SalesOutOfProvinceSalesListPage({super.key}); @override @@ -57,10 +58,14 @@ class SalesOutOfProvinceSalesListPage extends GetView controller.saleDate.value = jalali, + onChanged: (jalali) => + controller.saleDate.value = jalali, ), ), ], @@ -342,7 +363,9 @@ class SalesOutOfProvinceSalesListPage extends GetView get pages => [ + //region Steward Pages + GetPage( + name: StewardRoutes.initSteward, + page: () => StewardRootPage(), + middlewares: [AuthMiddleware()], + bindings: [ + GlobalBinding(), + BindingsBuilder(() { + Get.lazyPut(() => ChickenBaseLogic(), fenix: true); + Get.lazyPut(() => StewardRootLogic()); + Get.lazyPut(() => HomeLogic()); + Get.lazyPut(() => BuyLogic()); + Get.lazyPut(() => SaleLogic()); + Get.lazyPut(() => SegmentationLogic()); + }), + ], + ), + + GetPage( + name: StewardRoutes.homeSteward, + page: () => HomePage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.put(HomeLogic()); + Get.lazyPut(() => ChickenBaseLogic()); + }), + ), + + //sales + GetPage( + name: StewardRoutes.saleSteward, + page: () => SalePage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => SaleLogic()); + Get.lazyPut(() => ChickenBaseLogic()); + Get.lazyPut(() => SalesOutOfProvinceLogic()); + Get.lazyPut(() => SalesOutOfProvinceBuyersLogic()); + Get.lazyPut(() => StewardRootLogic()); + }), + ), + GetPage( + name: StewardRoutes.salesOutOfProvinceSteward, + page: () => SalesOutOfProvincePage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => SalesOutOfProvinceLogic()); + Get.lazyPut(() => SalesOutOfProvinceBuyersLogic()); + Get.lazyPut(() => SalesOutOfProvinceSalesListLogic()); + }), + ), + GetPage( + name: StewardRoutes.salesOutOfProvinceBuyerSteward, + page: () => SalesOutOfProvinceBuyersPage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => SalesOutOfProvinceLogic()); + Get.lazyPut(() => SalesOutOfProvinceBuyersLogic()); + Get.lazyPut(() => SalesOutOfProvinceSalesListLogic()); + }), + ), + GetPage( + name: StewardRoutes.salesInProvinceSteward, + page: () => SalesInProvincePage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => ChickenBaseLogic()); + Get.lazyPut(() => SalesInProvinceLogic()); + }), + ), + + //buy + GetPage( + name: StewardRoutes.buySteward, + page: () => BuyPage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => ChickenBaseLogic()); + Get.lazyPut(() => BuyLogic()); + }), + ), + GetPage( + name: StewardRoutes.buysOutOfProvinceSteward, + page: () => BuyOutOfProvincePage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => ChickenBaseLogic()); + Get.lazyPut(() => BuyOutOfProvinceLogic()); + }), + ), + GetPage( + name: StewardRoutes.buysInProvinceSteward, + page: () => BuyInProvincePage(), + middlewares: [AuthMiddleware()], + binding: BindingsBuilder(() { + Get.lazyPut(() => ChickenBaseLogic()); + Get.lazyPut(() => BuyInProvinceLogic()); + Get.lazyPut(() => BuyInProvinceWaitingLogic()); + Get.lazyPut(() => BuyInProvinceAllLogic()); + }), + ), + //endregion + ]; +} diff --git a/packages/chicken/lib/features/steward/presentation/routes/routes.dart b/packages/chicken/lib/features/steward/presentation/routes/routes.dart new file mode 100644 index 0000000..c1b7c5b --- /dev/null +++ b/packages/chicken/lib/features/steward/presentation/routes/routes.dart @@ -0,0 +1,20 @@ +sealed class StewardRoutes { + StewardRoutes._(); + + static const _base = '/chicken/steward'; + static const initSteward = '$_base/'; + static const homeSteward = '$_base/home'; + static const buySteward = '$_base/buy'; + static const saleSteward = '$_base/sale'; + static const segmentationSteward = '$_base/segmentation'; + + //buys + static const buysOutOfProvinceSteward = '$buySteward/buyOutOfProvince'; + static const buysInProvinceSteward = '$buySteward/buyInProvince'; + + //sales + static const salesInProvinceSteward = '$saleSteward/SalesInProvince'; + static const salesOutOfProvinceSteward = '$saleSteward/saleOutOfProvince'; + static const salesOutOfProvinceBuyerSteward = + '$saleSteward/saleOutOfProvinceBuyer '; +} diff --git a/packages/chicken/lib/features/steward/steward.dart b/packages/chicken/lib/features/steward/steward.dart new file mode 100644 index 0000000..7aa6fff --- /dev/null +++ b/packages/chicken/lib/features/steward/steward.dart @@ -0,0 +1,2 @@ +export 'presentation/routes/routes.dart'; +export 'presentation/routes/pages.dart'; diff --git a/packages/chicken/lib/presentation/pages/kill_house/root/logic.dart b/packages/chicken/lib/presentation/pages/kill_house/root/logic.dart index 8b551f0..f7a2d93 100644 --- a/packages/chicken/lib/presentation/pages/kill_house/root/logic.dart +++ b/packages/chicken/lib/presentation/pages/kill_house/root/logic.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/data/di/chicken_di.dart'; import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository.dart'; -import 'package:rasadyar_chicken/presentation/pages/common/profile/view.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart'; import 'package:rasadyar_chicken/presentation/routes/pages.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; diff --git a/packages/chicken/lib/presentation/pages/steward/steward.dart b/packages/chicken/lib/presentation/pages/steward/steward.dart deleted file mode 100644 index 2139d13..0000000 --- a/packages/chicken/lib/presentation/pages/steward/steward.dart +++ /dev/null @@ -1,26 +0,0 @@ -export 'buy/logic.dart'; -export 'buy/view.dart'; -export 'buy_in_province/logic.dart'; -export 'buy_in_province/view.dart'; -export 'buy_in_province_all/logic.dart'; -export 'buy_in_province_all/view.dart'; -export 'buy_in_province_waiting/logic.dart'; -export 'buy_in_province_waiting/view.dart'; -export 'buy_out_of_province/logic.dart'; -export 'buy_out_of_province/view.dart'; -export 'home/logic.dart'; -export 'home/view.dart'; -export 'root/logic.dart'; -export 'root/view.dart'; -export 'sale/logic.dart'; -export 'sale/view.dart'; -export 'sales_in_province/logic.dart'; -export 'sales_in_province/view.dart'; -export 'sales_out_of_province/logic.dart'; -export 'sales_out_of_province/view.dart'; -export 'sales_out_of_province_buyers/logic.dart'; -export 'sales_out_of_province_buyers/view.dart'; -export 'sales_out_of_province_sales_list/logic.dart'; -export 'sales_out_of_province_sales_list/view.dart'; -export 'segmentation/logic.dart'; -export 'segmentation/view.dart'; \ No newline at end of file diff --git a/packages/chicken/lib/presentation/routes/global_binding.dart b/packages/chicken/lib/presentation/routes/global_binding.dart index 2db71cc..8afbee3 100644 --- a/packages/chicken/lib/presentation/routes/global_binding.dart +++ b/packages/chicken/lib/presentation/routes/global_binding.dart @@ -1,4 +1,4 @@ -import 'package:rasadyar_chicken/presentation/pages/common/profile/logic.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/logic.dart'; import 'package:rasadyar_core/core.dart'; class GlobalBinding extends Bindings { diff --git a/packages/chicken/lib/presentation/routes/pages.dart b/packages/chicken/lib/presentation/routes/pages.dart index 92f8ff4..b6d00b4 100644 --- a/packages/chicken/lib/presentation/routes/pages.dart +++ b/packages/chicken/lib/presentation/routes/pages.dart @@ -1,7 +1,4 @@ -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/features/common/common.dart'; import 'package:rasadyar_chicken/presentation/pages/kill_house/action/logic.dart'; import 'package:rasadyar_chicken/presentation/pages/kill_house/action/view.dart'; import 'package:rasadyar_chicken/presentation/pages/kill_house/root/logic.dart'; @@ -10,138 +7,22 @@ import 'package:rasadyar_chicken/presentation/pages/kill_house/submit_request/lo import 'package:rasadyar_chicken/presentation/pages/kill_house/submit_request/view.dart'; import 'package:rasadyar_chicken/features/poultry_farm_inspection/poultry_farm_inspection.dart'; import 'package:rasadyar_chicken/features/poultry_science/poultry_science.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/steward.dart'; +import 'package:rasadyar_chicken/features/steward/steward.dart'; import 'package:rasadyar_chicken/presentation/routes/global_binding.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart'; -import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart'; import 'package:rasadyar_core/core.dart'; sealed class ChickenPages { ChickenPages._(); static final pages = [ - GetPage( - name: ChickenRoutes.auth, - page: () => AuthPage(), - binding: BindingsBuilder(() { - Get.lazyPut(() => AuthLogic()); - Get.lazyPut(() => CaptchaWidgetLogic()); - Get.lazyPut(() => ChickenBaseLogic(), fenix: true); - }), - ), - - GetPage( - name: ChickenRoutes.role, - page: () => RolePage(), - binding: BindingsBuilder(() { - Get.lazyPut(() => RoleLogic()); - Get.lazyPut(() => ChickenBaseLogic(), fenix: true); - }), - ), + //region Common Pages + ...CommonPages.pages, + //endregion //region Steward Pages - GetPage( - name: ChickenRoutes.initSteward, - page: () => StewardRootPage(), - middlewares: [AuthMiddleware()], - bindings: [ - GlobalBinding(), - BindingsBuilder(() { - Get.lazyPut(() => ChickenBaseLogic(), fenix: true); - Get.lazyPut(() => StewardRootLogic()); - Get.lazyPut(() => HomeLogic()); - Get.lazyPut(() => BuyLogic()); - Get.lazyPut(() => SaleLogic()); - Get.lazyPut(() => SegmentationLogic()); - }), - ], - ), - - GetPage( - name: ChickenRoutes.homeSteward, - page: () => HomePage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.put(HomeLogic()); - Get.lazyPut(() => ChickenBaseLogic()); - }), - ), - - //sales - GetPage( - name: ChickenRoutes.saleSteward, - page: () => SalePage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => SaleLogic()); - Get.lazyPut(() => ChickenBaseLogic()); - Get.lazyPut(() => SalesOutOfProvinceLogic()); - Get.lazyPut(() => SalesOutOfProvinceBuyersLogic()); - Get.lazyPut(() => StewardRootLogic()); - }), - ), - GetPage( - name: ChickenRoutes.salesOutOfProvinceSteward, - page: () => SalesOutOfProvincePage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => SalesOutOfProvinceLogic()); - Get.lazyPut(() => SalesOutOfProvinceBuyersLogic()); - Get.lazyPut(() => SalesOutOfProvinceSalesListLogic()); - }), - ), - GetPage( - name: ChickenRoutes.salesOutOfProvinceBuyerSteward, - page: () => SalesOutOfProvinceBuyersPage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => SalesOutOfProvinceLogic()); - Get.lazyPut(() => SalesOutOfProvinceBuyersLogic()); - Get.lazyPut(() => SalesOutOfProvinceSalesListLogic()); - }), - ), - GetPage( - name: ChickenRoutes.salesInProvinceSteward, - page: () => SalesInProvincePage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => ChickenBaseLogic()); - Get.lazyPut(() => SalesInProvinceLogic()); - }), - ), - - //buy - GetPage( - name: ChickenRoutes.buySteward, - page: () => BuyPage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => ChickenBaseLogic()); - Get.lazyPut(() => BuyLogic()); - }), - ), - GetPage( - name: ChickenRoutes.buysOutOfProvinceSteward, - page: () => BuyOutOfProvincePage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => ChickenBaseLogic()); - Get.lazyPut(() => BuyOutOfProvinceLogic()); - }), - ), - GetPage( - name: ChickenRoutes.buysInProvinceSteward, - page: () => BuyInProvincePage(), - middlewares: [AuthMiddleware()], - binding: BindingsBuilder(() { - Get.lazyPut(() => ChickenBaseLogic()); - Get.lazyPut(() => BuyInProvinceLogic()); - Get.lazyPut(() => BuyInProvinceWaitingLogic()); - Get.lazyPut(() => BuyInProvinceAllLogic()); - }), - ), - + ...StewardPages.pages, //endregion //region Poultry science Pages diff --git a/packages/chicken/lib/presentation/routes/routes.dart b/packages/chicken/lib/presentation/routes/routes.dart index 5ebc351..7ca81df 100644 --- a/packages/chicken/lib/presentation/routes/routes.dart +++ b/packages/chicken/lib/presentation/routes/routes.dart @@ -1,28 +1,7 @@ sealed class ChickenRoutes { ChickenRoutes._(); - static const auth = '/AuthChicken'; static const _base = '/chicken'; - static const role = '$_base/role'; - static const String profile = '$_base/profile'; - - //region Steward Routes - static const _steward = '$_base/steward'; - static const initSteward = '$_steward/'; - static const homeSteward = '$_steward/home'; - static const buySteward = '$_steward/buy'; - static const saleSteward = '$_steward/sale'; - static const segmentationSteward = '$_steward/segmentation'; - - //buys - static const buysOutOfProvinceSteward = '$buySteward/buyOutOfProvince'; - static const buysInProvinceSteward = '$buySteward/buyInProvince'; - - //sales - static const salesInProvinceSteward = '$saleSteward/SalesInProvince'; - static const salesOutOfProvinceSteward = '$saleSteward/saleOutOfProvince'; - static const salesOutOfProvinceBuyerSteward = - '$saleSteward/saleOutOfProvinceBuyer '; //endregion diff --git a/packages/chicken/lib/presentation/utils/utils.dart b/packages/chicken/lib/presentation/utils/utils.dart index f6f89f3..f5d0771 100644 --- a/packages/chicken/lib/presentation/utils/utils.dart +++ b/packages/chicken/lib/presentation/utils/utils.dart @@ -1,19 +1,28 @@ import 'package:flutter/material.dart'; +import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; import 'package:rasadyar_core/core.dart'; const int timeDebounce = 1200; void handleGeneric(DioException error, [void Function()? onError]) { - Get.showSnackbar(_errorSnackBar('اعتبار توکن شما منقضی شده است لطفا دوباره وارد شوید')); + Get.showSnackbar( + _errorSnackBar('اعتبار توکن شما منقضی شده است لطفا دوباره وارد شوید'), + ); - Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken); + Get.offAllNamed(CommonRoutes.auth, arguments: Module.chicken); } GetSnackBar _errorSnackBar(String message) { return GetSnackBar( - titleText: Text('خطا', style: AppFonts.yekan14.copyWith(color: Colors.white)), - messageText: Text(message, style: AppFonts.yekan12.copyWith(color: Colors.white)), + titleText: Text( + 'خطا', + style: AppFonts.yekan14.copyWith(color: Colors.white), + ), + messageText: Text( + message, + style: AppFonts.yekan12.copyWith(color: Colors.white), + ), backgroundColor: AppColor.error, margin: EdgeInsets.symmetric(horizontal: 12, vertical: 8), borderRadius: 12, diff --git a/packages/chicken/lib/presentation/widget/captcha/view.dart b/packages/chicken/lib/presentation/widget/captcha/view.dart index c9c0d4c..278d77b 100644 --- a/packages/chicken/lib/presentation/widget/captcha/view.dart +++ b/packages/chicken/lib/presentation/widget/captcha/view.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/presentation/pages/common/auth/logic.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/auth/logic.dart'; import 'package:rasadyar_core/core.dart'; import 'logic.dart'; diff --git a/packages/chicken/lib/presentation/widget/steward/inventory_widget.dart b/packages/chicken/lib/presentation/widget/steward/inventory_widget.dart index e5c16e5..91df31e 100644 --- a/packages/chicken/lib/presentation/widget/steward/inventory_widget.dart +++ b/packages/chicken/lib/presentation/widget/steward/inventory_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_core/core.dart'; Widget inventoryWidget(StewardRootLogic rootLogic) { diff --git a/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart b/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart index 7964db0..bcbc259 100644 --- a/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart +++ b/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart @@ -1,5 +1,5 @@ -import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart'; import 'package:rasadyar_core/core.dart'; enum WidelyUsedType { edit, normal } diff --git a/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart b/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart index 6f623cb..ace6375 100644 --- a/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart +++ b/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_core/core.dart'; @@ -39,7 +39,10 @@ class WidelyUsedWidget extends StatelessWidget { controller.rootLogic.currentPage.value = 0; controller.rootLogic.currentPage.refresh(); await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: stewardFirstKey); + Get.toNamed( + StewardRoutes.buysOutOfProvinceSteward, + id: stewardFirstKey, + ); }, ), @@ -52,7 +55,10 @@ class WidelyUsedWidget extends StatelessWidget { controller.rootLogic.currentPage.value = 0; controller.rootLogic.currentPage.refresh(); await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: stewardFirstKey); + Get.toNamed( + StewardRoutes.buysInProvinceSteward, + id: stewardFirstKey, + ); }, isOnEdit: false, ), @@ -65,7 +71,10 @@ class WidelyUsedWidget extends StatelessWidget { controller.rootLogic.currentPage.value = 1; controller.rootLogic.currentPage.refresh(); await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: stewardSecondKey); + Get.toNamed( + StewardRoutes.salesOutOfProvinceSteward, + id: stewardSecondKey, + ); }, ), @@ -77,7 +86,10 @@ class WidelyUsedWidget extends StatelessWidget { controller.rootLogic.currentPage.value = 1; controller.rootLogic.currentPage.refresh(); await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: stewardSecondKey); + Get.toNamed( + StewardRoutes.salesInProvinceSteward, + id: stewardSecondKey, + ); }, ), ], @@ -93,7 +105,11 @@ class WidelyUsedWidget extends StatelessWidget { borderRadius: BorderRadius.circular(8), border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)), ), - child: Text('پر کاربردها', textAlign: TextAlign.right, style: AppFonts.yekan16), + child: Text( + 'پر کاربردها', + textAlign: TextAlign.right, + style: AppFonts.yekan16, + ), ), ), ], @@ -126,20 +142,27 @@ class WidelyUsedWidget extends StatelessWidget { padding: EdgeInsets.all(4), decoration: ShapeDecoration( color: cardColor ?? Color(0xFFBECDFF), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), ), child: Container( width: 40.w, height: 40.h, decoration: ShapeDecoration( color: labelColor ?? AppColor.blueNormal, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), ), padding: EdgeInsets.all(4), child: SvgGenImage.vec(iconPath).svg( width: 24.w, height: 24.h, - colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn), + colorFilter: ColorFilter.mode( + Colors.white, + BlendMode.srcIn, + ), fit: BoxFit.cover, ), ), @@ -152,7 +175,9 @@ class WidelyUsedWidget extends StatelessWidget { padding: EdgeInsets.all(4), decoration: ShapeDecoration( color: Colors.white60, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), ), ), ), @@ -172,9 +197,16 @@ class WidelyUsedWidget extends StatelessWidget { child: Container( width: 16, height: 16, - decoration: BoxDecoration(shape: BoxShape.circle, color: Colors.white), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.white, + ), alignment: Alignment.center, - child: Icon(CupertinoIcons.minus, color: AppColor.error, size: 15), + child: Icon( + CupertinoIcons.minus, + color: AppColor.error, + size: 15, + ), ), ), ), @@ -183,7 +215,12 @@ class WidelyUsedWidget extends StatelessWidget { ), ], ), - Text(title, style: AppFonts.yekan10.copyWith(color: textColor ?? AppColor.textColor)), + Text( + title, + style: AppFonts.yekan10.copyWith( + color: textColor ?? AppColor.textColor, + ), + ), ], ), ); @@ -201,16 +238,24 @@ class WidelyUsedWidget extends StatelessWidget { padding: EdgeInsets.all(4), decoration: ShapeDecoration( color: const Color(0xFFD9F7F0), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), ), child: Assets.vec.messageAddSvg.svg( width: 40, height: 40, - colorFilter: ColorFilter.mode(AppColor.greenNormal, BlendMode.srcIn), + colorFilter: ColorFilter.mode( + AppColor.greenNormal, + BlendMode.srcIn, + ), fit: BoxFit.cover, ), ), - Text('افزودن', style: AppFonts.yekan10.copyWith(color: AppColor.greenDarkHover)), + Text( + 'افزودن', + style: AppFonts.yekan10.copyWith(color: AppColor.greenDarkHover), + ), ], ); } diff --git a/packages/chicken/test/data/common/fa_user_role_test.dart b/packages/chicken/test/data/common/fa_user_role_test.dart index e16bf4e..697e80b 100644 --- a/packages/chicken/test/data/common/fa_user_role_test.dart +++ b/packages/chicken/test/data/common/fa_user_role_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter_test/flutter_test.dart'; +/* import 'package:flutter_test/flutter_test.dart'; import 'package:rasadyar_chicken/data/common/fa_user_role.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; @@ -23,4 +23,4 @@ void main() { expect(getFaUserRoleWithOnTap(null), {'نامشخص': null}); }); }); -} \ No newline at end of file +} */ \ No newline at end of file