From 1ad180d0b6d2411bfd1aba3fc82ee71acc42551e Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Tue, 22 Apr 2025 15:51:05 +0330 Subject: [PATCH] chore : change package supervision to inspection --- .../lib/data/utils/marker_generator.dart | 0 .../lib/inspection.dart} | 0 .../lib/presentation/action/logic.dart | 0 .../lib/presentation/action/view.dart | 0 .../add_mobile_inspector/logic.dart | 0 .../add_mobile_inspector/view.dart | 4 +- .../presentation/add_supervision/logic.dart | 0 .../presentation/add_supervision/view.dart | 4 +- .../display_information/logic.dart | 0 .../display_information/view.dart | 2 +- .../lib/presentation/filter/logic.dart | 2 +- .../lib/presentation/filter/view.dart | 10 +-- .../presentation/location_details/logic.dart | 0 .../presentation/location_details/view.dart | 0 .../lib/presentation/profile/logic.dart | 0 .../lib/presentation/profile/view.dart | 0 .../registration_of_violation/logic.dart | 0 .../registration_of_violation/view.dart | 6 +- .../lib/presentation/root/logic.dart | 8 +-- .../lib/presentation/root/view.dart | 0 .../lib/presentation/routes/app_pages.dart | 69 +++++++++++++++++++ .../lib/presentation/routes/app_routes.dart | 12 ++++ .../presentation/widget/cluster_marker.dart | 0 .../{supervision => inspection}/pubspec.lock | 0 .../{supervision => inspection}/pubspec.yaml | 4 +- .../lib/presentation/routes/app_pages.dart | 69 ------------------- .../lib/presentation/routes/app_routes.dart | 16 ----- .../auth/auth_with_use_and_pass/view.dart | 8 +-- lib/presentation/pages/splash/logic.dart | 4 +- lib/presentation/routes/app_pages.dart | 4 +- pubspec.lock | 22 +++--- pubspec.yaml | 4 +- 32 files changed, 121 insertions(+), 127 deletions(-) rename features/{supervision => inspection}/lib/data/utils/marker_generator.dart (100%) rename features/{supervision/lib/supervision.dart => inspection/lib/inspection.dart} (100%) rename features/{supervision => inspection}/lib/presentation/action/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/action/view.dart (100%) rename features/{supervision => inspection}/lib/presentation/add_mobile_inspector/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/add_mobile_inspector/view.dart (96%) rename features/{supervision => inspection}/lib/presentation/add_supervision/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/add_supervision/view.dart (97%) rename features/{supervision => inspection}/lib/presentation/display_information/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/display_information/view.dart (99%) rename features/{supervision => inspection}/lib/presentation/filter/logic.dart (98%) rename features/{supervision => inspection}/lib/presentation/filter/view.dart (98%) rename features/{supervision => inspection}/lib/presentation/location_details/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/location_details/view.dart (100%) rename features/{supervision => inspection}/lib/presentation/profile/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/profile/view.dart (100%) rename features/{supervision => inspection}/lib/presentation/registration_of_violation/logic.dart (100%) rename features/{supervision => inspection}/lib/presentation/registration_of_violation/view.dart (94%) rename features/{supervision => inspection}/lib/presentation/root/logic.dart (64%) rename features/{supervision => inspection}/lib/presentation/root/view.dart (100%) create mode 100644 features/inspection/lib/presentation/routes/app_pages.dart create mode 100644 features/inspection/lib/presentation/routes/app_routes.dart rename features/{supervision => inspection}/lib/presentation/widget/cluster_marker.dart (100%) rename features/{supervision => inspection}/pubspec.lock (100%) rename features/{supervision => inspection}/pubspec.yaml (81%) delete mode 100644 features/supervision/lib/presentation/routes/app_pages.dart delete mode 100644 features/supervision/lib/presentation/routes/app_routes.dart diff --git a/features/supervision/lib/data/utils/marker_generator.dart b/features/inspection/lib/data/utils/marker_generator.dart similarity index 100% rename from features/supervision/lib/data/utils/marker_generator.dart rename to features/inspection/lib/data/utils/marker_generator.dart diff --git a/features/supervision/lib/supervision.dart b/features/inspection/lib/inspection.dart similarity index 100% rename from features/supervision/lib/supervision.dart rename to features/inspection/lib/inspection.dart diff --git a/features/supervision/lib/presentation/action/logic.dart b/features/inspection/lib/presentation/action/logic.dart similarity index 100% rename from features/supervision/lib/presentation/action/logic.dart rename to features/inspection/lib/presentation/action/logic.dart diff --git a/features/supervision/lib/presentation/action/view.dart b/features/inspection/lib/presentation/action/view.dart similarity index 100% rename from features/supervision/lib/presentation/action/view.dart rename to features/inspection/lib/presentation/action/view.dart diff --git a/features/supervision/lib/presentation/add_mobile_inspector/logic.dart b/features/inspection/lib/presentation/add_mobile_inspector/logic.dart similarity index 100% rename from features/supervision/lib/presentation/add_mobile_inspector/logic.dart rename to features/inspection/lib/presentation/add_mobile_inspector/logic.dart diff --git a/features/supervision/lib/presentation/add_mobile_inspector/view.dart b/features/inspection/lib/presentation/add_mobile_inspector/view.dart similarity index 96% rename from features/supervision/lib/presentation/add_mobile_inspector/view.dart rename to features/inspection/lib/presentation/add_mobile_inspector/view.dart index df7c460..87d4a82 100644 --- a/features/supervision/lib/presentation/add_mobile_inspector/view.dart +++ b/features/inspection/lib/presentation/add_mobile_inspector/view.dart @@ -3,7 +3,7 @@ import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/presentation/widget/buttons/elevated.dart'; import 'package:rasadyar_core/presentation/widget/buttons/fab.dart'; import 'package:rasadyar_core/presentation/widget/inputs/r_input.dart'; -import 'package:supervision/presentation/routes/app_routes.dart'; +import 'package:inspection/presentation/routes/app_routes.dart'; import 'logic.dart'; @@ -106,7 +106,7 @@ class AddMobileInspectorPage extends GetView { RElevated( text: 'مرحله بعد', onPressed: () { - Get.toNamed(SupervisionRoutes.supervisionRegistrationOfViolation); + Get.toNamed(InspectionRoutes.inspectionRegistrationOfViolation); }, isFullWidth: true, height: 40, diff --git a/features/supervision/lib/presentation/add_supervision/logic.dart b/features/inspection/lib/presentation/add_supervision/logic.dart similarity index 100% rename from features/supervision/lib/presentation/add_supervision/logic.dart rename to features/inspection/lib/presentation/add_supervision/logic.dart diff --git a/features/supervision/lib/presentation/add_supervision/view.dart b/features/inspection/lib/presentation/add_supervision/view.dart similarity index 97% rename from features/supervision/lib/presentation/add_supervision/view.dart rename to features/inspection/lib/presentation/add_supervision/view.dart index 2b5c68b..eb6ad50 100644 --- a/features/supervision/lib/presentation/add_supervision/view.dart +++ b/features/inspection/lib/presentation/add_supervision/view.dart @@ -3,7 +3,7 @@ import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/presentation/widget/buttons/elevated.dart'; import 'package:rasadyar_core/presentation/widget/inputs/r_input.dart'; import 'package:rasadyar_core/presentation/widget/tabs/new_tab.dart'; -import 'package:supervision/supervision.dart'; +import 'package:inspection/inspection.dart'; import 'logic.dart'; @@ -72,7 +72,7 @@ class AddSupervisionPage extends GetView { child: RElevated( text: 'مرحله بعد', onPressed: () { - Get.toNamed(SupervisionRoutes.supervisionAddMobileInspector); + Get.toNamed(InspectionRoutes.inspectionAddMobileInspector); }, height: 40, isFullWidth: true, diff --git a/features/supervision/lib/presentation/display_information/logic.dart b/features/inspection/lib/presentation/display_information/logic.dart similarity index 100% rename from features/supervision/lib/presentation/display_information/logic.dart rename to features/inspection/lib/presentation/display_information/logic.dart diff --git a/features/supervision/lib/presentation/display_information/view.dart b/features/inspection/lib/presentation/display_information/view.dart similarity index 99% rename from features/supervision/lib/presentation/display_information/view.dart rename to features/inspection/lib/presentation/display_information/view.dart index a48da49..f2abc78 100644 --- a/features/supervision/lib/presentation/display_information/view.dart +++ b/features/inspection/lib/presentation/display_information/view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/presentation/widget/buttons/elevated.dart'; import 'package:rasadyar_core/presentation/widget/inputs/r_input.dart'; -import 'package:supervision/supervision.dart'; +import 'package:inspection/inspection.dart'; import 'logic.dart'; diff --git a/features/supervision/lib/presentation/filter/logic.dart b/features/inspection/lib/presentation/filter/logic.dart similarity index 98% rename from features/supervision/lib/presentation/filter/logic.dart rename to features/inspection/lib/presentation/filter/logic.dart index 4818aaa..272f63c 100644 --- a/features/supervision/lib/presentation/filter/logic.dart +++ b/features/inspection/lib/presentation/filter/logic.dart @@ -7,7 +7,7 @@ import 'package:flutter_map_animations/flutter_map_animations.dart'; import 'package:geolocator/geolocator.dart'; import 'package:latlong2/latlong.dart'; import 'package:rasadyar_core/core.dart'; -import 'package:supervision/data/utils/marker_generator.dart'; +import 'package:inspection/data/utils/marker_generator.dart'; enum BottomSheetStep { filter, markerSelected, markerDetails } diff --git a/features/supervision/lib/presentation/filter/view.dart b/features/inspection/lib/presentation/filter/view.dart similarity index 98% rename from features/supervision/lib/presentation/filter/view.dart rename to features/inspection/lib/presentation/filter/view.dart index 77f8e7f..8477e16 100644 --- a/features/supervision/lib/presentation/filter/view.dart +++ b/features/inspection/lib/presentation/filter/view.dart @@ -3,7 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/presentation/widget/buttons/fab.dart'; -import 'package:supervision/presentation/routes/app_routes.dart'; +import 'package:inspection/presentation/routes/app_routes.dart'; import 'logic.dart'; @@ -146,7 +146,7 @@ class SupervisionFilterPage extends GetView { children: [ CustomSlidableAction( onPressed: (context) { - Get.toNamed(SupervisionRoutes.supervisionLocationDetails); + Get.toNamed(InspectionRoutes.inspectionLocationDetails); }, backgroundColor: AppColor.blueNormal, foregroundColor: Colors.white, @@ -159,7 +159,7 @@ class SupervisionFilterPage extends GetView { ), CustomSlidableAction( onPressed: (context) { - Get.toNamed(SupervisionRoutes.supervisionAddSupervision); + Get.toNamed(InspectionRoutes.inspectionAddSupervision); }, backgroundColor: AppColor.greenNormal, padding: EdgeInsets.all(16), @@ -445,7 +445,7 @@ class SupervisionFilterPage extends GetView { vecWidgetWithOnTap( assets: Assets.vecMapSvg, onTap: () { - Get.toNamed(SupervisionRoutes.supervisionLocationDetails); + Get.toNamed(InspectionRoutes.inspectionLocationDetails); }, width: 24, height: 24, @@ -457,7 +457,7 @@ class SupervisionFilterPage extends GetView { height: 24, color: AppColor.greenNormal, onTap: () { - Get.toNamed(SupervisionRoutes.supervisionAddSupervision); + Get.toNamed(InspectionRoutes.inspectionAddSupervision); }, ), diff --git a/features/supervision/lib/presentation/location_details/logic.dart b/features/inspection/lib/presentation/location_details/logic.dart similarity index 100% rename from features/supervision/lib/presentation/location_details/logic.dart rename to features/inspection/lib/presentation/location_details/logic.dart diff --git a/features/supervision/lib/presentation/location_details/view.dart b/features/inspection/lib/presentation/location_details/view.dart similarity index 100% rename from features/supervision/lib/presentation/location_details/view.dart rename to features/inspection/lib/presentation/location_details/view.dart diff --git a/features/supervision/lib/presentation/profile/logic.dart b/features/inspection/lib/presentation/profile/logic.dart similarity index 100% rename from features/supervision/lib/presentation/profile/logic.dart rename to features/inspection/lib/presentation/profile/logic.dart diff --git a/features/supervision/lib/presentation/profile/view.dart b/features/inspection/lib/presentation/profile/view.dart similarity index 100% rename from features/supervision/lib/presentation/profile/view.dart rename to features/inspection/lib/presentation/profile/view.dart diff --git a/features/supervision/lib/presentation/registration_of_violation/logic.dart b/features/inspection/lib/presentation/registration_of_violation/logic.dart similarity index 100% rename from features/supervision/lib/presentation/registration_of_violation/logic.dart rename to features/inspection/lib/presentation/registration_of_violation/logic.dart diff --git a/features/supervision/lib/presentation/registration_of_violation/view.dart b/features/inspection/lib/presentation/registration_of_violation/view.dart similarity index 94% rename from features/supervision/lib/presentation/registration_of_violation/view.dart rename to features/inspection/lib/presentation/registration_of_violation/view.dart index d012467..c3afd32 100644 --- a/features/supervision/lib/presentation/registration_of_violation/view.dart +++ b/features/inspection/lib/presentation/registration_of_violation/view.dart @@ -3,8 +3,8 @@ import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/presentation/widget/buttons/elevated.dart'; import 'package:rasadyar_core/presentation/widget/buttons/fab.dart'; import 'package:rasadyar_core/presentation/widget/inputs/r_input.dart'; -import 'package:supervision/presentation/registration_of_violation/logic.dart'; -import 'package:supervision/presentation/routes/app_routes.dart'; +import 'package:inspection/presentation/registration_of_violation/logic.dart'; +import 'package:inspection/presentation/routes/app_routes.dart'; class RegistrationOfViolationPage extends GetView { @@ -103,7 +103,7 @@ backgroundColor:AppColor.bgLight, RElevated( text: 'مرحله بعد', onPressed: () { - Get.toNamed(SupervisionRoutes.supervisionDisplayInformation); + Get.toNamed(InspectionRoutes.inspectionDisplayInformation); }, isFullWidth: true, height: 40, diff --git a/features/supervision/lib/presentation/root/logic.dart b/features/inspection/lib/presentation/root/logic.dart similarity index 64% rename from features/supervision/lib/presentation/root/logic.dart rename to features/inspection/lib/presentation/root/logic.dart index c5d51a7..c7428af 100644 --- a/features/supervision/lib/presentation/root/logic.dart +++ b/features/inspection/lib/presentation/root/logic.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:supervision/presentation/action/view.dart'; -import 'package:supervision/presentation/filter/view.dart'; -import 'package:supervision/presentation/profile/view.dart'; +import 'package:rasadyar_core/core.dart'; +import 'package:inspection/presentation/action/view.dart'; +import 'package:inspection/presentation/filter/view.dart'; +import 'package:inspection/presentation/profile/view.dart'; class RootLogic extends GetxController { RxInt currentIndex = 0.obs; diff --git a/features/supervision/lib/presentation/root/view.dart b/features/inspection/lib/presentation/root/view.dart similarity index 100% rename from features/supervision/lib/presentation/root/view.dart rename to features/inspection/lib/presentation/root/view.dart diff --git a/features/inspection/lib/presentation/routes/app_pages.dart b/features/inspection/lib/presentation/routes/app_pages.dart new file mode 100644 index 0000000..b1ec38c --- /dev/null +++ b/features/inspection/lib/presentation/routes/app_pages.dart @@ -0,0 +1,69 @@ +import 'package:rasadyar_core/core.dart'; +import 'package:inspection/presentation/action/logic.dart'; +import 'package:inspection/presentation/add_mobile_inspector/logic.dart'; +import 'package:inspection/presentation/add_mobile_inspector/view.dart'; +import 'package:inspection/presentation/add_supervision/logic.dart'; +import 'package:inspection/presentation/add_supervision/view.dart'; +import 'package:inspection/presentation/display_information/logic.dart'; +import 'package:inspection/presentation/display_information/view.dart'; +import 'package:inspection/presentation/filter/logic.dart'; +import 'package:inspection/presentation/location_details/logic.dart'; +import 'package:inspection/presentation/location_details/view.dart'; +import 'package:inspection/presentation/profile/logic.dart'; +import 'package:inspection/presentation/profile/view.dart'; +import 'package:inspection/presentation/registration_of_violation/logic.dart'; +import 'package:inspection/presentation/registration_of_violation/view.dart'; +import 'package:inspection/presentation/root/logic.dart'; +import 'package:inspection/presentation/root/view.dart'; +import 'package:inspection/presentation/routes/app_routes.dart'; + +sealed class InspectionPages { + InspectionPages._(); + + static final pages = [ + GetPage( + name: InspectionRoutes.inspection, + page: () => RootPage(), + binding: BindingsBuilder(() { + Get.put(RootLogic()); + Get.put(SupervisionFilterLogic()); + Get.lazyPut(() => LocationDetailsLogic(), fenix: true); + Get.lazyPut(() => ActionLogic(), fenix: true); + Get.lazyPut(() => ProfileLogic(), fenix: true); + }), + ), + + GetPage( + name: InspectionRoutes.inspectionLocationDetails, + page: () => LocationDetailsPage(), + bindings: [BindingsBuilder.put(() => LocationDetailsLogic())], + ), + + GetPage( + name: InspectionRoutes.inspectionAddSupervision, + page: () => AddSupervisionPage(), + binding: BindingsBuilder.put(() => AddSupervisionLogic()), + ), + GetPage( + name: InspectionRoutes.inspectionRegistrationOfViolation, + page: () => RegistrationOfViolationPage(), + binding: BindingsBuilder.put(() => RegistrationOfViolationLogic()), + ), + + GetPage( + name: InspectionRoutes.inspectionDisplayInformation, + page: () => DisplayInformationPage(), + binding: BindingsBuilder.put(() => DisplayInformationLogic()), + ), + GetPage( + name: InspectionRoutes.inspectionUserProfile, + page: () => ProfilePage(), + binding: BindingsBuilder.put(() => ProfileLogic()), + ), + GetPage( + name: InspectionRoutes.inspectionAddMobileInspector, + page: () => AddMobileInspectorPage(), + binding: BindingsBuilder.put(() => AddMobileInspectorLogic()), + ), + ]; +} diff --git a/features/inspection/lib/presentation/routes/app_routes.dart b/features/inspection/lib/presentation/routes/app_routes.dart new file mode 100644 index 0000000..beff1e6 --- /dev/null +++ b/features/inspection/lib/presentation/routes/app_routes.dart @@ -0,0 +1,12 @@ +sealed class InspectionRoutes { + InspectionRoutes._(); + + static const inspection = '/supervision'; + static const inspectionAction = '$inspection/action'; + static const inspectionUserProfile = '$inspection/userSettings'; + static const inspectionLocationDetails = '$inspection/locationDetails'; + static const inspectionAddSupervision = '$inspectionLocationDetails/addSupervision'; + static const inspectionAddMobileInspector = '$inspectionLocationDetails/addMobileInspector'; + static const inspectionRegistrationOfViolation = '$inspectionAddSupervision/RegistrationOfViolation'; + static const inspectionDisplayInformation = '$inspectionRegistrationOfViolation/DisplayInformation'; +} diff --git a/features/supervision/lib/presentation/widget/cluster_marker.dart b/features/inspection/lib/presentation/widget/cluster_marker.dart similarity index 100% rename from features/supervision/lib/presentation/widget/cluster_marker.dart rename to features/inspection/lib/presentation/widget/cluster_marker.dart diff --git a/features/supervision/pubspec.lock b/features/inspection/pubspec.lock similarity index 100% rename from features/supervision/pubspec.lock rename to features/inspection/pubspec.lock diff --git a/features/supervision/pubspec.yaml b/features/inspection/pubspec.yaml similarity index 81% rename from features/supervision/pubspec.yaml rename to features/inspection/pubspec.yaml index 7dd0679..cea82c7 100644 --- a/features/supervision/pubspec.yaml +++ b/features/inspection/pubspec.yaml @@ -1,5 +1,5 @@ -name: supervision -description: "A new Flutter project." +name: inspection +description: "inspection module for rasadyar" publish_to: 'none' version: 1.0.0 diff --git a/features/supervision/lib/presentation/routes/app_pages.dart b/features/supervision/lib/presentation/routes/app_pages.dart deleted file mode 100644 index de326a2..0000000 --- a/features/supervision/lib/presentation/routes/app_pages.dart +++ /dev/null @@ -1,69 +0,0 @@ -import 'package:rasadyar_core/core.dart'; -import 'package:supervision/presentation/action/logic.dart'; -import 'package:supervision/presentation/add_mobile_inspector/logic.dart'; -import 'package:supervision/presentation/add_mobile_inspector/view.dart'; -import 'package:supervision/presentation/add_supervision/logic.dart'; -import 'package:supervision/presentation/add_supervision/view.dart'; -import 'package:supervision/presentation/display_information/logic.dart'; -import 'package:supervision/presentation/display_information/view.dart'; -import 'package:supervision/presentation/filter/logic.dart'; -import 'package:supervision/presentation/location_details/logic.dart'; -import 'package:supervision/presentation/location_details/view.dart'; -import 'package:supervision/presentation/profile/logic.dart'; -import 'package:supervision/presentation/profile/view.dart'; -import 'package:supervision/presentation/registration_of_violation/logic.dart'; -import 'package:supervision/presentation/registration_of_violation/view.dart'; -import 'package:supervision/presentation/root/logic.dart'; -import 'package:supervision/presentation/root/view.dart'; -import 'package:supervision/presentation/routes/app_routes.dart'; - -sealed class SupervisionPages { - SupervisionPages._(); - - static final pages = [ - GetPage( - name: SupervisionRoutes.supervision, - page: () => RootPage(), - binding: BindingsBuilder(() { - Get.put(RootLogic()); - Get.put(SupervisionFilterLogic()); - Get.lazyPut(() => LocationDetailsLogic(), fenix: true); - Get.lazyPut(() => ActionLogic(), fenix: true); - Get.lazyPut(() => ProfileLogic(), fenix: true); - }), - ), - - GetPage( - name: SupervisionRoutes.supervisionLocationDetails, - page: () => LocationDetailsPage(), - bindings: [BindingsBuilder.put(() => LocationDetailsLogic())], - ), - - GetPage( - name: SupervisionRoutes.supervisionAddSupervision, - page: () => AddSupervisionPage(), - binding: BindingsBuilder.put(() => AddSupervisionLogic()), - ), - GetPage( - name: SupervisionRoutes.supervisionRegistrationOfViolation, - page: () => RegistrationOfViolationPage(), - binding: BindingsBuilder.put(() => RegistrationOfViolationLogic()), - ), - - GetPage( - name: SupervisionRoutes.supervisionDisplayInformation, - page: () => DisplayInformationPage(), - binding: BindingsBuilder.put(() => DisplayInformationLogic()), - ), - GetPage( - name: SupervisionRoutes.supervisionUserProfile, - page: () => ProfilePage(), - binding: BindingsBuilder.put(() => ProfileLogic()), - ), - GetPage( - name: SupervisionRoutes.supervisionAddMobileInspector, - page: () => AddMobileInspectorPage(), - binding: BindingsBuilder.put(() => AddMobileInspectorLogic()), - ), - ]; -} diff --git a/features/supervision/lib/presentation/routes/app_routes.dart b/features/supervision/lib/presentation/routes/app_routes.dart deleted file mode 100644 index 8693dc5..0000000 --- a/features/supervision/lib/presentation/routes/app_routes.dart +++ /dev/null @@ -1,16 +0,0 @@ -sealed class SupervisionRoutes { - SupervisionRoutes._(); - - static const supervision = '/supervision'; - static const supervisionAction = '$supervision/action'; - static const supervisionUserProfile = '$supervision/userSettings'; - static const supervisionLocationDetails = '$supervision/locationDetails'; - static const supervisionAddSupervision = - '$supervisionLocationDetails/addSupervision'; - static const supervisionAddMobileInspector = - '$supervisionLocationDetails/addMobileInspector'; - static const supervisionRegistrationOfViolation = - '$supervisionAddSupervision/RegistrationOfViolation'; - static const supervisionDisplayInformation = - '$supervisionRegistrationOfViolation/DisplayInformation'; -} diff --git a/lib/presentation/pages/auth/auth_with_use_and_pass/view.dart b/lib/presentation/pages/auth/auth_with_use_and_pass/view.dart index e92376c..33d73d8 100644 --- a/lib/presentation/pages/auth/auth_with_use_and_pass/view.dart +++ b/lib/presentation/pages/auth/auth_with_use_and_pass/view.dart @@ -2,15 +2,14 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:logger/logger.dart'; -import 'package:rasadyar_app/infrastructure/di/di.dart'; +import 'package:inspection/inspection.dart'; import 'package:rasadyar_app/presentation/common/app_color.dart'; import 'package:rasadyar_app/presentation/common/app_fonts.dart'; import 'package:rasadyar_app/presentation/common/assets.dart'; import 'package:rasadyar_app/presentation/widget/buttons/elevated.dart'; import 'package:rasadyar_app/presentation/widget/captcha/captcha_widget.dart'; import 'package:rasadyar_app/presentation/widget/vec_widget.dart'; -import 'package:supervision/supervision.dart'; + import 'logic.dart'; class AuthWithUseAndPassPage extends GetView { @@ -234,10 +233,9 @@ class AuthWithUseAndPassPage extends GetView { RElevated( text: 'ورود', onPressed: () { - if (data.value.currentState?.validate() == true && controller.captchaController.validate()) { - Get.toNamed(SupervisionRoutes.supervision); + Get.toNamed(InspectionRoutes.inspection); } }, width: Get.width, diff --git a/lib/presentation/pages/splash/logic.dart b/lib/presentation/pages/splash/logic.dart index 1f47f60..7542f46 100644 --- a/lib/presentation/pages/splash/logic.dart +++ b/lib/presentation/pages/splash/logic.dart @@ -1,7 +1,7 @@ import 'package:flutter/animation.dart'; import 'package:get/get.dart'; import 'package:rasadyar_app/presentation/routes/app_pages.dart'; -import 'package:supervision/supervision.dart'; +import 'package:inspection/inspection.dart'; class SplashLogic extends GetxController with GetTickerProviderStateMixin { late final AnimationController scaleController; @@ -55,7 +55,7 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin { void onReady() { super.onReady(); Future.delayed(const Duration(seconds: 1), () { - Get.offAllNamed(SupervisionRoutes.supervision); + Get.offAllNamed(InspectionRoutes.inspection); }); } diff --git a/lib/presentation/routes/app_pages.dart b/lib/presentation/routes/app_pages.dart index e3b62ae..ab5cb96 100644 --- a/lib/presentation/routes/app_pages.dart +++ b/lib/presentation/routes/app_pages.dart @@ -1,10 +1,10 @@ import 'package:get/get.dart'; +import 'package:inspection/presentation/routes/app_pages.dart'; import 'package:rasadyar_app/presentation/pages/auth/auth_with_use_and_pass/logic.dart'; import 'package:rasadyar_app/presentation/pages/auth/auth_with_use_and_pass/view.dart'; import 'package:rasadyar_app/presentation/pages/splash/logic.dart'; import 'package:rasadyar_app/presentation/pages/splash/view.dart'; import 'package:rasadyar_app/presentation/pages/system_design/system_design.dart'; -import 'package:supervision/supervision.dart'; part 'app_paths.dart'; @@ -27,6 +27,6 @@ sealed class AppPages { binding: BindingsBuilder.put(() => AuthWithUseAndPassLogic()), ), - ...SupervisionPages.pages, + ...InspectionPages.pages, ]; } diff --git a/pubspec.lock b/pubspec.lock index 747dc7c..edfdacd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.13.0" boolean_selector: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" ffi: dependency: transitive description: @@ -477,6 +477,13 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.2" + inspection: + dependency: "direct main" + description: + path: "features/inspection" + relative: true + source: path + version: "1.0.0" intl: dependency: transitive description: @@ -1017,13 +1024,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" - supervision: - dependency: "direct main" - description: - path: "features/supervision" - relative: true - source: path - version: "1.0.0" term_glyph: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 97afd30..51aeb2e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,8 +36,8 @@ dependencies: get_it: ^8.0.3 - supervision: - path: ./features/supervision + inspection: + path: ./features/inspection rasadyar_core: path: ./packages/core