diff --git a/old_lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart similarity index 100% rename from old_lib/controllers/api_routes/urls.dart rename to lib/controllers/api_routes/urls.dart diff --git a/old_lib/controllers/http_status_manger/http_status_manger.dart b/lib/controllers/http_status_manger/http_status_manger.dart similarity index 100% rename from old_lib/controllers/http_status_manger/http_status_manger.dart rename to lib/controllers/http_status_manger/http_status_manger.dart diff --git a/old_lib/controllers/localization/localization.dart b/lib/controllers/localization/localization.dart similarity index 100% rename from old_lib/controllers/localization/localization.dart rename to lib/controllers/localization/localization.dart diff --git a/old_lib/controllers/notification/firebase_notification_manger.dart b/lib/controllers/notification/firebase_notification_manger.dart similarity index 100% rename from old_lib/controllers/notification/firebase_notification_manger.dart rename to lib/controllers/notification/firebase_notification_manger.dart diff --git a/old_lib/controllers/notification/notification_manger.dart b/lib/controllers/notification/notification_manger.dart similarity index 100% rename from old_lib/controllers/notification/notification_manger.dart rename to lib/controllers/notification/notification_manger.dart diff --git a/old_lib/controllers/providers/api/departments_provider.dart b/lib/controllers/providers/api/departments_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/departments_provider.dart rename to lib/controllers/providers/api/departments_provider.dart diff --git a/old_lib/controllers/providers/api/device_transfer_provider.dart b/lib/controllers/providers/api/device_transfer_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/device_transfer_provider.dart rename to lib/controllers/providers/api/device_transfer_provider.dart diff --git a/old_lib/controllers/providers/api/devices_provider.dart b/lib/controllers/providers/api/devices_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/devices_provider.dart rename to lib/controllers/providers/api/devices_provider.dart diff --git a/old_lib/controllers/providers/api/gas_refill_provider.dart b/lib/controllers/providers/api/gas_refill_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/gas_refill_provider.dart rename to lib/controllers/providers/api/gas_refill_provider.dart diff --git a/old_lib/controllers/providers/api/hospitals_provider.dart b/lib/controllers/providers/api/hospitals_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/hospitals_provider.dart rename to lib/controllers/providers/api/hospitals_provider.dart diff --git a/old_lib/controllers/providers/api/notifications_provider.dart b/lib/controllers/providers/api/notifications_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/notifications_provider.dart rename to lib/controllers/providers/api/notifications_provider.dart diff --git a/old_lib/controllers/providers/api/parts_provider.dart b/lib/controllers/providers/api/parts_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/parts_provider.dart rename to lib/controllers/providers/api/parts_provider.dart diff --git a/old_lib/controllers/providers/api/preventive_maintenance_visits_provider.dart b/lib/controllers/providers/api/preventive_maintenance_visits_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/preventive_maintenance_visits_provider.dart rename to lib/controllers/providers/api/preventive_maintenance_visits_provider.dart diff --git a/old_lib/controllers/providers/api/regular_visits_provider.dart b/lib/controllers/providers/api/regular_visits_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/regular_visits_provider.dart rename to lib/controllers/providers/api/regular_visits_provider.dart diff --git a/old_lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/service_requests_provider.dart rename to lib/controllers/providers/api/service_requests_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/employee/employee_provider.dart b/lib/controllers/providers/api/status_drop_down/employee/employee_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/employee/employee_provider.dart rename to lib/controllers/providers/api/status_drop_down/employee/employee_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart rename to lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart rename to lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart rename to lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart b/lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart rename to lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart b/lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart rename to lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart b/lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart rename to lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart diff --git a/old_lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart rename to lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart diff --git a/old_lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart similarity index 100% rename from old_lib/controllers/providers/api/user_provider.dart rename to lib/controllers/providers/api/user_provider.dart diff --git a/old_lib/controllers/providers/settings/app_settings.dart b/lib/controllers/providers/settings/app_settings.dart similarity index 100% rename from old_lib/controllers/providers/settings/app_settings.dart rename to lib/controllers/providers/settings/app_settings.dart diff --git a/old_lib/controllers/providers/settings/setting_provider.dart b/lib/controllers/providers/settings/setting_provider.dart similarity index 100% rename from old_lib/controllers/providers/settings/setting_provider.dart rename to lib/controllers/providers/settings/setting_provider.dart diff --git a/old_lib/controllers/validator/validator.dart b/lib/controllers/validator/validator.dart similarity index 100% rename from old_lib/controllers/validator/validator.dart rename to lib/controllers/validator/validator.dart diff --git a/lib/core/app_configs/app_localizations.dart b/lib/core/app_configs/app_localizations.dart deleted file mode 100644 index b26ef59c..00000000 --- a/lib/core/app_configs/app_localizations.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:test_sa/core/enums.dart' show SupportedLanguagesEnum; - -class AppLocalizations { - AppLocalizations._(); - - static List supportedLocales = - SupportedLanguagesEnum.values.map((e) => Locale(e.name)).toList(); - - static List get delegates => const [ - // AppLocalization.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ]; -} diff --git a/lib/core/app_configs/app_routes.dart b/lib/core/app_configs/app_routes.dart deleted file mode 100644 index a45d0a44..00000000 --- a/lib/core/app_configs/app_routes.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:test_sa/screens/login_screen/login_screen.dart'; -import 'package:test_sa/screens/splash_screen/splash_screen.dart'; - -Map appRoutes = { - SplashScreen.routeName: (_) => const SplashScreen(), - LoginScreen.routeName: (_) => const LoginScreen(), - // LandPage.routeName: (_) => const LandPage(), - // Register.routeName: (_) => Register(), - // ProfilePage.routeName: (_) => ProfilePage(), - // ReportIssuesPage.routeName: (_) => const ReportIssuesPage(), - // RequestGasRefill.routeName: (_) => const RequestGasRefill(), - // CreateRequestPage.routeName: (_) => CreateRequestPage(), - // SingleHospitalPicker.routeName: (_) => SingleHospitalPicker(), - // SingleDevicePicker.routeName: (_) => SingleDevicePicker(), - // SingleDepartmentPicker.routeName: (_) => SingleDepartmentPicker(), - // ServiceRequestsPage.routeName: (_) => ServiceRequestsPage(), - // NotificationsPage.routeName: (_) => NotificationsPage(), - // FutureRequestServiceDetails.routeName: (_) => - // FutureRequestServiceDetails(), - // PreventiveMaintenanceVisitsPage.routeName: (_) => - // PreventiveMaintenanceVisitsPage(), - // RegularVisitsPage.routeName: (_) => RegularVisitsPage(), - // TrackGasRefillPage.routeName: (_) => const TrackGasRefillPage(), - // RequestDeviceTransfer.routeName: (_) => - // const RequestDeviceTransfer(), - // TrackDeviceTransferPage.routeName: (_) => - // const TrackDeviceTransferPage(), -}; diff --git a/lib/core/app_configs/app_theme.dart b/lib/core/app_configs/app_theme.dart deleted file mode 100644 index ae61fed9..00000000 --- a/lib/core/app_configs/app_theme.dart +++ /dev/null @@ -1,20 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:test_sa/core/constants/app_colors.dart'; - -class AppTheme { - AppTheme._(); - - static get theme => ThemeData( - fontFamily: "Poppins", - canvasColor: AppColors.primaryColor, - scaffoldBackgroundColor: AppColors.scaffoldBackgroundColor, - primaryColor: AppColors.primaryColor, - indicatorColor: AppColors.primaryColor, - colorScheme: const ColorScheme.light( - primary: AppColors.primaryColor, - onPrimary: Colors.white, - secondary: AppColors.secondaryColor, - onSecondary: Colors.white, - ), - ); -} diff --git a/lib/core/constants/api_constants.dart b/lib/core/constants/api_constants.dart deleted file mode 100644 index 7738c43a..00000000 --- a/lib/core/constants/api_constants.dart +++ /dev/null @@ -1,66 +0,0 @@ -class ApiConstants { - ApiConstants._(); - static const host2 = "http://194.163.164.213/atoms/api"; - static const host1 = "https://atoms.hmg.com/api"; - - // API Routes - static const login = "/handle/user/login"; // post - static const register = "/handle/create/user"; // post - static const updateProfile = "/update/user/profile"; // post - static const getHospitals = "/handle/return/all/clients"; // get - static const getDepartments = "/handle/return/all/departments"; // get - static const getEquipment = "/handle/return/all/client/equipments"; // get ?client=208051 - static const getServiceRequests = "/return/user/calls"; // get - - static const getPreventiveMaintenanceVisits = "/return/user/calibrations"; // get - static const updatePreventiveMaintenanceVisits = "/update/user/calibrations"; // get - - static const getRegularVisits = "/return/user/ppm"; // get - static const updateRegularVisits = "/update/user/ppm"; // get - - static const getSingleServiceRequest = "/return/call/information"; // get - static const getNotifications = "/return/user/notification"; // get - static const getRecentNotifications = "/return/user/recent/notification"; // get - static const createRequest = "/handle/create/request"; // get - static const createReport = "/handle/create/report/issue"; // get - static const updateRequestDate = "/handle/update/request"; // get - - // service report - static const createServiceReport = "/handle/create/service/report"; // get - static const updateServiceReport = "/handle/update/service/report"; // get - static const getServiceReport = "/handle/view/service/report"; // get - static const createDuplicatedReport = "/handle/duplicate/request"; // get - - static const getServiceReportReasons = "/return/service/report/reasons"; // get - static const getServiceReportTypes = "/return/service/report/type"; // get - static const getServiceReportStatus = "/return/service/report/status"; // get - static const getServiceReportLastCalls = "/return/call/last/situation"; // get - static const getServiceTypes = "/return/service/type"; // get - static const getPartNumber = "/handle/return/all/parts"; // get - static const getServiceReportPriority = "/return/call/priority/list"; // get - static const getServiceReportDefectTypes = "/return/call/defect/type/list"; // get - - //gas refill - static const getGasTypes = "/return/gas/refill/types"; // get - static const getGasCylinderSize = "/return/gas/refill/size/cylinder"; // get - static const getGasStatus = "/return/gas/refill/status"; // get - static const requestGasRefill = "/create/gas/refill"; // get - static const updateGasRefill = "/update/gas/refill/"; // get - static const getGasRefill = "/search/gas/refill"; // get - - //device transfer - static const requestDeviceTransfer = "/create/transfer/asset"; // get - static const updateDeviceTransfer = "/update/transfer/asset"; // get - static const getDeviceTransfer = "/search/transfer/asset"; // get - - // employee - static const getEmployees = "/return/assigned/employee"; // get - // pentry - static const getPentry = "/return/pentry/details"; // get - static const updatePentry = "/update/pentry/details"; // get - static const getPentryTaskStatus = "/return/pentry/task/status"; // get - static const getPentryVisitStatus = "/return/pentry/visit/status/list"; // get - static const getPentryStatus = "/return/pentry/status/list"; // get - // contacts - static const getPentryContacts = "/handle/return/all/contacts"; // get -} diff --git a/lib/core/constants/app_colors.dart b/lib/core/constants/app_colors.dart deleted file mode 100644 index a8ebe4ce..00000000 --- a/lib/core/constants/app_colors.dart +++ /dev/null @@ -1,50 +0,0 @@ -import 'package:flutter/material.dart'; - -class AppColors { - AppColors._(); - - static const Color white = Color(0xffffffff); - static const Color black = Color(0xff000000); - static const Color grey3A = Color(0xff2e303a); - static const Color grey = Color(0xffe1e7e7); - static const green = Colors.green; - static const Color orange = Colors.orange; - static const Color deepOrange = Colors.deepOrangeAccent; - static const Color red = Colors.red; - static const Color deepRed = Color(0xFFD32F2F); - static const Color scaffoldBackgroundColor = Color(0xffffffff); - static const Color secondaryColor = Color(0xff111427); - static const Color primaryColor = Color(0xff5bb0da); - static const Color cyan = Color(0xff4A8DB7); - static const Color onPrimaryColor = Color(0xffffffff); - static const Color inputFieldBackgroundColor = Color(0xfff5f5f5); - static const Color greyEF = Color(0xffEFEFEF); - - static Color getRequestStatusColor(int id) { - switch (id) { - case 4: - return deepRed; - case 6: - return green; - case 5: - return orange; - case 8: - return green; - case 9: - return orange; - default: - return grey; - } - } - - static Color getGasStatusColor(int id) { - switch (id) { - case 0: - return orange; - case 1: - return green; - default: - return grey; - } - } -} diff --git a/lib/core/enums.dart b/lib/core/enums.dart deleted file mode 100644 index c5cc7bbe..00000000 --- a/lib/core/enums.dart +++ /dev/null @@ -1,20 +0,0 @@ -enum SupportedLanguagesEnum { ar, en } - -enum RequestMethod { get, post, put, delete } - -enum ApiExceptionsEnum { - badRequest(10), - unauthorized(10), - forbidden(10), - notFound(10), - internalServerError(10), - upgradeRequired(10), - badResponseFormat(10), - other(10), - timeout(10), - unknown(10); - - final int statusCode; - - const ApiExceptionsEnum(this.statusCode); -} diff --git a/lib/core/extensions/context_extension.dart b/lib/core/extensions/context_extension.dart deleted file mode 100644 index 65f8e468..00000000 --- a/lib/core/extensions/context_extension.dart +++ /dev/null @@ -1,3 +0,0 @@ -import 'package:flutter/widgets.dart'; - -extension ContextExtension on BuildContext {} diff --git a/lib/core/extensions/num_extension.dart b/lib/core/extensions/num_extension.dart deleted file mode 100644 index 440d8401..00000000 --- a/lib/core/extensions/num_extension.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:test_sa/core/constants/app_colors.dart'; - -extension NumExtension on num { - Widget get height => SizedBox(height: toDouble()); - - Widget get width => SizedBox(width: toDouble()); - - Widget get divider => Divider( - height: toDouble(), - thickness: toDouble(), - color: AppColors.greyEF, - ); - - Widget get makeItSquare => SizedBox(width: toDouble(), height: toDouble()); -} diff --git a/lib/core/extensions/string_extension.dart b/lib/core/extensions/string_extension.dart deleted file mode 100644 index 4259e1e7..00000000 --- a/lib/core/extensions/string_extension.dart +++ /dev/null @@ -1 +0,0 @@ -extension StringExtension on String {} diff --git a/lib/core/extensions/widget_extension.dart b/lib/core/extensions/widget_extension.dart deleted file mode 100644 index 134f9496..00000000 --- a/lib/core/extensions/widget_extension.dart +++ /dev/null @@ -1,3 +0,0 @@ -import 'package:flutter/material.dart'; - -extension WidgetExtension on Widget {} diff --git a/lib/core/utils/provider_scope.dart b/lib/core/utils/provider_scope.dart deleted file mode 100644 index 5d83ff39..00000000 --- a/lib/core/utils/provider_scope.dart +++ /dev/null @@ -1,46 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:test_sa/providers/settings_provider.dart'; - -class ProviderScope extends StatelessWidget { - final Widget child; - - const ProviderScope({required this.child, Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return MultiProvider( - providers: [ - ChangeNotifierProvider(create: (_) => SettingsProvider()), - // ChangeNotifierProvider(create: (_) => UserProvider()), - // ChangeNotifierProvider(create: (_) => HospitalsProvider()), - // ChangeNotifierProvider(create: (_) => DevicesProvider()), - // ChangeNotifierProvider(create: (_) => ServiceRequestsProvider()), - // ChangeNotifierProvider(create: (_) => DepartmentsProvider()), - // ChangeNotifierProvider(create: (_) => NotificationsProvider()), - // ChangeNotifierProvider( - // create: (_) => PreventiveMaintenanceVisitsProvider()), - // ChangeNotifierProvider(create: (_) => RegularVisitsProvider()), - // ChangeNotifierProvider(create: (_) => PartsProvider()), - // ChangeNotifierProvider(create: (_) => ServiceReportReasonsProvider()), - // ChangeNotifierProvider(create: (_) => ServiceReportStatusProvider()), - // ChangeNotifierProvider(create: (_) => ServiceReportTypesProvider()), - // ChangeNotifierProvider(create: (_) => ServiceStatusProvider()), - // ChangeNotifierProvider(create: (_) => ServiceReportLastCallsProvider()), - // ChangeNotifierProvider(create: (_) => GasCylinderSizesProvider()), - // ChangeNotifierProvider(create: (_) => GasStatusProvider()), - // ChangeNotifierProvider(create: (_) => GasTypesProvider()), - // ChangeNotifierProvider(create: (_) => GasRefillProvider()), - // ChangeNotifierProvider(create: (_) => DeviceTransferProvider()), - // ChangeNotifierProvider(create: (_) => EmployeesProvider()), - // ChangeNotifierProvider(create: (_) => PentryTaskStatusProvider()), - // ChangeNotifierProvider(create: (_) => PentryVisitStatusProvider()), - // ChangeNotifierProvider(create: (_) => PentryStatusProvider()), - // ChangeNotifierProvider(create: (_) => ServiceRequestPriorityProvider()), - // ChangeNotifierProvider( - // create: (_) => ServiceRequestDefectTypesProvider()), - ], - child: child, - ); - } -} diff --git a/lib/data/api/api_client.dart b/lib/data/api/api_client.dart deleted file mode 100644 index 71192923..00000000 --- a/lib/data/api/api_client.dart +++ /dev/null @@ -1,57 +0,0 @@ -import 'dart:convert'; - -import 'package:http/http.dart' as http; -import 'package:test_sa/core/enums.dart'; - -class ApiClient { - final String baseUrl, endPoint; - final RequestMethod requestMethod; - - ApiClient.request({ - required this.baseUrl, - required this.endPoint, - required this.requestMethod, - }); - - Future> execute({ - Map? headers, - Map? queryParameters, - Object? body, - }) async { - final url = Uri.tryParse(baseUrl + endPoint); - if (url != null) { - late http.Response response; - switch (requestMethod) { - case RequestMethod.get: - response = await http.get(url, headers: headers); - break; - case RequestMethod.post: - response = await http.post(url, headers: headers, body: body); - break; - case RequestMethod.put: - response = await http.put(url, headers: headers, body: body); - break; - case RequestMethod.delete: - response = await http.delete(url, headers: headers, body: body); - break; - } - return await _handleResponse(response); - } else { - throw ApiExceptionsEnum.other; - } - } - - Future> _handleResponse(http.Response response) { - print('status code ${response.statusCode} : ${response.request?.url}'); - if (response.statusCode == 200) { - return jsonDecode(response.body); - } else if (response.statusCode == 401) { - throw ApiExceptionsEnum.unauthorized; - } else if (response.statusCode == 400) { - throw ApiExceptionsEnum.badRequest; - } else if (response.statusCode == 500) { - throw ApiExceptionsEnum.internalServerError; - } - throw ApiExceptionsEnum.unknown; - } -} diff --git a/lib/data/api/services/user_service.dart b/lib/data/api/services/user_service.dart deleted file mode 100644 index 98e98dde..00000000 --- a/lib/data/api/services/user_service.dart +++ /dev/null @@ -1,18 +0,0 @@ -import 'package:test_sa/core/enums.dart'; -import 'package:test_sa/data/api/api_client.dart'; -import 'package:test_sa/data/models/user_model.dart'; - -class UserService { - static UserService instance = UserService._internal(); - - UserService._internal(); - - Future getUser() async { - final response = await ApiClient.request( - baseUrl: 'baseUrl', - endPoint: 'endPoint', - requestMethod: RequestMethod.get, - ).execute(); - return UserModel.fromJson(response); - } -} diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart deleted file mode 100644 index 0eef497b..00000000 --- a/lib/data/models/user_model.dart +++ /dev/null @@ -1,7 +0,0 @@ -class UserModel { - UserModel(); - - factory UserModel.fromJson(Map json) { - return UserModel(); - } -} diff --git a/old_lib/extensions/int_extensions.dart b/lib/extensions/int_extensions.dart similarity index 100% rename from old_lib/extensions/int_extensions.dart rename to lib/extensions/int_extensions.dart diff --git a/old_lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart similarity index 100% rename from old_lib/extensions/string_extensions.dart rename to lib/extensions/string_extensions.dart diff --git a/old_lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart similarity index 100% rename from old_lib/extensions/widget_extensions.dart rename to lib/extensions/widget_extensions.dart diff --git a/lib/main.dart b/lib/main.dart index cb0bb858..d08a5013 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,38 +2,113 @@ import 'dart:io'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/providers/settings_provider.dart'; -import 'package:test_sa/screens/splash_screen/splash_screen.dart'; +import 'package:test_sa/controllers/localization/localization.dart'; +import 'package:test_sa/controllers/providers/api/departments_provider.dart'; +import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart'; +import 'package:test_sa/controllers/providers/api/devices_provider.dart'; +import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart'; +import 'package:test_sa/controllers/providers/api/hospitals_provider.dart'; +import 'package:test_sa/controllers/providers/api/notifications_provider.dart'; +import 'package:test_sa/controllers/providers/api/regular_visits_provider.dart'; +import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/employee/employee_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart'; +import 'package:test_sa/views/app_style/colors.dart'; +import 'package:test_sa/views/pages/login.dart'; +import 'package:test_sa/views/pages/register.dart'; +import 'package:test_sa/views/pages/splash_screen.dart'; +import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart'; +import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart'; +import 'package:test_sa/views/pages/user/land_page.dart'; +import 'package:test_sa/views/pages/user/notifications/notifications_page.dart'; +import 'package:test_sa/views/pages/user/profile_page.dart'; +import 'package:test_sa/views/pages/user/report_issues_page.dart'; +import 'package:test_sa/views/pages/user/requests/create_request.dart'; +import 'package:test_sa/views/pages/user/requests/future_request_service_details.dart'; +import 'package:test_sa/views/pages/user/requests/requests_page.dart'; +import 'package:test_sa/views/pages/user/visits/preventive_maintenance_visits_page.dart'; +import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart'; +import 'package:test_sa/views/widgets/departments/single_department_picker.dart'; +import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; -import 'core/app_configs/app_localizations.dart'; -import 'core/app_configs/app_routes.dart'; -import 'core/app_configs/app_theme.dart'; -import 'core/utils/provider_scope.dart'; +import 'controllers/providers/api/parts_provider.dart'; +import 'controllers/providers/api/preventive_maintenance_visits_provider.dart'; +import 'controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart'; +import 'controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart'; +import 'controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart'; +import 'controllers/providers/api/status_drop_down/report/service_report_status_provider.dart'; +import 'controllers/providers/api/status_drop_down/report/service_report_types_provider.dart'; +import 'controllers/providers/api/status_drop_down/report/service_types_provider.dart'; +import 'controllers/providers/api/user_provider.dart'; +import 'controllers/providers/settings/setting_provider.dart'; +import 'views/pages/device_transfer/request_device_transfer.dart'; +import 'views/pages/device_transfer/track_device_transfer.dart'; +import 'views/widgets/hospitals/single_hospital_picker.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); if (Platform.isIOS) { await Firebase.initializeApp( options: const FirebaseOptions( - apiKey: "AIzaSyACQkSleNwU1jzEKR5ho1uSfZERokwwAbc", - appId: "1:973582662416:ios:bc4a8061444c6a08fbc395", - messagingSenderId: "973582662416", - projectId: "atoms-fb912", - ), + apiKey: "AIzaSyACQkSleNwU1jzEKR5ho1uSfZERokwwAbc", + appId: "1:973582662416:ios:bc4a8061444c6a08fbc395", + messagingSenderId: "973582662416", + projectId: "atoms-fb912"), ); } else { await Firebase.initializeApp(); } - runApp(const EntryPoint()); + runApp(ChangeNotifierProvider( + create: (_) => SettingProvider(), + child: MyApp(), + )); } -class EntryPoint extends StatelessWidget { - const EntryPoint({Key? key}) : super(key: key); +class MyApp extends StatelessWidget { + const MyApp({super.key}); + // This widget is the root of your application. @override Widget build(BuildContext context) { - return ProviderScope( + final settingProvider = Provider.of(context); + return MultiProvider( + providers: [ + ChangeNotifierProvider(create: (_) => UserProvider()), + ChangeNotifierProvider(create: (_) => HospitalsProvider()), + ChangeNotifierProvider(create: (_) => DevicesProvider()), + ChangeNotifierProvider(create: (_) => ServiceRequestsProvider()), + ChangeNotifierProvider(create: (_) => DepartmentsProvider()), + ChangeNotifierProvider(create: (_) => NotificationsProvider()), + ChangeNotifierProvider( + create: (_) => PreventiveMaintenanceVisitsProvider()), + ChangeNotifierProvider(create: (_) => RegularVisitsProvider()), + ChangeNotifierProvider(create: (_) => PartsProvider()), + ChangeNotifierProvider(create: (_) => ServiceReportReasonsProvider()), + ChangeNotifierProvider(create: (_) => ServiceReportStatusProvider()), + ChangeNotifierProvider(create: (_) => ServiceReportTypesProvider()), + ChangeNotifierProvider(create: (_) => ServiceStatusProvider()), + ChangeNotifierProvider(create: (_) => ServiceReportLastCallsProvider()), + ChangeNotifierProvider(create: (_) => GasCylinderSizesProvider()), + ChangeNotifierProvider(create: (_) => GasStatusProvider()), + ChangeNotifierProvider(create: (_) => GasTypesProvider()), + ChangeNotifierProvider(create: (_) => GasRefillProvider()), + ChangeNotifierProvider(create: (_) => DeviceTransferProvider()), + ChangeNotifierProvider(create: (_) => EmployeesProvider()), + ChangeNotifierProvider(create: (_) => PentryTaskStatusProvider()), + ChangeNotifierProvider(create: (_) => PentryVisitStatusProvider()), + ChangeNotifierProvider(create: (_) => PentryStatusProvider()), + ChangeNotifierProvider(create: (_) => ServiceRequestPriorityProvider()), + ChangeNotifierProvider( + create: (_) => ServiceRequestDefectTypesProvider()), + ], child: GestureDetector( onTap: () { FocusScopeNode currentFocus = FocusScope.of(context); @@ -41,17 +116,56 @@ class EntryPoint extends StatelessWidget { FocusManager.instance.primaryFocus?.unfocus(); } }, - child: Consumer( - builder: (context, settingProvider, _) => MaterialApp( - title: 'ATOMS', - debugShowCheckedModeBanner: false, - theme: AppTheme.theme, - localizationsDelegates: AppLocalizations.delegates, - supportedLocales: AppLocalizations.supportedLocales, - locale: settingProvider.locale, - initialRoute: SplashScreen.routeName, - routes: appRoutes, - ), + child: MaterialApp( + title: 'ATOMS', + debugShowCheckedModeBanner: false, + theme: ThemeData( + fontFamily: "Poppins", + //canvasColor: AColors.primaryColor, + scaffoldBackgroundColor: AColors.scaffoldBackgroundColor, + primaryColor: AColors.primaryColor, + indicatorColor: AColors.primaryColor, + colorScheme: const ColorScheme.light( + primary: AColors.primaryColor, + onPrimary: Colors.white, + secondary: AColors.secondaryColor, + onSecondary: Colors.white)), + localizationsDelegates: const [ + // ... app-specific localization delegate[s] here + AppLocalization.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: const [ + Locale('en'), + Locale('ar'), + ], + locale: Locale(settingProvider.language ?? 'en'), + initialRoute: SplashScreen.id, + routes: { + SplashScreen.id: (_) => const SplashScreen(), + LandPage.id: (_) => const LandPage(), + Login.id: (_) => Login(), + Register.id: (_) => Register(), + ProfilePage.id: (_) => ProfilePage(), + ReportIssuesPage.id: (_) => const ReportIssuesPage(), + RequestGasRefill.id: (_) => const RequestGasRefill(), + CreateRequestPage.id: (_) => CreateRequestPage(), + SingleHospitalPicker.id: (_) => SingleHospitalPicker(), + SingleDevicePicker.id: (_) => SingleDevicePicker(), + SingleDepartmentPicker.id: (_) => SingleDepartmentPicker(), + ServiceRequestsPage.id: (_) => ServiceRequestsPage(), + NotificationsPage.id: (_) => NotificationsPage(), + FutureRequestServiceDetails.id: (_) => + FutureRequestServiceDetails(), + PreventiveMaintenanceVisitsPage.id: (_) => + PreventiveMaintenanceVisitsPage(), + RegularVisitsPage.id: (_) => RegularVisitsPage(), + TrackGasRefillPage.id: (_) => const TrackGasRefillPage(), + RequestDeviceTransfer.id: (_) => const RequestDeviceTransfer(), + TrackDeviceTransferPage.id: (_) => const TrackDeviceTransferPage(), + }, ), ), ); diff --git a/old_lib/models/app_notification.dart b/lib/models/app_notification.dart similarity index 100% rename from old_lib/models/app_notification.dart rename to lib/models/app_notification.dart diff --git a/old_lib/models/department.dart b/lib/models/department.dart similarity index 100% rename from old_lib/models/department.dart rename to lib/models/department.dart diff --git a/old_lib/models/device/device.dart b/lib/models/device/device.dart similarity index 100% rename from old_lib/models/device/device.dart rename to lib/models/device/device.dart diff --git a/old_lib/models/device/device_transfer.dart b/lib/models/device/device_transfer.dart similarity index 100% rename from old_lib/models/device/device_transfer.dart rename to lib/models/device/device_transfer.dart diff --git a/old_lib/models/device/device_transfer_info.dart b/lib/models/device/device_transfer_info.dart similarity index 100% rename from old_lib/models/device/device_transfer_info.dart rename to lib/models/device/device_transfer_info.dart diff --git a/old_lib/models/enums/user_types.dart b/lib/models/enums/user_types.dart similarity index 100% rename from old_lib/models/enums/user_types.dart rename to lib/models/enums/user_types.dart diff --git a/old_lib/models/gas_refill/gas_refill_details.dart b/lib/models/gas_refill/gas_refill_details.dart similarity index 100% rename from old_lib/models/gas_refill/gas_refill_details.dart rename to lib/models/gas_refill/gas_refill_details.dart diff --git a/old_lib/models/gas_refill/gas_refill_model.dart b/lib/models/gas_refill/gas_refill_model.dart similarity index 100% rename from old_lib/models/gas_refill/gas_refill_model.dart rename to lib/models/gas_refill/gas_refill_model.dart diff --git a/old_lib/models/hospital.dart b/lib/models/hospital.dart similarity index 100% rename from old_lib/models/hospital.dart rename to lib/models/hospital.dart diff --git a/old_lib/models/issue.dart b/lib/models/issue.dart similarity index 100% rename from old_lib/models/issue.dart rename to lib/models/issue.dart diff --git a/old_lib/models/lookup.dart b/lib/models/lookup.dart similarity index 100% rename from old_lib/models/lookup.dart rename to lib/models/lookup.dart diff --git a/old_lib/models/pantry/calibration_tools.dart b/lib/models/pantry/calibration_tools.dart similarity index 100% rename from old_lib/models/pantry/calibration_tools.dart rename to lib/models/pantry/calibration_tools.dart diff --git a/old_lib/models/pantry/contact.dart b/lib/models/pantry/contact.dart similarity index 100% rename from old_lib/models/pantry/contact.dart rename to lib/models/pantry/contact.dart diff --git a/old_lib/models/pantry/lookups/contact_person.dart b/lib/models/pantry/lookups/contact_person.dart similarity index 100% rename from old_lib/models/pantry/lookups/contact_person.dart rename to lib/models/pantry/lookups/contact_person.dart diff --git a/old_lib/models/pantry/lookups/contact_title.dart b/lib/models/pantry/lookups/contact_title.dart similarity index 100% rename from old_lib/models/pantry/lookups/contact_title.dart rename to lib/models/pantry/lookups/contact_title.dart diff --git a/old_lib/models/pantry/pentry.dart b/lib/models/pantry/pentry.dart similarity index 100% rename from old_lib/models/pantry/pentry.dart rename to lib/models/pantry/pentry.dart diff --git a/old_lib/models/pantry/pm_kit.dart b/lib/models/pantry/pm_kit.dart similarity index 100% rename from old_lib/models/pantry/pm_kit.dart rename to lib/models/pantry/pm_kit.dart diff --git a/old_lib/models/pantry/ppm_check_list.dart b/lib/models/pantry/ppm_check_list.dart similarity index 100% rename from old_lib/models/pantry/ppm_check_list.dart rename to lib/models/pantry/ppm_check_list.dart diff --git a/old_lib/models/part.dart b/lib/models/part.dart similarity index 100% rename from old_lib/models/part.dart rename to lib/models/part.dart diff --git a/old_lib/models/service_report.dart b/lib/models/service_report.dart similarity index 100% rename from old_lib/models/service_report.dart rename to lib/models/service_report.dart diff --git a/old_lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart similarity index 100% rename from old_lib/models/service_request/service_request.dart rename to lib/models/service_request/service_request.dart diff --git a/old_lib/models/service_request/service_request_search.dart b/lib/models/service_request/service_request_search.dart similarity index 100% rename from old_lib/models/service_request/service_request_search.dart rename to lib/models/service_request/service_request_search.dart diff --git a/old_lib/models/subtitle.dart b/lib/models/subtitle.dart similarity index 100% rename from old_lib/models/subtitle.dart rename to lib/models/subtitle.dart diff --git a/old_lib/models/timer_model.dart b/lib/models/timer_model.dart similarity index 100% rename from old_lib/models/timer_model.dart rename to lib/models/timer_model.dart diff --git a/old_lib/models/user.dart b/lib/models/user.dart similarity index 100% rename from old_lib/models/user.dart rename to lib/models/user.dart diff --git a/old_lib/models/visits/visit.dart b/lib/models/visits/visit.dart similarity index 100% rename from old_lib/models/visits/visit.dart rename to lib/models/visits/visit.dart diff --git a/old_lib/models/visits/visits_group.dart b/lib/models/visits/visits_group.dart similarity index 100% rename from old_lib/models/visits/visits_group.dart rename to lib/models/visits/visits_group.dart diff --git a/old_lib/models/visits/visits_search.dart b/lib/models/visits/visits_search.dart similarity index 100% rename from old_lib/models/visits/visits_search.dart rename to lib/models/visits/visits_search.dart diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart deleted file mode 100644 index c1916cd4..00000000 --- a/lib/providers/settings_provider.dart +++ /dev/null @@ -1,12 +0,0 @@ -import 'package:flutter/material.dart'; - -class SettingsProvider with ChangeNotifier { - Locale? _locale; - - Locale? get locale => _locale; - - set locale(Locale? value) { - _locale = value; - notifyListeners(); - } -} diff --git a/lib/screens/login_screen/login_screen.dart b/lib/screens/login_screen/login_screen.dart deleted file mode 100644 index c611693d..00000000 --- a/lib/screens/login_screen/login_screen.dart +++ /dev/null @@ -1,12 +0,0 @@ -import 'package:flutter/material.dart'; - -class LoginScreen extends StatelessWidget { - static const routeName = '/loginScreen'; - - const LoginScreen({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const Scaffold(); - } -} diff --git a/lib/screens/splash_screen/splash_screen.dart b/lib/screens/splash_screen/splash_screen.dart deleted file mode 100644 index bc01283f..00000000 --- a/lib/screens/splash_screen/splash_screen.dart +++ /dev/null @@ -1,32 +0,0 @@ -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flutter/material.dart'; -import 'package:test_sa/screens/login_screen/login_screen.dart'; - -class SplashScreen extends StatelessWidget { - static const routeName = "/splashScreen"; - - const SplashScreen({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Colors.white, - body: Center( - child: SizedBox( - width: MediaQuery.of(context).size.width / 1.1, - child: FlareActor( - "assets/rives/atoms_splash.flr", - fit: BoxFit.contain, - animation: "splash", - callback: (animation) async { - Navigator.of(context).pushNamed(LoginScreen.routeName); - // if (_settingProvider.isLoaded && _settingProvider.user != null) { - // _goToUserScreen(_settingProvider.user); - // } - }, - ), - ), - ), - ); - } -} diff --git a/old_lib/views/app_style/colors.dart b/lib/views/app_style/colors.dart similarity index 100% rename from old_lib/views/app_style/colors.dart rename to lib/views/app_style/colors.dart diff --git a/old_lib/views/app_style/sizing.dart b/lib/views/app_style/sizing.dart similarity index 100% rename from old_lib/views/app_style/sizing.dart rename to lib/views/app_style/sizing.dart diff --git a/old_lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart similarity index 100% rename from old_lib/views/pages/device_transfer/device_transfer_details.dart rename to lib/views/pages/device_transfer/device_transfer_details.dart diff --git a/old_lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart similarity index 100% rename from old_lib/views/pages/device_transfer/request_device_transfer.dart rename to lib/views/pages/device_transfer/request_device_transfer.dart diff --git a/old_lib/views/pages/device_transfer/track_device_transfer.dart b/lib/views/pages/device_transfer/track_device_transfer.dart similarity index 100% rename from old_lib/views/pages/device_transfer/track_device_transfer.dart rename to lib/views/pages/device_transfer/track_device_transfer.dart diff --git a/old_lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart similarity index 100% rename from old_lib/views/pages/device_transfer/update_device_transfer.dart rename to lib/views/pages/device_transfer/update_device_transfer.dart diff --git a/old_lib/views/pages/login.dart b/lib/views/pages/login.dart similarity index 100% rename from old_lib/views/pages/login.dart rename to lib/views/pages/login.dart diff --git a/old_lib/views/pages/register.dart b/lib/views/pages/register.dart similarity index 100% rename from old_lib/views/pages/register.dart rename to lib/views/pages/register.dart diff --git a/old_lib/views/pages/splash_screen.dart b/lib/views/pages/splash_screen.dart similarity index 86% rename from old_lib/views/pages/splash_screen.dart rename to lib/views/pages/splash_screen.dart index 003b0599..0d2e9650 100644 --- a/old_lib/views/pages/splash_screen.dart +++ b/lib/views/pages/splash_screen.dart @@ -15,7 +15,7 @@ import 'login.dart'; import 'user/land_page.dart'; class SplashScreen extends StatefulWidget { - static const String routeName = '/splashScreen'; + static const String id = '/splashScreen'; const SplashScreen({Key? key}) : super(key: key); @@ -38,10 +38,11 @@ class _SplashScreenState extends State { Firebase.initializeApp(); NotificationManger.initialisation((notificationDetails) { - AppNotification notification = - AppNotification.fromJson(json.decode(notificationDetails.payload??"")); - if (notification.path == null || (notification.path?.isEmpty??false)) return; - Navigator.pushNamed(context, notification.path??"", + AppNotification notification = AppNotification.fromJson( + json.decode(notificationDetails.payload ?? "")); + if (notification.path == null || (notification.path?.isEmpty ?? false)) + return; + Navigator.pushNamed(context, notification.path ?? "", arguments: notification.requestId); }, (id, title, body, payload) async {}); super.initState(); @@ -63,7 +64,8 @@ class _SplashScreenState extends State { callback: (animation) async { print(await FirebaseMessaging.instance.getToken()); Navigator.of(context).pushNamed(Login.id); - if ((_settingProvider?.isLoaded??false) && _settingProvider?.user != null) { + if ((_settingProvider?.isLoaded ?? false) && + _settingProvider?.user != null) { _goToUserScreen(_settingProvider?.user); } }, diff --git a/old_lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart similarity index 100% rename from old_lib/views/pages/user/gas_refill/gas_refill_details.dart rename to lib/views/pages/user/gas_refill/gas_refill_details.dart diff --git a/old_lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart similarity index 100% rename from old_lib/views/pages/user/gas_refill/request_gas_refill.dart rename to lib/views/pages/user/gas_refill/request_gas_refill.dart diff --git a/old_lib/views/pages/user/gas_refill/track_gas_refill.dart b/lib/views/pages/user/gas_refill/track_gas_refill.dart similarity index 100% rename from old_lib/views/pages/user/gas_refill/track_gas_refill.dart rename to lib/views/pages/user/gas_refill/track_gas_refill.dart diff --git a/old_lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart similarity index 100% rename from old_lib/views/pages/user/land_page.dart rename to lib/views/pages/user/land_page.dart diff --git a/old_lib/views/pages/user/notifications/notifications_list.dart b/lib/views/pages/user/notifications/notifications_list.dart similarity index 100% rename from old_lib/views/pages/user/notifications/notifications_list.dart rename to lib/views/pages/user/notifications/notifications_list.dart diff --git a/old_lib/views/pages/user/notifications/notifications_page.dart b/lib/views/pages/user/notifications/notifications_page.dart similarity index 100% rename from old_lib/views/pages/user/notifications/notifications_page.dart rename to lib/views/pages/user/notifications/notifications_page.dart diff --git a/old_lib/views/pages/user/profile_page.dart b/lib/views/pages/user/profile_page.dart similarity index 100% rename from old_lib/views/pages/user/profile_page.dart rename to lib/views/pages/user/profile_page.dart diff --git a/old_lib/views/pages/user/report_issues_page.dart b/lib/views/pages/user/report_issues_page.dart similarity index 67% rename from old_lib/views/pages/user/report_issues_page.dart rename to lib/views/pages/user/report_issues_page.dart index 64154fba..8f9462a5 100644 --- a/old_lib/views/pages/user/report_issues_page.dart +++ b/lib/views/pages/user/report_issues_page.dart @@ -20,10 +20,10 @@ import '../../widgets/issues/report_issue_item.dart'; import '../../widgets/loaders/loading_manager.dart'; class ReportIssuesPage extends StatefulWidget { - static final String id = "/report-issue"; - final ServiceRequest serviceRequest; + static const String id = "/report-issue"; + final ServiceRequest? serviceRequest; - const ReportIssuesPage({Key? key, required this.serviceRequest}) : super(key: key); + const ReportIssuesPage({Key? key, this.serviceRequest}) : super(key: key); @override _ReportIssuesPageState createState() => _ReportIssuesPageState(); } @@ -67,36 +67,38 @@ class _ReportIssuesPageState extends State { ), child: Text( _subtitle.reportIssue, - style: Theme.of(context).textTheme.headline5?.copyWith( - color: AColors.cyan, - fontWeight: FontWeight.bold - ), + style: Theme.of(context) + .textTheme + .headline5 + ?.copyWith( + color: AColors.cyan, + fontWeight: FontWeight.bold), ), ), ), Image( - height: _height/8, + height: _height / 8, image: AssetImage("assets/images/logo.png"), ), - Container( padding: EdgeInsets.symmetric( - horizontal: 16, - vertical: 16, + horizontal: 16, + vertical: 16, ), decoration: BoxDecoration( color: AColors.grey, borderRadius: BorderRadius.only( - topLeft: Radius.circular(AppStyle.getBorderRadius(context)), - topRight: Radius.circular(AppStyle.getBorderRadius(context)), + topLeft: Radius.circular( + AppStyle.getBorderRadius(context)), + topRight: Radius.circular( + AppStyle.getBorderRadius(context)), ), boxShadow: [ BoxShadow( color: AColors.grey, - offset: Offset(0,-1), + offset: Offset(0, -1), ) - ] - ), + ]), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -105,32 +107,33 @@ class _ReportIssuesPageState extends State { hintText: _subtitle.title, textAlign: TextAlign.center, style: Theme.of(context).textTheme.headline6, - validator: (value) => - Validator.hasValue(value!) - ? '' : _subtitle.titleValidateMessage, + validator: (value) => Validator.hasValue(value!) + ? '' + : _subtitle.titleValidateMessage, textInputType: TextInputType.name, - onSaved: (value){ + onSaved: (value) { _issue.title = value; }, ), - SizedBox(height: 8,), - Column( - children: List.generate( - _issues.length, - (index) => ReportIssueItem( - isSelected: _issue.reports?.contains(index), - issueInfo: _issues[index], - onChange: (info,value){ - if(value){ - _issue.reports?.add(index); - } else { - _issue.reports?.remove(index); - } - setState(() {}); - }, - ) - ) + SizedBox( + height: 8, ), + Column( + children: List.generate( + _issues.length, + (index) => ReportIssueItem( + isSelected: + _issue.reports?.contains(index), + issueInfo: _issues[index], + onChange: (info, value) { + if (value) { + _issue.reports?.add(index); + } else { + _issue.reports?.remove(index); + } + setState(() {}); + }, + ))), Padding( padding: const EdgeInsets.all(8.0), child: Text( @@ -142,7 +145,7 @@ class _ReportIssuesPageState extends State { hintText: _subtitle.description, style: Theme.of(context).textTheme.subtitle1, textInputType: TextInputType.multiline, - onSaved: (value){ + onSaved: (value) { _issue.description = value; }, ), @@ -151,22 +154,25 @@ class _ReportIssuesPageState extends State { child: AButton( text: _subtitle.submit, onPressed: () async { - if(!(_formKey.currentState?.validate()??false)) - return; + if (!(_formKey.currentState?.validate() ?? + false)) return; _formKey.currentState?.save(); - _issue.serviceRequestId = widget.serviceRequest.id; - _isLoading =true; + _issue.serviceRequestId = + widget.serviceRequest?.id; + _isLoading = true; setState(() {}); - int status = await _serviceRequestsProvider.createIssueReport( - user: _userProvider.user??User(), - host: _settingProvider.host??"", + int status = await _serviceRequestsProvider + .createIssueReport( + user: _userProvider.user ?? User(), + host: _settingProvider.host ?? "", issue: _issue, ); - _isLoading =false; + _isLoading = false; setState(() {}); - if(status >= 200 && status < 300){ + if (status >= 200 && status < 300) { Fluttertoast.showToast( - msg: _subtitle.requestCompleteSuccessfully, + msg: + _subtitle.requestCompleteSuccessfully, ); Navigator.of(context).pop(); } diff --git a/old_lib/views/pages/user/requests/create_request.dart b/lib/views/pages/user/requests/create_request.dart similarity index 100% rename from old_lib/views/pages/user/requests/create_request.dart rename to lib/views/pages/user/requests/create_request.dart diff --git a/old_lib/views/pages/user/requests/future_request_service_details.dart b/lib/views/pages/user/requests/future_request_service_details.dart similarity index 100% rename from old_lib/views/pages/user/requests/future_request_service_details.dart rename to lib/views/pages/user/requests/future_request_service_details.dart diff --git a/old_lib/views/pages/user/requests/report/create_service_report.dart b/lib/views/pages/user/requests/report/create_service_report.dart similarity index 100% rename from old_lib/views/pages/user/requests/report/create_service_report.dart rename to lib/views/pages/user/requests/report/create_service_report.dart diff --git a/old_lib/views/pages/user/requests/report/edit_service_report.dart b/lib/views/pages/user/requests/report/edit_service_report.dart similarity index 100% rename from old_lib/views/pages/user/requests/report/edit_service_report.dart rename to lib/views/pages/user/requests/report/edit_service_report.dart diff --git a/old_lib/views/pages/user/requests/report/future_service_report.dart b/lib/views/pages/user/requests/report/future_service_report.dart similarity index 100% rename from old_lib/views/pages/user/requests/report/future_service_report.dart rename to lib/views/pages/user/requests/report/future_service_report.dart diff --git a/old_lib/views/pages/user/requests/request_details.dart b/lib/views/pages/user/requests/request_details.dart similarity index 100% rename from old_lib/views/pages/user/requests/request_details.dart rename to lib/views/pages/user/requests/request_details.dart diff --git a/old_lib/views/pages/user/requests/requests_page.dart b/lib/views/pages/user/requests/requests_page.dart similarity index 100% rename from old_lib/views/pages/user/requests/requests_page.dart rename to lib/views/pages/user/requests/requests_page.dart diff --git a/old_lib/views/pages/user/visits/pantry/edit_pentry.dart b/lib/views/pages/user/visits/pantry/edit_pentry.dart similarity index 100% rename from old_lib/views/pages/user/visits/pantry/edit_pentry.dart rename to lib/views/pages/user/visits/pantry/edit_pentry.dart diff --git a/old_lib/views/pages/user/visits/pantry/future_edit_pently.dart b/lib/views/pages/user/visits/pantry/future_edit_pently.dart similarity index 100% rename from old_lib/views/pages/user/visits/pantry/future_edit_pently.dart rename to lib/views/pages/user/visits/pantry/future_edit_pently.dart diff --git a/old_lib/views/pages/user/visits/preventive_maintenance_visits_page.dart b/lib/views/pages/user/visits/preventive_maintenance_visits_page.dart similarity index 100% rename from old_lib/views/pages/user/visits/preventive_maintenance_visits_page.dart rename to lib/views/pages/user/visits/preventive_maintenance_visits_page.dart diff --git a/old_lib/views/pages/user/visits/regular_visits_page.dart b/lib/views/pages/user/visits/regular_visits_page.dart similarity index 100% rename from old_lib/views/pages/user/visits/regular_visits_page.dart rename to lib/views/pages/user/visits/regular_visits_page.dart diff --git a/old_lib/views/pages/user/visits/update_visits_group_sheet.dart b/lib/views/pages/user/visits/update_visits_group_sheet.dart similarity index 100% rename from old_lib/views/pages/user/visits/update_visits_group_sheet.dart rename to lib/views/pages/user/visits/update_visits_group_sheet.dart diff --git a/old_lib/views/pages/user/visits/visit_details.dart b/lib/views/pages/user/visits/visit_details.dart similarity index 100% rename from old_lib/views/pages/user/visits/visit_details.dart rename to lib/views/pages/user/visits/visit_details.dart diff --git a/old_lib/views/widgets/app_name_bar.dart b/lib/views/widgets/app_name_bar.dart similarity index 100% rename from old_lib/views/widgets/app_name_bar.dart rename to lib/views/widgets/app_name_bar.dart diff --git a/old_lib/views/widgets/app_text_form_field.dart b/lib/views/widgets/app_text_form_field.dart similarity index 100% rename from old_lib/views/widgets/app_text_form_field.dart rename to lib/views/widgets/app_text_form_field.dart diff --git a/old_lib/views/widgets/buttons/app_back_button.dart b/lib/views/widgets/buttons/app_back_button.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_back_button.dart rename to lib/views/widgets/buttons/app_back_button.dart diff --git a/old_lib/views/widgets/buttons/app_button.dart b/lib/views/widgets/buttons/app_button.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_button.dart rename to lib/views/widgets/buttons/app_button.dart diff --git a/old_lib/views/widgets/buttons/app_flat_button.dart b/lib/views/widgets/buttons/app_flat_button.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_flat_button.dart rename to lib/views/widgets/buttons/app_flat_button.dart diff --git a/old_lib/views/widgets/buttons/app_icon_button.dart b/lib/views/widgets/buttons/app_icon_button.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_icon_button.dart rename to lib/views/widgets/buttons/app_icon_button.dart diff --git a/old_lib/views/widgets/buttons/app_icon_button2.dart b/lib/views/widgets/buttons/app_icon_button2.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_icon_button2.dart rename to lib/views/widgets/buttons/app_icon_button2.dart diff --git a/old_lib/views/widgets/buttons/app_outlined_button.dart b/lib/views/widgets/buttons/app_outlined_button.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_outlined_button.dart rename to lib/views/widgets/buttons/app_outlined_button.dart diff --git a/old_lib/views/widgets/buttons/app_small_button.dart b/lib/views/widgets/buttons/app_small_button.dart similarity index 100% rename from old_lib/views/widgets/buttons/app_small_button.dart rename to lib/views/widgets/buttons/app_small_button.dart diff --git a/old_lib/views/widgets/custom_clip_path/carve_in_image.dart b/lib/views/widgets/custom_clip_path/carve_in_image.dart similarity index 100% rename from old_lib/views/widgets/custom_clip_path/carve_in_image.dart rename to lib/views/widgets/custom_clip_path/carve_in_image.dart diff --git a/old_lib/views/widgets/date_and_time/date_picker.dart b/lib/views/widgets/date_and_time/date_picker.dart similarity index 100% rename from old_lib/views/widgets/date_and_time/date_picker.dart rename to lib/views/widgets/date_and_time/date_picker.dart diff --git a/old_lib/views/widgets/date_and_time/from_to_date_bar.dart b/lib/views/widgets/date_and_time/from_to_date_bar.dart similarity index 100% rename from old_lib/views/widgets/date_and_time/from_to_date_bar.dart rename to lib/views/widgets/date_and_time/from_to_date_bar.dart diff --git a/old_lib/views/widgets/departments/department_button.dart b/lib/views/widgets/departments/department_button.dart similarity index 100% rename from old_lib/views/widgets/departments/department_button.dart rename to lib/views/widgets/departments/department_button.dart diff --git a/old_lib/views/widgets/departments/department_item.dart b/lib/views/widgets/departments/department_item.dart similarity index 100% rename from old_lib/views/widgets/departments/department_item.dart rename to lib/views/widgets/departments/department_item.dart diff --git a/old_lib/views/widgets/departments/single_department_picker.dart b/lib/views/widgets/departments/single_department_picker.dart similarity index 100% rename from old_lib/views/widgets/departments/single_department_picker.dart rename to lib/views/widgets/departments/single_department_picker.dart diff --git a/old_lib/views/widgets/device_trancfer/device_transfer_info_section.dart b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart similarity index 100% rename from old_lib/views/widgets/device_trancfer/device_transfer_info_section.dart rename to lib/views/widgets/device_trancfer/device_transfer_info_section.dart diff --git a/old_lib/views/widgets/device_trancfer/device_transfer_item.dart b/lib/views/widgets/device_trancfer/device_transfer_item.dart similarity index 100% rename from old_lib/views/widgets/device_trancfer/device_transfer_item.dart rename to lib/views/widgets/device_trancfer/device_transfer_item.dart diff --git a/old_lib/views/widgets/device_trancfer/device_transfer_list.dart b/lib/views/widgets/device_trancfer/device_transfer_list.dart similarity index 100% rename from old_lib/views/widgets/device_trancfer/device_transfer_list.dart rename to lib/views/widgets/device_trancfer/device_transfer_list.dart diff --git a/old_lib/views/widgets/dialogs/dialog.dart b/lib/views/widgets/dialogs/dialog.dart similarity index 100% rename from old_lib/views/widgets/dialogs/dialog.dart rename to lib/views/widgets/dialogs/dialog.dart diff --git a/old_lib/views/widgets/drawer/drawer_item.dart b/lib/views/widgets/drawer/drawer_item.dart similarity index 100% rename from old_lib/views/widgets/drawer/drawer_item.dart rename to lib/views/widgets/drawer/drawer_item.dart diff --git a/old_lib/views/widgets/e_signature/e_signature.dart b/lib/views/widgets/e_signature/e_signature.dart similarity index 100% rename from old_lib/views/widgets/e_signature/e_signature.dart rename to lib/views/widgets/e_signature/e_signature.dart diff --git a/old_lib/views/widgets/equipment/auto_complete_devices_field.dart b/lib/views/widgets/equipment/auto_complete_devices_field.dart similarity index 100% rename from old_lib/views/widgets/equipment/auto_complete_devices_field.dart rename to lib/views/widgets/equipment/auto_complete_devices_field.dart diff --git a/old_lib/views/widgets/equipment/device_button.dart b/lib/views/widgets/equipment/device_button.dart similarity index 100% rename from old_lib/views/widgets/equipment/device_button.dart rename to lib/views/widgets/equipment/device_button.dart diff --git a/old_lib/views/widgets/equipment/device_item.dart b/lib/views/widgets/equipment/device_item.dart similarity index 100% rename from old_lib/views/widgets/equipment/device_item.dart rename to lib/views/widgets/equipment/device_item.dart diff --git a/old_lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart similarity index 100% rename from old_lib/views/widgets/equipment/single_device_picker.dart rename to lib/views/widgets/equipment/single_device_picker.dart diff --git a/old_lib/views/widgets/gas_refill/gas_refill_create_details_item.dart b/lib/views/widgets/gas_refill/gas_refill_create_details_item.dart similarity index 100% rename from old_lib/views/widgets/gas_refill/gas_refill_create_details_item.dart rename to lib/views/widgets/gas_refill/gas_refill_create_details_item.dart diff --git a/old_lib/views/widgets/gas_refill/gas_refill_item.dart b/lib/views/widgets/gas_refill/gas_refill_item.dart similarity index 100% rename from old_lib/views/widgets/gas_refill/gas_refill_item.dart rename to lib/views/widgets/gas_refill/gas_refill_item.dart diff --git a/old_lib/views/widgets/gas_refill/gas_refill_list.dart b/lib/views/widgets/gas_refill/gas_refill_list.dart similarity index 100% rename from old_lib/views/widgets/gas_refill/gas_refill_list.dart rename to lib/views/widgets/gas_refill/gas_refill_list.dart diff --git a/old_lib/views/widgets/gas_refill/gas_refill_update_details_item.dart b/lib/views/widgets/gas_refill/gas_refill_update_details_item.dart similarity index 100% rename from old_lib/views/widgets/gas_refill/gas_refill_update_details_item.dart rename to lib/views/widgets/gas_refill/gas_refill_update_details_item.dart diff --git a/old_lib/views/widgets/hospitals/hospital_auto_complete_field.dart b/lib/views/widgets/hospitals/hospital_auto_complete_field.dart similarity index 100% rename from old_lib/views/widgets/hospitals/hospital_auto_complete_field.dart rename to lib/views/widgets/hospitals/hospital_auto_complete_field.dart diff --git a/old_lib/views/widgets/hospitals/hospital_button.dart b/lib/views/widgets/hospitals/hospital_button.dart similarity index 100% rename from old_lib/views/widgets/hospitals/hospital_button.dart rename to lib/views/widgets/hospitals/hospital_button.dart diff --git a/old_lib/views/widgets/hospitals/hospital_item.dart b/lib/views/widgets/hospitals/hospital_item.dart similarity index 100% rename from old_lib/views/widgets/hospitals/hospital_item.dart rename to lib/views/widgets/hospitals/hospital_item.dart diff --git a/old_lib/views/widgets/hospitals/single_hospital_picker.dart b/lib/views/widgets/hospitals/single_hospital_picker.dart similarity index 100% rename from old_lib/views/widgets/hospitals/single_hospital_picker.dart rename to lib/views/widgets/hospitals/single_hospital_picker.dart diff --git a/old_lib/views/widgets/images/image_item.dart b/lib/views/widgets/images/image_item.dart similarity index 100% rename from old_lib/views/widgets/images/image_item.dart rename to lib/views/widgets/images/image_item.dart diff --git a/old_lib/views/widgets/images/images_list.dart b/lib/views/widgets/images/images_list.dart similarity index 100% rename from old_lib/views/widgets/images/images_list.dart rename to lib/views/widgets/images/images_list.dart diff --git a/old_lib/views/widgets/images/images_viewer.dart b/lib/views/widgets/images/images_viewer.dart similarity index 100% rename from old_lib/views/widgets/images/images_viewer.dart rename to lib/views/widgets/images/images_viewer.dart diff --git a/old_lib/views/widgets/images/mini_one_image_picker.dart b/lib/views/widgets/images/mini_one_image_picker.dart similarity index 100% rename from old_lib/views/widgets/images/mini_one_image_picker.dart rename to lib/views/widgets/images/mini_one_image_picker.dart diff --git a/old_lib/views/widgets/images/multi_image_picker.dart b/lib/views/widgets/images/multi_image_picker.dart similarity index 100% rename from old_lib/views/widgets/images/multi_image_picker.dart rename to lib/views/widgets/images/multi_image_picker.dart diff --git a/old_lib/views/widgets/images/multi_image_picker_item.dart b/lib/views/widgets/images/multi_image_picker_item.dart similarity index 100% rename from old_lib/views/widgets/images/multi_image_picker_item.dart rename to lib/views/widgets/images/multi_image_picker_item.dart diff --git a/old_lib/views/widgets/images/one_image_picker.dart b/lib/views/widgets/images/one_image_picker.dart similarity index 100% rename from old_lib/views/widgets/images/one_image_picker.dart rename to lib/views/widgets/images/one_image_picker.dart diff --git a/old_lib/views/widgets/issues/report_issue_item.dart b/lib/views/widgets/issues/report_issue_item.dart similarity index 100% rename from old_lib/views/widgets/issues/report_issue_item.dart rename to lib/views/widgets/issues/report_issue_item.dart diff --git a/old_lib/views/widgets/land_page/land_page_item.dart b/lib/views/widgets/land_page/land_page_item.dart similarity index 100% rename from old_lib/views/widgets/land_page/land_page_item.dart rename to lib/views/widgets/land_page/land_page_item.dart diff --git a/old_lib/views/widgets/loaders/app_lazy_loading.dart b/lib/views/widgets/loaders/app_lazy_loading.dart similarity index 100% rename from old_lib/views/widgets/loaders/app_lazy_loading.dart rename to lib/views/widgets/loaders/app_lazy_loading.dart diff --git a/old_lib/views/widgets/loaders/app_loading.dart b/lib/views/widgets/loaders/app_loading.dart similarity index 100% rename from old_lib/views/widgets/loaders/app_loading.dart rename to lib/views/widgets/loaders/app_loading.dart diff --git a/old_lib/views/widgets/loaders/failed_loading.dart b/lib/views/widgets/loaders/failed_loading.dart similarity index 100% rename from old_lib/views/widgets/loaders/failed_loading.dart rename to lib/views/widgets/loaders/failed_loading.dart diff --git a/old_lib/views/widgets/loaders/image_loader.dart b/lib/views/widgets/loaders/image_loader.dart similarity index 100% rename from old_lib/views/widgets/loaders/image_loader.dart rename to lib/views/widgets/loaders/image_loader.dart diff --git a/old_lib/views/widgets/loaders/lazy_loading.dart b/lib/views/widgets/loaders/lazy_loading.dart similarity index 100% rename from old_lib/views/widgets/loaders/lazy_loading.dart rename to lib/views/widgets/loaders/lazy_loading.dart diff --git a/old_lib/views/widgets/loaders/loading_manager.dart b/lib/views/widgets/loaders/loading_manager.dart similarity index 100% rename from old_lib/views/widgets/loaders/loading_manager.dart rename to lib/views/widgets/loaders/loading_manager.dart diff --git a/old_lib/views/widgets/loaders/no_item_found.dart b/lib/views/widgets/loaders/no_item_found.dart similarity index 100% rename from old_lib/views/widgets/loaders/no_item_found.dart rename to lib/views/widgets/loaders/no_item_found.dart diff --git a/old_lib/views/widgets/notifications/notification_item.dart b/lib/views/widgets/notifications/notification_item.dart similarity index 100% rename from old_lib/views/widgets/notifications/notification_item.dart rename to lib/views/widgets/notifications/notification_item.dart diff --git a/old_lib/views/widgets/parts/auto_complete_parts_field.dart b/lib/views/widgets/parts/auto_complete_parts_field.dart similarity index 100% rename from old_lib/views/widgets/parts/auto_complete_parts_field.dart rename to lib/views/widgets/parts/auto_complete_parts_field.dart diff --git a/old_lib/views/widgets/parts/part_item.dart b/lib/views/widgets/parts/part_item.dart similarity index 100% rename from old_lib/views/widgets/parts/part_item.dart rename to lib/views/widgets/parts/part_item.dart diff --git a/old_lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart b/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart similarity index 100% rename from old_lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart rename to lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart diff --git a/old_lib/views/widgets/pentry/pentry_calibration_tool_form.dart b/lib/views/widgets/pentry/pentry_calibration_tool_form.dart similarity index 100% rename from old_lib/views/widgets/pentry/pentry_calibration_tool_form.dart rename to lib/views/widgets/pentry/pentry_calibration_tool_form.dart diff --git a/old_lib/views/widgets/pentry/pentry_info_form.dart b/lib/views/widgets/pentry/pentry_info_form.dart similarity index 100% rename from old_lib/views/widgets/pentry/pentry_info_form.dart rename to lib/views/widgets/pentry/pentry_info_form.dart diff --git a/old_lib/views/widgets/pentry/pentry_pm_kit_form.dart b/lib/views/widgets/pentry/pentry_pm_kit_form.dart similarity index 100% rename from old_lib/views/widgets/pentry/pentry_pm_kit_form.dart rename to lib/views/widgets/pentry/pentry_pm_kit_form.dart diff --git a/old_lib/views/widgets/pentry/pentry_ppm_check_list_form.dart b/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart similarity index 100% rename from old_lib/views/widgets/pentry/pentry_ppm_check_list_form.dart rename to lib/views/widgets/pentry/pentry_ppm_check_list_form.dart diff --git a/old_lib/views/widgets/qr/scan_qr.dart b/lib/views/widgets/qr/scan_qr.dart similarity index 100% rename from old_lib/views/widgets/qr/scan_qr.dart rename to lib/views/widgets/qr/scan_qr.dart diff --git a/old_lib/views/widgets/requests/info_row.dart b/lib/views/widgets/requests/info_row.dart similarity index 100% rename from old_lib/views/widgets/requests/info_row.dart rename to lib/views/widgets/requests/info_row.dart diff --git a/old_lib/views/widgets/requests/request_status.dart b/lib/views/widgets/requests/request_status.dart similarity index 100% rename from old_lib/views/widgets/requests/request_status.dart rename to lib/views/widgets/requests/request_status.dart diff --git a/old_lib/views/widgets/requests/service_request_item.dart b/lib/views/widgets/requests/service_request_item.dart similarity index 100% rename from old_lib/views/widgets/requests/service_request_item.dart rename to lib/views/widgets/requests/service_request_item.dart diff --git a/old_lib/views/widgets/requests/service_request_list.dart b/lib/views/widgets/requests/service_request_list.dart similarity index 100% rename from old_lib/views/widgets/requests/service_request_list.dart rename to lib/views/widgets/requests/service_request_list.dart diff --git a/old_lib/views/widgets/requests/service_request_update_dialog.dart b/lib/views/widgets/requests/service_request_update_dialog.dart similarity index 100% rename from old_lib/views/widgets/requests/service_request_update_dialog.dart rename to lib/views/widgets/requests/service_request_update_dialog.dart diff --git a/old_lib/views/widgets/search/filter_item.dart b/lib/views/widgets/search/filter_item.dart similarity index 100% rename from old_lib/views/widgets/search/filter_item.dart rename to lib/views/widgets/search/filter_item.dart diff --git a/old_lib/views/widgets/search/service_request_search_bar.dart b/lib/views/widgets/search/service_request_search_bar.dart similarity index 100% rename from old_lib/views/widgets/search/service_request_search_bar.dart rename to lib/views/widgets/search/service_request_search_bar.dart diff --git a/old_lib/views/widgets/search/visits_search_bar.dart b/lib/views/widgets/search/visits_search_bar.dart similarity index 100% rename from old_lib/views/widgets/search/visits_search_bar.dart rename to lib/views/widgets/search/visits_search_bar.dart diff --git a/old_lib/views/widgets/sound/record_sound.dart b/lib/views/widgets/sound/record_sound.dart similarity index 100% rename from old_lib/views/widgets/sound/record_sound.dart rename to lib/views/widgets/sound/record_sound.dart diff --git a/old_lib/views/widgets/sound/sound_player.dart b/lib/views/widgets/sound/sound_player.dart similarity index 100% rename from old_lib/views/widgets/sound/sound_player.dart rename to lib/views/widgets/sound/sound_player.dart diff --git a/old_lib/views/widgets/speech_to_text/speech_to_text.dart b/lib/views/widgets/speech_to_text/speech_to_text.dart similarity index 100% rename from old_lib/views/widgets/speech_to_text/speech_to_text.dart rename to lib/views/widgets/speech_to_text/speech_to_text.dart diff --git a/old_lib/views/widgets/status/employee/employee_mune.dart b/lib/views/widgets/status/employee/employee_mune.dart similarity index 100% rename from old_lib/views/widgets/status/employee/employee_mune.dart rename to lib/views/widgets/status/employee/employee_mune.dart diff --git a/old_lib/views/widgets/status/gas_refill/gas_cylinder_size.dart b/lib/views/widgets/status/gas_refill/gas_cylinder_size.dart similarity index 100% rename from old_lib/views/widgets/status/gas_refill/gas_cylinder_size.dart rename to lib/views/widgets/status/gas_refill/gas_cylinder_size.dart diff --git a/old_lib/views/widgets/status/gas_refill/gas_status.dart b/lib/views/widgets/status/gas_refill/gas_status.dart similarity index 100% rename from old_lib/views/widgets/status/gas_refill/gas_status.dart rename to lib/views/widgets/status/gas_refill/gas_status.dart diff --git a/old_lib/views/widgets/status/gas_refill/gas_type.dart b/lib/views/widgets/status/gas_refill/gas_type.dart similarity index 100% rename from old_lib/views/widgets/status/gas_refill/gas_type.dart rename to lib/views/widgets/status/gas_refill/gas_type.dart diff --git a/old_lib/views/widgets/status/multi_status_menu.dart b/lib/views/widgets/status/multi_status_menu.dart similarity index 100% rename from old_lib/views/widgets/status/multi_status_menu.dart rename to lib/views/widgets/status/multi_status_menu.dart diff --git a/old_lib/views/widgets/status/pentry/pentry_status_mune.dart b/lib/views/widgets/status/pentry/pentry_status_mune.dart similarity index 100% rename from old_lib/views/widgets/status/pentry/pentry_status_mune.dart rename to lib/views/widgets/status/pentry/pentry_status_mune.dart diff --git a/old_lib/views/widgets/status/pentry/pentry_task_status_mune.dart b/lib/views/widgets/status/pentry/pentry_task_status_mune.dart similarity index 100% rename from old_lib/views/widgets/status/pentry/pentry_task_status_mune.dart rename to lib/views/widgets/status/pentry/pentry_task_status_mune.dart diff --git a/old_lib/views/widgets/status/pentry/pentry_visit_status_mune.dart b/lib/views/widgets/status/pentry/pentry_visit_status_mune.dart similarity index 100% rename from old_lib/views/widgets/status/pentry/pentry_visit_status_mune.dart rename to lib/views/widgets/status/pentry/pentry_visit_status_mune.dart diff --git a/old_lib/views/widgets/status/report/service_report_last_call.dart b/lib/views/widgets/status/report/service_report_last_call.dart similarity index 100% rename from old_lib/views/widgets/status/report/service_report_last_call.dart rename to lib/views/widgets/status/report/service_report_last_call.dart diff --git a/old_lib/views/widgets/status/report/service_report_reasons.dart b/lib/views/widgets/status/report/service_report_reasons.dart similarity index 100% rename from old_lib/views/widgets/status/report/service_report_reasons.dart rename to lib/views/widgets/status/report/service_report_reasons.dart diff --git a/old_lib/views/widgets/status/report/service_report_status.dart b/lib/views/widgets/status/report/service_report_status.dart similarity index 100% rename from old_lib/views/widgets/status/report/service_report_status.dart rename to lib/views/widgets/status/report/service_report_status.dart diff --git a/old_lib/views/widgets/status/report/service_report_type.dart b/lib/views/widgets/status/report/service_report_type.dart similarity index 100% rename from old_lib/views/widgets/status/report/service_report_type.dart rename to lib/views/widgets/status/report/service_report_type.dart diff --git a/old_lib/views/widgets/status/report/service_status.dart b/lib/views/widgets/status/report/service_status.dart similarity index 100% rename from old_lib/views/widgets/status/report/service_status.dart rename to lib/views/widgets/status/report/service_status.dart diff --git a/old_lib/views/widgets/status/service_request/service_request_defect_types_mune.dart b/lib/views/widgets/status/service_request/service_request_defect_types_mune.dart similarity index 100% rename from old_lib/views/widgets/status/service_request/service_request_defect_types_mune.dart rename to lib/views/widgets/status/service_request/service_request_defect_types_mune.dart diff --git a/old_lib/views/widgets/status/service_request/service_request_priority_mune.dart b/lib/views/widgets/status/service_request/service_request_priority_mune.dart similarity index 100% rename from old_lib/views/widgets/status/service_request/service_request_priority_mune.dart rename to lib/views/widgets/status/service_request/service_request_priority_mune.dart diff --git a/old_lib/views/widgets/status/single_status_menu.dart b/lib/views/widgets/status/single_status_menu.dart similarity index 100% rename from old_lib/views/widgets/status/single_status_menu.dart rename to lib/views/widgets/status/single_status_menu.dart diff --git a/old_lib/views/widgets/timer/app_timer.dart b/lib/views/widgets/timer/app_timer.dart similarity index 100% rename from old_lib/views/widgets/timer/app_timer.dart rename to lib/views/widgets/timer/app_timer.dart diff --git a/old_lib/views/widgets/timer/timer_manager.dart b/lib/views/widgets/timer/timer_manager.dart similarity index 100% rename from old_lib/views/widgets/timer/timer_manager.dart rename to lib/views/widgets/timer/timer_manager.dart diff --git a/old_lib/views/widgets/titles/app_sub_title.dart b/lib/views/widgets/titles/app_sub_title.dart similarity index 100% rename from old_lib/views/widgets/titles/app_sub_title.dart rename to lib/views/widgets/titles/app_sub_title.dart diff --git a/old_lib/views/widgets/titles/app_title.dart b/lib/views/widgets/titles/app_title.dart similarity index 100% rename from old_lib/views/widgets/titles/app_title.dart rename to lib/views/widgets/titles/app_title.dart diff --git a/old_lib/views/widgets/titles/expandable_info_row.dart b/lib/views/widgets/titles/expandable_info_row.dart similarity index 100% rename from old_lib/views/widgets/titles/expandable_info_row.dart rename to lib/views/widgets/titles/expandable_info_row.dart diff --git a/old_lib/views/widgets/visits/visit_item.dart b/lib/views/widgets/visits/visit_item.dart similarity index 100% rename from old_lib/views/widgets/visits/visit_item.dart rename to lib/views/widgets/visits/visit_item.dart diff --git a/old_lib/views/widgets/visits/visit_status.dart b/lib/views/widgets/visits/visit_status.dart similarity index 100% rename from old_lib/views/widgets/visits/visit_status.dart rename to lib/views/widgets/visits/visit_status.dart diff --git a/old_lib/views/widgets/visits/visits_list.dart b/lib/views/widgets/visits/visits_list.dart similarity index 100% rename from old_lib/views/widgets/visits/visits_list.dart rename to lib/views/widgets/visits/visits_list.dart diff --git a/lib/widgets/shared_widget.dart b/lib/widgets/shared_widget.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/test/widget_test.dart b/test/widget_test.dart index bf07a5a4..e1fac4ff 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -12,7 +12,7 @@ import 'package:test_sa/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(const EntryPoint()); + await tester.pumpWidget(const MyApp()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget);