chore : change package supervision to inspection

This commit is contained in:
2025-04-22 15:51:05 +03:30
parent a45c0807d1
commit 1ad180d0b6
32 changed files with 121 additions and 127 deletions

View File

@@ -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<AddMobileInspectorLogic> {
RElevated(
text: 'مرحله بعد',
onPressed: () {
Get.toNamed(SupervisionRoutes.supervisionRegistrationOfViolation);
Get.toNamed(InspectionRoutes.inspectionRegistrationOfViolation);
},
isFullWidth: true,
height: 40,

View File

@@ -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<AddSupervisionLogic> {
child: RElevated(
text: 'مرحله بعد',
onPressed: () {
Get.toNamed(SupervisionRoutes.supervisionAddMobileInspector);
Get.toNamed(InspectionRoutes.inspectionAddMobileInspector);
},
height: 40,
isFullWidth: true,

View File

@@ -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';

View File

@@ -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 }

View File

@@ -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<SupervisionFilterLogic> {
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<SupervisionFilterLogic> {
),
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<SupervisionFilterLogic> {
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<SupervisionFilterLogic> {
height: 24,
color: AppColor.greenNormal,
onTap: () {
Get.toNamed(SupervisionRoutes.supervisionAddSupervision);
Get.toNamed(InspectionRoutes.inspectionAddSupervision);
},
),

View File

@@ -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<RegistrationOfViolationLogic> {
@@ -103,7 +103,7 @@ backgroundColor:AppColor.bgLight,
RElevated(
text: 'مرحله بعد',
onPressed: () {
Get.toNamed(SupervisionRoutes.supervisionDisplayInformation);
Get.toNamed(InspectionRoutes.inspectionDisplayInformation);
},
isFullWidth: true,
height: 40,

View File

@@ -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;

View File

@@ -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()),
),
];
}

View File

@@ -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';
}

View File

@@ -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

View File

@@ -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()),
),
];
}

View File

@@ -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';
}

View File

@@ -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<AuthWithUseAndPassLogic> {
@@ -234,10 +233,9 @@ class AuthWithUseAndPassPage extends GetView<AuthWithUseAndPassLogic> {
RElevated(
text: 'ورود',
onPressed: () {
if (data.value.currentState?.validate() == true &&
controller.captchaController.validate()) {
Get.toNamed(SupervisionRoutes.supervision);
Get.toNamed(InspectionRoutes.inspection);
}
},
width: Get.width,

View File

@@ -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);
});
}

View File

@@ -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,
];
}

View File

@@ -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:

View File

@@ -36,8 +36,8 @@ dependencies:
get_it: ^8.0.3
supervision:
path: ./features/supervision
inspection:
path: ./features/inspection
rasadyar_core:
path: ./packages/core