diff --git a/README.md b/README.md index 850d67e..071a587 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# marco +# On Field Work A new Flutter project. diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6499e02..4a7cbdf 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Marco + On Field Work CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - marco + on field work CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/app_constant.dart b/lib/app_constant.dart index 8d5f2b5..55c95b9 100644 --- a/lib/app_constant.dart +++ b/lib/app_constant.dart @@ -8,5 +8,5 @@ class AppConstant { static int iOSAppVersion = 1; static String version = "1.0.0"; - static String get appName => 'Marco'; + static String get appName => 'On Field Work'; } diff --git a/lib/controller/attendance/attendance_screen_controller.dart b/lib/controller/attendance/attendance_screen_controller.dart index cab2ffd..5aebd4d 100644 --- a/lib/controller/attendance/attendance_screen_controller.dart +++ b/lib/controller/attendance/attendance_screen_controller.dart @@ -5,19 +5,19 @@ import 'package:image_picker/image_picker.dart'; import 'package:geolocator/geolocator.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_image_compressor.dart'; -import 'package:marco/helpers/widgets/time_stamp_image_helper.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_image_compressor.dart'; +import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart'; -import 'package:marco/model/attendance/attendance_model.dart'; -import 'package:marco/model/project_model.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/attendance/attendance_log_model.dart'; -import 'package:marco/model/regularization_log_model.dart'; -import 'package:marco/model/attendance/attendance_log_view_model.dart'; -import 'package:marco/model/attendance/organization_per_project_list_model.dart'; -import 'package:marco/controller/project_controller.dart'; +import 'package:on_field_work/model/attendance/attendance_model.dart'; +import 'package:on_field_work/model/project_model.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/attendance/attendance_log_model.dart'; +import 'package:on_field_work/model/regularization_log_model.dart'; +import 'package:on_field_work/model/attendance/attendance_log_view_model.dart'; +import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart'; +import 'package:on_field_work/controller/project_controller.dart'; class AttendanceController extends GetxController { // ------------------ Data Models ------------------ diff --git a/lib/controller/auth/forgot_password_controller.dart b/lib/controller/auth/forgot_password_controller.dart index 8d544d7..35683b4 100644 --- a/lib/controller/auth/forgot_password_controller.dart +++ b/lib/controller/auth/forgot_password_controller.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_validators.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_validators.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; class ForgotPasswordController extends MyController { final MyFormValidator basicValidator = MyFormValidator(); diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart index 40cbd25..408ab5a 100644 --- a/lib/controller/auth/login_controller.dart +++ b/lib/controller/auth/login_controller.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_validators.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_validators.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class LoginController extends MyController { final MyFormValidator basicValidator = MyFormValidator(); diff --git a/lib/controller/auth/mpin_controller.dart b/lib/controller/auth/mpin_controller.dart index a03b1f2..d72db80 100644 --- a/lib/controller/auth/mpin_controller.dart +++ b/lib/controller/auth/mpin_controller.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/firebase/firebase_messaging_service.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/project_controller.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/firebase/firebase_messaging_service.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; class MPINController extends GetxController { final MyFormValidator basicValidator = MyFormValidator(); diff --git a/lib/controller/auth/otp_controller.dart b/lib/controller/auth/otp_controller.dart index 53cfeb5..e677816 100644 --- a/lib/controller/auth/otp_controller.dart +++ b/lib/controller/auth/otp_controller.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class OTPController extends GetxController { final formKey = GlobalKey(); diff --git a/lib/controller/auth/register_account_controller.dart b/lib/controller/auth/register_account_controller.dart index 8236b90..b0db3c3 100644 --- a/lib/controller/auth/register_account_controller.dart +++ b/lib/controller/auth/register_account_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_validators.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_validators.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class RegisterAccountController extends MyController { MyFormValidator basicValidator = MyFormValidator(); diff --git a/lib/controller/auth/reset_password_controller.dart b/lib/controller/auth/reset_password_controller.dart index 842ca40..c411b5d 100644 --- a/lib/controller/auth/reset_password_controller.dart +++ b/lib/controller/auth/reset_password_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_validators.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_validators.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class ResetPasswordController extends MyController { MyFormValidator basicValidator = MyFormValidator(); diff --git a/lib/controller/dashboard/dashboard_controller.dart b/lib/controller/dashboard/dashboard_controller.dart index e9923b9..e6ed81b 100644 --- a/lib/controller/dashboard/dashboard_controller.dart +++ b/lib/controller/dashboard/dashboard_controller.dart @@ -1,12 +1,12 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/model/dashboard/project_progress_model.dart'; -import 'package:marco/model/dashboard/pending_expenses_model.dart'; -import 'package:marco/model/dashboard/expense_type_report_model.dart'; -import 'package:marco/model/dashboard/monthly_expence_model.dart'; -import 'package:marco/model/expense/expense_type_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/model/dashboard/project_progress_model.dart'; +import 'package:on_field_work/model/dashboard/pending_expenses_model.dart'; +import 'package:on_field_work/model/dashboard/expense_type_report_model.dart'; +import 'package:on_field_work/model/dashboard/monthly_expence_model.dart'; +import 'package:on_field_work/model/expense/expense_type_model.dart'; class DashboardController extends GetxController { // ========================= diff --git a/lib/controller/directory/add_comment_controller.dart b/lib/controller/directory/add_comment_controller.dart index fcc3357..69f1aaf 100644 --- a/lib/controller/directory/add_comment_controller.dart +++ b/lib/controller/directory/add_comment_controller.dart @@ -1,9 +1,9 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/controller/directory/notes_controller.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/controller/directory/notes_controller.dart'; class AddCommentController extends GetxController { final String contactId; diff --git a/lib/controller/directory/add_contact_controller.dart b/lib/controller/directory/add_contact_controller.dart index 0c549c3..96989a7 100644 --- a/lib/controller/directory/add_contact_controller.dart +++ b/lib/controller/directory/add_contact_controller.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class AddContactController extends GetxController { final RxList categories = [].obs; diff --git a/lib/controller/directory/create_bucket_controller.dart b/lib/controller/directory/create_bucket_controller.dart index 80338d5..325b589 100644 --- a/lib/controller/directory/create_bucket_controller.dart +++ b/lib/controller/directory/create_bucket_controller.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class BucketController extends GetxController { RxBool isCreating = false.obs; diff --git a/lib/controller/directory/directory_controller.dart b/lib/controller/directory/directory_controller.dart index bef19f1..5bfba60 100644 --- a/lib/controller/directory/directory_controller.dart +++ b/lib/controller/directory/directory_controller.dart @@ -1,10 +1,10 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/directory/contact_model.dart'; -import 'package:marco/model/directory/contact_bucket_list_model.dart'; -import 'package:marco/model/directory/directory_comment_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/directory/contact_model.dart'; +import 'package:on_field_work/model/directory/contact_bucket_list_model.dart'; +import 'package:on_field_work/model/directory/directory_comment_model.dart'; class DirectoryController extends GetxController { // -------------------- CONTACTS -------------------- diff --git a/lib/controller/directory/manage_bucket_controller.dart b/lib/controller/directory/manage_bucket_controller.dart index 72ad336..66e0995 100644 --- a/lib/controller/directory/manage_bucket_controller.dart +++ b/lib/controller/directory/manage_bucket_controller.dart @@ -1,9 +1,9 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; class ManageBucketController extends GetxController { RxList allEmployees = [].obs; diff --git a/lib/controller/directory/notes_controller.dart b/lib/controller/directory/notes_controller.dart index 1868414..2185633 100644 --- a/lib/controller/directory/notes_controller.dart +++ b/lib/controller/directory/notes_controller.dart @@ -1,8 +1,8 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/directory/note_list_response_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/directory/note_list_response_model.dart'; class NotesController extends GetxController { RxList notesList = [].obs; diff --git a/lib/controller/document/document_details_controller.dart b/lib/controller/document/document_details_controller.dart index c160a0d..c2edc2e 100644 --- a/lib/controller/document/document_details_controller.dart +++ b/lib/controller/document/document_details_controller.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/document/document_details_model.dart'; -import 'package:marco/model/document/document_version_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/document/document_details_model.dart'; +import 'package:on_field_work/model/document/document_version_model.dart'; class DocumentDetailsController extends GetxController { /// Observables diff --git a/lib/controller/document/document_upload_controller.dart b/lib/controller/document/document_upload_controller.dart index c7e33c7..56fe638 100644 --- a/lib/controller/document/document_upload_controller.dart +++ b/lib/controller/document/document_upload_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/document/master_document_type_model.dart'; -import 'package:marco/model/document/master_document_tags.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/document/master_document_type_model.dart'; +import 'package:on_field_work/model/document/master_document_tags.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class DocumentUploadController extends GetxController { // Observables diff --git a/lib/controller/document/user_document_controller.dart b/lib/controller/document/user_document_controller.dart index 958dade..a424dce 100644 --- a/lib/controller/document/user_document_controller.dart +++ b/lib/controller/document/user_document_controller.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/document/document_filter_model.dart'; -import 'package:marco/model/document/documents_list_model.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/document/document_filter_model.dart'; +import 'package:on_field_work/model/document/documents_list_model.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class DocumentController extends GetxController { // ==================== Observables ==================== diff --git a/lib/controller/dynamicMenu/dynamic_menu_controller.dart b/lib/controller/dynamicMenu/dynamic_menu_controller.dart index f55cb1e..f5f259c 100644 --- a/lib/controller/dynamicMenu/dynamic_menu_controller.dart +++ b/lib/controller/dynamicMenu/dynamic_menu_controller.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/dynamicMenu/dynamic_menu_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class DynamicMenuController extends GetxController { // UI reactive states diff --git a/lib/controller/employee/add_employee_controller.dart b/lib/controller/employee/add_employee_controller.dart index 44aa286..fbbab27 100644 --- a/lib/controller/employee/add_employee_controller.dart +++ b/lib/controller/employee/add_employee_controller.dart @@ -1,11 +1,11 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; import 'package:flutter_contacts/flutter_contacts.dart'; import 'package:permission_handler/permission_handler.dart'; diff --git a/lib/controller/employee/assign_projects_controller.dart b/lib/controller/employee/assign_projects_controller.dart index 37581ae..7962b8c 100644 --- a/lib/controller/employee/assign_projects_controller.dart +++ b/lib/controller/employee/assign_projects_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/model/global_project_model.dart'; -import 'package:marco/model/employees/assigned_projects_model.dart'; -import 'package:marco/controller/project_controller.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/global_project_model.dart'; +import 'package:on_field_work/model/employees/assigned_projects_model.dart'; +import 'package:on_field_work/controller/project_controller.dart'; class AssignProjectController extends GetxController { final String employeeId; diff --git a/lib/controller/employee/employees_screen_controller.dart b/lib/controller/employee/employees_screen_controller.dart index a8d9f1a..d8a4c9e 100644 --- a/lib/controller/employee/employees_screen_controller.dart +++ b/lib/controller/employee/employees_screen_controller.dart @@ -1,8 +1,8 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/employees/employee_details_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/employees/employee_details_model.dart'; class EmployeesScreenController extends GetxController { /// ✅ Data lists diff --git a/lib/controller/error_pages/coming_soon_controller.dart b/lib/controller/error_pages/coming_soon_controller.dart index 50c820a..429b37e 100644 --- a/lib/controller/error_pages/coming_soon_controller.dart +++ b/lib/controller/error_pages/coming_soon_controller.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class ComingSoonController extends MyController { Timer? countdownTimer; diff --git a/lib/controller/error_pages/error_404_controller.dart b/lib/controller/error_pages/error_404_controller.dart index 7894d01..90323dc 100644 --- a/lib/controller/error_pages/error_404_controller.dart +++ b/lib/controller/error_pages/error_404_controller.dart @@ -1,5 +1,5 @@ import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class Error404Controller extends MyController { void goToDashboardScreen() { diff --git a/lib/controller/error_pages/error_500_controller.dart b/lib/controller/error_pages/error_500_controller.dart index c080b64..13f7827 100644 --- a/lib/controller/error_pages/error_500_controller.dart +++ b/lib/controller/error_pages/error_500_controller.dart @@ -1,5 +1,5 @@ import 'package:get/get.dart'; -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class Error500Controller extends MyController { void goToDashboardScreen() { diff --git a/lib/controller/expense/add_expense_controller.dart b/lib/controller/expense/add_expense_controller.dart index 2869be3..32e53fd 100644 --- a/lib/controller/expense/add_expense_controller.dart +++ b/lib/controller/expense/add_expense_controller.dart @@ -10,14 +10,14 @@ import 'package:intl/intl.dart'; import 'package:mime/mime.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:marco/controller/expense/expense_screen_controller.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/expense/expense_type_model.dart'; -import 'package:marco/model/expense/payment_types_model.dart'; -import 'package:marco/helpers/widgets/time_stamp_image_helper.dart'; +import 'package:on_field_work/controller/expense/expense_screen_controller.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/expense/expense_type_model.dart'; +import 'package:on_field_work/model/expense/payment_types_model.dart'; +import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart'; class AddExpenseController extends GetxController { // --- Text Controllers --- diff --git a/lib/controller/expense/expense_detail_controller.dart b/lib/controller/expense/expense_detail_controller.dart index afc925a..9ba8376 100644 --- a/lib/controller/expense/expense_detail_controller.dart +++ b/lib/controller/expense/expense_detail_controller.dart @@ -1,8 +1,8 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/model/expense/expense_detail_model.dart'; -import 'package:marco/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/expense/expense_detail_model.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; import 'package:flutter/material.dart'; class ExpenseDetailController extends GetxController { diff --git a/lib/controller/expense/expense_screen_controller.dart b/lib/controller/expense/expense_screen_controller.dart index a32ab1c..9cab200 100644 --- a/lib/controller/expense/expense_screen_controller.dart +++ b/lib/controller/expense/expense_screen_controller.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/model/expense/expense_list_model.dart'; -import 'package:marco/model/expense/payment_types_model.dart'; -import 'package:marco/model/expense/expense_type_model.dart'; -import 'package:marco/model/expense/expense_status_model.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/expense/expense_list_model.dart'; +import 'package:on_field_work/model/expense/payment_types_model.dart'; +import 'package:on_field_work/model/expense/expense_type_model.dart'; +import 'package:on_field_work/model/expense/expense_status_model.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; import 'package:flutter/material.dart'; class ExpenseController extends GetxController { diff --git a/lib/controller/extra_pages/faqs_controller.dart b/lib/controller/extra_pages/faqs_controller.dart index 4ac1905..a704d75 100644 --- a/lib/controller/extra_pages/faqs_controller.dart +++ b/lib/controller/extra_pages/faqs_controller.dart @@ -1,5 +1,5 @@ -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_text_utils.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text_utils.dart'; class FaqsController extends MyController { final List dataExpansionPanel = [true, false, false, false, false, false]; diff --git a/lib/controller/extra_pages/pricing_controller.dart b/lib/controller/extra_pages/pricing_controller.dart index 6db7583..0ab3745 100644 --- a/lib/controller/extra_pages/pricing_controller.dart +++ b/lib/controller/extra_pages/pricing_controller.dart @@ -1,4 +1,4 @@ -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class PricingController extends MyController { bool isMonth = false; diff --git a/lib/controller/finance/add_payment_request_controller.dart b/lib/controller/finance/add_payment_request_controller.dart index 1ff0a4e..e7688b9 100644 --- a/lib/controller/finance/add_payment_request_controller.dart +++ b/lib/controller/finance/add_payment_request_controller.dart @@ -8,12 +8,12 @@ import 'package:image_picker/image_picker.dart'; import 'package:mime/mime.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/time_stamp_image_helper.dart'; -import 'package:marco/model/finance/expense_category_model.dart'; -import 'package:marco/model/finance/currency_list_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart'; +import 'package:on_field_work/model/finance/expense_category_model.dart'; +import 'package:on_field_work/model/finance/currency_list_model.dart'; class AddPaymentRequestController extends GetxController { // Loading States diff --git a/lib/controller/finance/advance_payment_controller.dart b/lib/controller/finance/advance_payment_controller.dart index 84eb917..9fc63f9 100644 --- a/lib/controller/finance/advance_payment_controller.dart +++ b/lib/controller/finance/advance_payment_controller.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:marco/model/finance/advance_payment_model.dart'; -import 'package:marco/model/finance/get_employee_model.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; +import 'package:on_field_work/model/finance/advance_payment_model.dart'; +import 'package:on_field_work/model/finance/get_employee_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; class AdvancePaymentController extends GetxController { /// Advance payments list diff --git a/lib/controller/finance/payment_request_controller.dart b/lib/controller/finance/payment_request_controller.dart index 3418c83..14b9e56 100644 --- a/lib/controller/finance/payment_request_controller.dart +++ b/lib/controller/finance/payment_request_controller.dart @@ -1,8 +1,8 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/finance/payment_request_list_model.dart'; -import 'package:marco/model/finance/payment_request_filter.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/finance/payment_request_list_model.dart'; +import 'package:on_field_work/model/finance/payment_request_filter.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class PaymentRequestController extends GetxController { // ---------------- Observables ---------------- diff --git a/lib/controller/finance/payment_request_detail_controller.dart b/lib/controller/finance/payment_request_detail_controller.dart index 048495b..d790eb4 100644 --- a/lib/controller/finance/payment_request_detail_controller.dart +++ b/lib/controller/finance/payment_request_detail_controller.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/finance/payment_request_details_model.dart'; -import 'package:marco/model/expense/payment_types_model.dart'; -import 'package:marco/helpers/widgets/time_stamp_image_helper.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/finance/payment_request_details_model.dart'; +import 'package:on_field_work/model/expense/payment_types_model.dart'; +import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart'; import 'package:image_picker/image_picker.dart'; import 'dart:convert'; import 'dart:io'; @@ -13,7 +13,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; import 'package:mime/mime.dart'; -import 'package:marco/controller/finance/payment_request_controller.dart'; +import 'package:on_field_work/controller/finance/payment_request_controller.dart'; class PaymentRequestDetailController extends GetxController { final Rx paymentRequest = Rx(null); diff --git a/lib/controller/layout/auth_layout_2_controller.dart b/lib/controller/layout/auth_layout_2_controller.dart index bcf35eb..3d096d4 100644 --- a/lib/controller/layout/auth_layout_2_controller.dart +++ b/lib/controller/layout/auth_layout_2_controller.dart @@ -1,3 +1,3 @@ -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class AuthLayout2Controller extends MyController {} diff --git a/lib/controller/layout/auth_layout_controller.dart b/lib/controller/layout/auth_layout_controller.dart index e873fb4..555cbf9 100644 --- a/lib/controller/layout/auth_layout_controller.dart +++ b/lib/controller/layout/auth_layout_controller.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_text_utils.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text_utils.dart'; import 'package:flutter/material.dart'; class AuthLayoutController extends MyController { diff --git a/lib/controller/layout/layout_controller.dart b/lib/controller/layout/layout_controller.dart index f7be536..a3cca3a 100644 --- a/lib/controller/layout/layout_controller.dart +++ b/lib/controller/layout/layout_controller.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/model/project_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/model/project_model.dart'; class LayoutController extends GetxController { // Theme Customization diff --git a/lib/controller/my_controller.dart b/lib/controller/my_controller.dart index b831e8c..190c84f 100644 --- a/lib/controller/my_controller.dart +++ b/lib/controller/my_controller.dart @@ -1,5 +1,5 @@ import 'package:get/get_state_manager/get_state_manager.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; abstract class MyController extends GetxController { @override diff --git a/lib/controller/permission_controller.dart b/lib/controller/permission_controller.dart index 30253d7..8e17ecc 100644 --- a/lib/controller/permission_controller.dart +++ b/lib/controller/permission_controller.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'dart:convert'; import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/permission_service.dart'; -import 'package:marco/model/user_permission.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/model/projects_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/permission_service.dart'; +import 'package:on_field_work/model/user_permission.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/model/projects_model.dart'; class PermissionController extends GetxController { var permissions = [].obs; diff --git a/lib/controller/project_controller.dart b/lib/controller/project_controller.dart index a31cfcd..0ffafa9 100644 --- a/lib/controller/project_controller.dart +++ b/lib/controller/project_controller.dart @@ -1,8 +1,8 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/global_project_model.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/global_project_model.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; class ProjectController extends GetxController { RxList projects = [].obs; diff --git a/lib/controller/service_project/add_service_project_job_controller.dart b/lib/controller/service_project/add_service_project_job_controller.dart index cf29f3f..3d07097 100644 --- a/lib/controller/service_project/add_service_project_job_controller.dart +++ b/lib/controller/service_project/add_service_project_job_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/service_project/service_project_details_screen_controller.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/service_project/service_project_branches_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/service_project/service_project_details_screen_controller.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/service_project/service_project_branches_model.dart'; class AddServiceProjectJobController extends GetxController { // FORM CONTROLLERS diff --git a/lib/controller/service_project/service_project_allocation_controller.dart b/lib/controller/service_project/service_project_allocation_controller.dart index a59b399..dd85f35 100644 --- a/lib/controller/service_project/service_project_allocation_controller.dart +++ b/lib/controller/service_project/service_project_allocation_controller.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/model/service_project/job_allocation_model.dart'; -import 'package:marco/helpers/services/api_service.dart'; +import 'package:on_field_work/model/service_project/job_allocation_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; class ServiceProjectAllocationController extends GetxController { final projectId = ''.obs; diff --git a/lib/controller/service_project/service_project_details_screen_controller.dart b/lib/controller/service_project/service_project_details_screen_controller.dart index add77c9..46f43aa 100644 --- a/lib/controller/service_project/service_project_details_screen_controller.dart +++ b/lib/controller/service_project/service_project_details_screen_controller.dart @@ -1,11 +1,11 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/service_project/service_projects_details_model.dart'; -import 'package:marco/model/service_project/job_list_model.dart'; -import 'package:marco/model/service_project/service_project_job_detail_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/service_project/service_projects_details_model.dart'; +import 'package:on_field_work/model/service_project/job_list_model.dart'; +import 'package:on_field_work/model/service_project/service_project_job_detail_model.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:marco/model/service_project/job_attendance_logs_model.dart'; -import 'package:marco/model/service_project/job_allocation_model.dart'; +import 'package:on_field_work/model/service_project/job_attendance_logs_model.dart'; +import 'package:on_field_work/model/service_project/job_allocation_model.dart'; import 'dart:convert'; import 'dart:io'; diff --git a/lib/controller/service_project/service_project_screen_controller.dart b/lib/controller/service_project/service_project_screen_controller.dart index 401b68b..22d4a5c 100644 --- a/lib/controller/service_project/service_project_screen_controller.dart +++ b/lib/controller/service_project/service_project_screen_controller.dart @@ -1,6 +1,6 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/service_project/service_projects_list_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/service_project/service_projects_list_model.dart'; class ServiceProjectController extends GetxController { final projects = [].obs; diff --git a/lib/controller/task_planning/add_task_controller.dart b/lib/controller/task_planning/add_task_controller.dart index b3df752..6a7ef5e 100644 --- a/lib/controller/task_planning/add_task_controller.dart +++ b/lib/controller/task_planning/add_task_controller.dart @@ -1,9 +1,9 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/dailyTaskPlanning/master_work_category_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/master_work_category_model.dart'; class AddTaskController extends GetxController { RxMap uploadingStates = {}.obs; diff --git a/lib/controller/task_planning/daily_task_controller.dart b/lib/controller/task_planning/daily_task_controller.dart index 7fddd48..7f25e49 100644 --- a/lib/controller/task_planning/daily_task_controller.dart +++ b/lib/controller/task_planning/daily_task_controller.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/project_model.dart'; -import 'package:marco/model/dailyTaskPlanning/daily_task_model.dart'; -import 'package:marco/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/project_model.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/daily_task_model.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart'; class DailyTaskController extends GetxController { List projects = []; diff --git a/lib/controller/task_planning/daily_task_planning_controller.dart b/lib/controller/task_planning/daily_task_planning_controller.dart index a0d24df..8ebd877 100644 --- a/lib/controller/task_planning/daily_task_planning_controller.dart +++ b/lib/controller/task_planning/daily_task_planning_controller.dart @@ -1,11 +1,11 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/project_model.dart'; -import 'package:marco/model/dailyTaskPlanning/daily_task_planning_model.dart'; -import 'package:marco/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/project_model.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/daily_task_planning_model.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; class DailyTaskPlanningController extends GetxController { List projects = []; diff --git a/lib/controller/task_planning/report_task_action_controller.dart b/lib/controller/task_planning/report_task_action_controller.dart index 491e618..91633f2 100644 --- a/lib/controller/task_planning/report_task_action_controller.dart +++ b/lib/controller/task_planning/report_task_action_controller.dart @@ -4,16 +4,16 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/widgets/my_image_compressor.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/dailyTaskPlanning/work_status_model.dart'; -import 'package:marco/helpers/widgets/time_stamp_image_helper.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_image_compressor.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/work_status_model.dart'; +import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart'; enum ApiStatus { idle, loading, success, failure } diff --git a/lib/controller/task_planning/report_task_controller.dart b/lib/controller/task_planning/report_task_controller.dart index 8aec032..34d0711 100644 --- a/lib/controller/task_planning/report_task_controller.dart +++ b/lib/controller/task_planning/report_task_controller.dart @@ -1,17 +1,17 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/services/api_service.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart'; import 'package:image_picker/image_picker.dart'; import 'dart:io'; import 'dart:convert'; -import 'package:marco/helpers/widgets/my_image_compressor.dart'; -import 'package:marco/helpers/widgets/time_stamp_image_helper.dart'; +import 'package:on_field_work/helpers/widgets/my_image_compressor.dart'; +import 'package:on_field_work/helpers/widgets/time_stamp_image_helper.dart'; enum ApiStatus { idle, loading, success, failure } diff --git a/lib/controller/tenant/all_organization_controller.dart b/lib/controller/tenant/all_organization_controller.dart index 75ce2fd..80ea99a 100644 --- a/lib/controller/tenant/all_organization_controller.dart +++ b/lib/controller/tenant/all_organization_controller.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/all_organization_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/all_organization_model.dart'; class AllOrganizationController extends GetxController { RxList organizations = [].obs; diff --git a/lib/controller/tenant/organization_selection_controller.dart b/lib/controller/tenant/organization_selection_controller.dart index ee6db6e..4b84375 100644 --- a/lib/controller/tenant/organization_selection_controller.dart +++ b/lib/controller/tenant/organization_selection_controller.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/model/attendance/organization_per_project_list_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart'; class OrganizationController extends GetxController { /// List of organizations assigned to the selected project diff --git a/lib/controller/tenant/service_controller.dart b/lib/controller/tenant/service_controller.dart index f832157..eed1d8f 100644 --- a/lib/controller/tenant/service_controller.dart +++ b/lib/controller/tenant/service_controller.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/model/tenant/tenant_services_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/tenant/tenant_services_model.dart'; class ServiceController extends GetxController { List services = []; diff --git a/lib/controller/tenant/tenant_selection_controller.dart b/lib/controller/tenant/tenant_selection_controller.dart index 7952e91..c5074be 100644 --- a/lib/controller/tenant/tenant_selection_controller.dart +++ b/lib/controller/tenant/tenant_selection_controller.dart @@ -1,10 +1,10 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/tenant_service.dart'; -import 'package:marco/model/tenant/tenant_list_model.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/tenant_service.dart'; +import 'package:on_field_work/model/tenant/tenant_list_model.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; class TenantSelectionController extends GetxController { final TenantService _tenantService = TenantService(); diff --git a/lib/controller/tenant/tenant_switch_controller.dart b/lib/controller/tenant/tenant_switch_controller.dart index 5d73dc7..1ecaa8a 100644 --- a/lib/controller/tenant/tenant_switch_controller.dart +++ b/lib/controller/tenant/tenant_switch_controller.dart @@ -1,10 +1,10 @@ import 'package:get/get.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/tenant_service.dart'; -import 'package:marco/model/tenant/tenant_list_model.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/tenant_service.dart'; +import 'package:on_field_work/model/tenant/tenant_list_model.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; class TenantSwitchController extends GetxController { final TenantService _tenantService = TenantService(); diff --git a/lib/controller/ui/buttons_controller.dart b/lib/controller/ui/buttons_controller.dart index 9141c6a..71c61ec 100644 --- a/lib/controller/ui/buttons_controller.dart +++ b/lib/controller/ui/buttons_controller.dart @@ -1,4 +1,4 @@ -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class ButtonsController extends MyController { List selected = List.filled(3, false); diff --git a/lib/controller/ui/carousels_controller.dart b/lib/controller/ui/carousels_controller.dart index 6f64dc4..b5d6955 100644 --- a/lib/controller/ui/carousels_controller.dart +++ b/lib/controller/ui/carousels_controller.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:carousel_slider/carousel_controller.dart'; -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; import 'package:flutter/material.dart'; class CarouselsController extends MyController { diff --git a/lib/controller/ui/dialogs_controller.dart b/lib/controller/ui/dialogs_controller.dart index 670848f..00fba9d 100644 --- a/lib/controller/ui/dialogs_controller.dart +++ b/lib/controller/ui/dialogs_controller.dart @@ -1,5 +1,5 @@ -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_text_utils.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text_utils.dart'; class DialogsController extends MyController { List dummyTexts = diff --git a/lib/controller/ui/loaders_controller.dart b/lib/controller/ui/loaders_controller.dart index 55fc120..933d214 100644 --- a/lib/controller/ui/loaders_controller.dart +++ b/lib/controller/ui/loaders_controller.dart @@ -1,3 +1,3 @@ -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; class LoadersController extends MyController {} diff --git a/lib/controller/ui/modal_controller.dart b/lib/controller/ui/modal_controller.dart index e1f5660..9fcd3d3 100644 --- a/lib/controller/ui/modal_controller.dart +++ b/lib/controller/ui/modal_controller.dart @@ -1,5 +1,5 @@ -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_text_utils.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text_utils.dart'; import 'package:flutter/animation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/controller/ui/notification_controller.dart b/lib/controller/ui/notification_controller.dart index 5a02ff2..d78a484 100644 --- a/lib/controller/ui/notification_controller.dart +++ b/lib/controller/ui/notification_controller.dart @@ -1,10 +1,10 @@ import 'dart:async'; -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/extensions/string.dart'; -import 'package:marco/helpers/theme/admin_theme.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/extensions/string.dart'; +import 'package:on_field_work/helpers/theme/admin_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; diff --git a/lib/controller/ui/tabs_controller.dart b/lib/controller/ui/tabs_controller.dart index 77789ca..57641bc 100644 --- a/lib/controller/ui/tabs_controller.dart +++ b/lib/controller/ui/tabs_controller.dart @@ -1,5 +1,5 @@ -import 'package:marco/controller/my_controller.dart'; -import 'package:marco/helpers/widgets/my_text_utils.dart'; +import 'package:on_field_work/controller/my_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text_utils.dart'; import 'package:flutter/material.dart'; class TabsController extends MyController { diff --git a/lib/controller/ui/toast_message_controller.dart b/lib/controller/ui/toast_message_controller.dart index 61c4656..232036f 100644 --- a/lib/controller/ui/toast_message_controller.dart +++ b/lib/controller/ui/toast_message_controller.dart @@ -1,4 +1,4 @@ -import 'package:marco/controller/my_controller.dart'; +import 'package:on_field_work/controller/my_controller.dart'; import 'package:flutter/material.dart'; class ToastMessageController extends MyController { diff --git a/lib/helpers/extensions/app_localization_delegate.dart b/lib/helpers/extensions/app_localization_delegate.dart index 4668e1e..a9c87f7 100644 --- a/lib/helpers/extensions/app_localization_delegate.dart +++ b/lib/helpers/extensions/app_localization_delegate.dart @@ -1,5 +1,5 @@ -import 'package:marco/helpers/services/localizations/language.dart'; -import 'package:marco/helpers/theme/app_notifier.dart'; +import 'package:on_field_work/helpers/services/localizations/language.dart'; +import 'package:on_field_work/helpers/theme/app_notifier.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/helpers/extensions/string.dart b/lib/helpers/extensions/string.dart index 0e818c3..da4627c 100644 --- a/lib/helpers/extensions/string.dart +++ b/lib/helpers/extensions/string.dart @@ -1,5 +1,5 @@ import 'dart:ui'; -import 'package:marco/helpers/services/localizations/translator.dart'; +import 'package:on_field_work/helpers/services/localizations/translator.dart'; extension StringUtil on String { Color get toColor { diff --git a/lib/helpers/services/api_service.dart b/lib/helpers/services/api_service.dart index 73622be..2c22e46 100644 --- a/lib/helpers/services/api_service.dart +++ b/lib/helpers/services/api_service.dart @@ -4,42 +4,42 @@ import 'package:http/http.dart' as http; import 'package:image_picker/image_picker.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; import 'package:jwt_decoder/jwt_decoder.dart'; -import 'package:marco/model/dashboard/project_progress_model.dart'; -import 'package:marco/model/dashboard/dashboard_tasks_model.dart'; -import 'package:marco/model/dashboard/dashboard_teams_model.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/model/document/document_filter_model.dart'; -import 'package:marco/model/document/documents_list_model.dart'; -import 'package:marco/model/document/master_document_tags.dart'; -import 'package:marco/model/document/master_document_type_model.dart'; -import 'package:marco/model/document/document_details_model.dart'; -import 'package:marco/model/document/document_version_model.dart'; -import 'package:marco/model/attendance/organization_per_project_list_model.dart'; -import 'package:marco/model/tenant/tenant_services_model.dart'; -import 'package:marco/model/dailyTaskPlanning/daily_task_model.dart'; -import 'package:marco/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart'; -import 'package:marco/model/all_organization_model.dart'; -import 'package:marco/model/dashboard/pending_expenses_model.dart'; -import 'package:marco/model/dashboard/expense_type_report_model.dart'; -import 'package:marco/model/dashboard/monthly_expence_model.dart'; -import 'package:marco/model/finance/expense_category_model.dart'; -import 'package:marco/model/finance/currency_list_model.dart'; -import 'package:marco/model/finance/payment_payee_request_model.dart'; -import 'package:marco/model/finance/payment_request_list_model.dart'; -import 'package:marco/model/finance/payment_request_filter.dart'; -import 'package:marco/model/finance/payment_request_details_model.dart'; -import 'package:marco/model/finance/advance_payment_model.dart'; -import 'package:marco/model/service_project/service_projects_list_model.dart'; -import 'package:marco/model/service_project/service_projects_details_model.dart'; -import 'package:marco/model/service_project/job_list_model.dart'; -import 'package:marco/model/service_project/service_project_job_detail_model.dart'; -import 'package:marco/model/service_project/job_attendance_logs_model.dart'; -import 'package:marco/model/service_project/job_allocation_model.dart'; -import 'package:marco/model/service_project/service_project_branches_model.dart'; +import 'package:on_field_work/model/dashboard/project_progress_model.dart'; +import 'package:on_field_work/model/dashboard/dashboard_tasks_model.dart'; +import 'package:on_field_work/model/dashboard/dashboard_teams_model.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/document/document_filter_model.dart'; +import 'package:on_field_work/model/document/documents_list_model.dart'; +import 'package:on_field_work/model/document/master_document_tags.dart'; +import 'package:on_field_work/model/document/master_document_type_model.dart'; +import 'package:on_field_work/model/document/document_details_model.dart'; +import 'package:on_field_work/model/document/document_version_model.dart'; +import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart'; +import 'package:on_field_work/model/tenant/tenant_services_model.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/daily_task_model.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/daily_progress_report_filter_response_model.dart'; +import 'package:on_field_work/model/all_organization_model.dart'; +import 'package:on_field_work/model/dashboard/pending_expenses_model.dart'; +import 'package:on_field_work/model/dashboard/expense_type_report_model.dart'; +import 'package:on_field_work/model/dashboard/monthly_expence_model.dart'; +import 'package:on_field_work/model/finance/expense_category_model.dart'; +import 'package:on_field_work/model/finance/currency_list_model.dart'; +import 'package:on_field_work/model/finance/payment_payee_request_model.dart'; +import 'package:on_field_work/model/finance/payment_request_list_model.dart'; +import 'package:on_field_work/model/finance/payment_request_filter.dart'; +import 'package:on_field_work/model/finance/payment_request_details_model.dart'; +import 'package:on_field_work/model/finance/advance_payment_model.dart'; +import 'package:on_field_work/model/service_project/service_projects_list_model.dart'; +import 'package:on_field_work/model/service_project/service_projects_details_model.dart'; +import 'package:on_field_work/model/service_project/job_list_model.dart'; +import 'package:on_field_work/model/service_project/service_project_job_detail_model.dart'; +import 'package:on_field_work/model/service_project/job_attendance_logs_model.dart'; +import 'package:on_field_work/model/service_project/job_allocation_model.dart'; +import 'package:on_field_work/model/service_project/service_project_branches_model.dart'; class ApiService { static const bool enableLogs = true; diff --git a/lib/helpers/services/app_initializer.dart b/lib/helpers/services/app_initializer.dart index acd9b88..1196355 100644 --- a/lib/helpers/services/app_initializer.dart +++ b/lib/helpers/services/app_initializer.dart @@ -1,13 +1,13 @@ import 'package:flutter/services.dart'; import 'package:url_strategy/url_strategy.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/firebase/firebase_messaging_service.dart'; -import 'package:marco/helpers/services/device_info_service.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/firebase/firebase_messaging_service.dart'; +import 'package:on_field_work/helpers/services/device_info_service.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; Future initializeApp() async { try { diff --git a/lib/helpers/services/app_logger.dart b/lib/helpers/services/app_logger.dart index 1e631ea..d67a41d 100644 --- a/lib/helpers/services/app_logger.dart +++ b/lib/helpers/services/app_logger.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:logger/logger.dart'; import 'package:intl/intl.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:marco/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; /// Global logger instance Logger? _appLogger; diff --git a/lib/helpers/services/auth_service.dart b/lib/helpers/services/auth_service.dart index 8bbe2da..7582157 100644 --- a/lib/helpers/services/auth_service.dart +++ b/lib/helpers/services/auth_service.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:http/http.dart' as http; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class AuthService { static const String _baseUrl = ApiEndpoints.baseUrl; diff --git a/lib/helpers/services/firebase/firebase_messaging_service.dart b/lib/helpers/services/firebase/firebase_messaging_service.dart index 1ac8c60..b908454 100644 --- a/lib/helpers/services/firebase/firebase_messaging_service.dart +++ b/lib/helpers/services/firebase/firebase_messaging_service.dart @@ -1,10 +1,10 @@ import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:logger/logger.dart'; -import 'package:marco/helpers/services/local_notification_service.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/notification_action_handler.dart'; +import 'package:on_field_work/helpers/services/local_notification_service.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/notification_action_handler.dart'; /// Firebase Notification Service class FirebaseNotificationService { diff --git a/lib/helpers/services/localizations/language.dart b/lib/helpers/services/localizations/language.dart index 58a96a8..fe054dc 100644 --- a/lib/helpers/services/localizations/language.dart +++ b/lib/helpers/services/localizations/language.dart @@ -1,5 +1,5 @@ -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; import 'package:flutter/material.dart'; class Language { diff --git a/lib/helpers/services/localizations/translator.dart b/lib/helpers/services/localizations/translator.dart index aef7dc0..1d96ef1 100644 --- a/lib/helpers/services/localizations/translator.dart +++ b/lib/helpers/services/localizations/translator.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:developer'; -import 'package:marco/helpers/services/localizations/language.dart'; +import 'package:on_field_work/helpers/services/localizations/language.dart'; import 'package:flutter/services.dart'; import 'package:get/get_utils/src/extensions/string_extensions.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/helpers/services/notification_action_handler.dart b/lib/helpers/services/notification_action_handler.dart index e799668..40c13c6 100644 --- a/lib/helpers/services/notification_action_handler.dart +++ b/lib/helpers/services/notification_action_handler.dart @@ -1,17 +1,17 @@ import 'package:get/get.dart'; import 'package:logger/logger.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/controller/task_planning/daily_task_controller.dart'; -import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart'; -import 'package:marco/controller/expense/expense_screen_controller.dart'; -import 'package:marco/controller/expense/expense_detail_controller.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/controller/directory/notes_controller.dart'; -import 'package:marco/controller/document/user_document_controller.dart'; -import 'package:marco/controller/document/document_details_controller.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/controller/task_planning/daily_task_controller.dart'; +import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart'; +import 'package:on_field_work/controller/expense/expense_screen_controller.dart'; +import 'package:on_field_work/controller/expense/expense_detail_controller.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/controller/directory/notes_controller.dart'; +import 'package:on_field_work/controller/document/user_document_controller.dart'; +import 'package:on_field_work/controller/document/document_details_controller.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; /// Handles incoming FCM notification actions and updates UI/controllers. class NotificationActionHandler { diff --git a/lib/helpers/services/permission_service.dart b/lib/helpers/services/permission_service.dart index c3ee52e..0093e05 100644 --- a/lib/helpers/services/permission_service.dart +++ b/lib/helpers/services/permission_service.dart @@ -2,13 +2,13 @@ import 'dart:convert'; import 'package:get/get.dart'; import 'package:http/http.dart' as http; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/model/user_permission.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/model/projects_model.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/model/user_permission.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/model/projects_model.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; class PermissionService { // In-memory cache keyed by user token diff --git a/lib/helpers/services/storage/local_storage.dart b/lib/helpers/services/storage/local_storage.dart index b47dda4..d71d514 100644 --- a/lib/helpers/services/storage/local_storage.dart +++ b/lib/helpers/services/storage/local_storage.dart @@ -2,13 +2,13 @@ import 'dart:convert'; import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/localizations/language.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/model/user_permission.dart'; -import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/localizations/language.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/model/user_permission.dart'; +import 'package:on_field_work/model/dynamicMenu/dynamic_menu_model.dart'; class LocalStorage { static const String _loggedInUserKey = "user"; diff --git a/lib/helpers/services/tenant_service.dart b/lib/helpers/services/tenant_service.dart index 750eb0c..5a574c7 100644 --- a/lib/helpers/services/tenant_service.dart +++ b/lib/helpers/services/tenant_service.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/model/tenant/tenant_list_model.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/model/tenant/tenant_list_model.dart'; /// Abstract interface for tenant service functionality abstract class ITenantService { diff --git a/lib/helpers/theme/admin_theme.dart b/lib/helpers/theme/admin_theme.dart index 55d5680..4354a12 100644 --- a/lib/helpers/theme/admin_theme.dart +++ b/lib/helpers/theme/admin_theme.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; enum LeftBarThemeType { light, dark } enum ContentThemeType { light, dark } diff --git a/lib/helpers/theme/app_notifier.dart b/lib/helpers/theme/app_notifier.dart index de68471..e2306df 100644 --- a/lib/helpers/theme/app_notifier.dart +++ b/lib/helpers/theme/app_notifier.dart @@ -1,8 +1,8 @@ -import 'package:marco/helpers/services/localizations/language.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/widgets/my.dart'; +import 'package:on_field_work/helpers/services/localizations/language.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/widgets/my.dart'; import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/helpers/theme/app_theme.dart b/lib/helpers/theme/app_theme.dart index 1d3e8bb..f994415 100644 --- a/lib/helpers/theme/app_theme.dart +++ b/lib/helpers/theme/app_theme.dart @@ -6,13 +6,13 @@ * */ import 'dart:io'; import 'dart:math'; -import 'package:marco/helpers/theme/admin_theme.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/widgets/my.dart'; -import 'package:marco/helpers/widgets/my_breadcrumb_item.dart'; -import 'package:marco/helpers/widgets/my_constant.dart'; -import 'package:marco/helpers/widgets/my_screen_media.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/theme/admin_theme.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/widgets/my.dart'; +import 'package:on_field_work/helpers/widgets/my_breadcrumb_item.dart'; +import 'package:on_field_work/helpers/widgets/my_constant.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -230,7 +230,7 @@ class AppStyle { containerRadius: AppStyle.containerRadius.medium, cardRadius: AppStyle.cardRadius.medium, buttonRadius: AppStyle.buttonRadius.medium, - defaultBreadCrumbItem: MyBreadcrumbItem(name: 'Marco', route: '/client/dashboard'), + defaultBreadCrumbItem: MyBreadcrumbItem(name: 'On Field Work', route: '/client/dashboard'), )); bool isMobile = true; try { diff --git a/lib/helpers/theme/theme_customizer.dart b/lib/helpers/theme/theme_customizer.dart index 7c2eeaf..e785d33 100644 --- a/lib/helpers/theme/theme_customizer.dart +++ b/lib/helpers/theme/theme_customizer.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:marco/helpers/services/json_decoder.dart'; -import 'package:marco/helpers/services/localizations/language.dart'; -import 'package:marco/helpers/services/localizations/translator.dart'; -import 'package:marco/helpers/services/navigation_services.dart'; -import 'package:marco/helpers/theme/admin_theme.dart'; -import 'package:marco/helpers/theme/app_notifier.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/services/json_decoder.dart'; +import 'package:on_field_work/helpers/services/localizations/language.dart'; +import 'package:on_field_work/helpers/services/localizations/translator.dart'; +import 'package:on_field_work/helpers/services/navigation_services.dart'; +import 'package:on_field_work/helpers/theme/admin_theme.dart'; +import 'package:on_field_work/helpers/theme/app_notifier.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/helpers/theme/theme_editor_widget.dart b/lib/helpers/theme/theme_editor_widget.dart index 05b2561..0a49c45 100644 --- a/lib/helpers/theme/theme_editor_widget.dart +++ b/lib/helpers/theme/theme_editor_widget.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/wave_background.dart'; -import 'package:marco/helpers/theme/admin_theme.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/wave_background.dart'; +import 'package:on_field_work/helpers/theme/admin_theme.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; class ThemeOption { final String label; diff --git a/lib/helpers/utils/base_bottom_sheet.dart b/lib/helpers/utils/base_bottom_sheet.dart index c2094e1..db496ce 100644 --- a/lib/helpers/utils/base_bottom_sheet.dart +++ b/lib/helpers/utils/base_bottom_sheet.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class BaseBottomSheet extends StatefulWidget { final String title; diff --git a/lib/helpers/utils/contact_picker_helper.dart b/lib/helpers/utils/contact_picker_helper.dart index 73c2840..b7ef560 100644 --- a/lib/helpers/utils/contact_picker_helper.dart +++ b/lib/helpers/utils/contact_picker_helper.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_contacts/flutter_contacts.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class ContactPickerHelper { static Future pickIndianPhoneNumber(BuildContext context) async { diff --git a/lib/helpers/utils/launcher_utils.dart b/lib/helpers/utils/launcher_utils.dart index 5733bd6..3c7d560 100644 --- a/lib/helpers/utils/launcher_utils.dart +++ b/lib/helpers/utils/launcher_utils.dart @@ -1,7 +1,7 @@ import 'package:flutter/services.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class LauncherUtils { /// Launches the phone dialer with the provided phone number diff --git a/lib/helpers/utils/mixins/ui_mixin.dart b/lib/helpers/utils/mixins/ui_mixin.dart index 5467112..74cbcb1 100644 --- a/lib/helpers/utils/mixins/ui_mixin.dart +++ b/lib/helpers/utils/mixins/ui_mixin.dart @@ -1,7 +1,7 @@ -import 'package:marco/helpers/theme/admin_theme.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_dashed_divider.dart'; -import 'package:marco/helpers/widgets/my_navigation_mixin.dart'; +import 'package:on_field_work/helpers/theme/admin_theme.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_dashed_divider.dart'; +import 'package:on_field_work/helpers/widgets/my_navigation_mixin.dart'; import 'package:flutter/material.dart'; mixin UIMixin { diff --git a/lib/helpers/utils/utils.dart b/lib/helpers/utils/utils.dart index 8a72760..b132652 100644 --- a/lib/helpers/utils/utils.dart +++ b/lib/helpers/utils/utils.dart @@ -1,5 +1,5 @@ import 'package:intl/intl.dart'; -import 'package:marco/helpers/extensions/date_time_extension.dart'; +import 'package:on_field_work/helpers/extensions/date_time_extension.dart'; class Utils { static getDateStringFromDateTime(DateTime dateTime, diff --git a/lib/helpers/widgets/avatar.dart b/lib/helpers/widgets/avatar.dart index c206631..a816649 100644 --- a/lib/helpers/widgets/avatar.dart +++ b/lib/helpers/widgets/avatar.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class Avatar extends StatelessWidget { final String firstName; diff --git a/lib/helpers/widgets/custom_app_bar.dart b/lib/helpers/widgets/custom_app_bar.dart index 0b39ad0..b1fc7f7 100644 --- a/lib/helpers/widgets/custom_app_bar.dart +++ b/lib/helpers/widgets/custom_app_bar.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { final String title; diff --git a/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart b/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart index e0f1fad..52c78f0 100644 --- a/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart +++ b/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class AttendanceDashboardChart extends StatelessWidget { AttendanceDashboardChart({Key? key}) : super(key: key); diff --git a/lib/helpers/widgets/dashbaord/dashboard_overview_widgets.dart b/lib/helpers/widgets/dashbaord/dashboard_overview_widgets.dart index 3ced75a..f6ae671 100644 --- a/lib/helpers/widgets/dashbaord/dashboard_overview_widgets.dart +++ b/lib/helpers/widgets/dashbaord/dashboard_overview_widgets.dart @@ -4,10 +4,10 @@ import 'package:intl/intl.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; // Assuming these exist in the project -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class DashboardOverviewWidgets { static final DashboardController dashboardController = diff --git a/lib/helpers/widgets/dashbaord/expense_breakdown_chart.dart b/lib/helpers/widgets/dashbaord/expense_breakdown_chart.dart index 9dc6efc..bf60c1c 100644 --- a/lib/helpers/widgets/dashbaord/expense_breakdown_chart.dart +++ b/lib/helpers/widgets/dashbaord/expense_breakdown_chart.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/dashboard/expense_type_report_model.dart'; -import 'package:marco/helpers/utils/utils.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/dashboard/expense_type_report_model.dart'; +import 'package:on_field_work/helpers/utils/utils.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; class ExpenseTypeReportChart extends StatelessWidget { ExpenseTypeReportChart({Key? key}) : super(key: key); diff --git a/lib/helpers/widgets/dashbaord/expense_by_status_widget.dart b/lib/helpers/widgets/dashbaord/expense_by_status_widget.dart index 9d10826..cf80f6f 100644 --- a/lib/helpers/widgets/dashbaord/expense_by_status_widget.dart +++ b/lib/helpers/widgets/dashbaord/expense_by_status_widget.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/utils.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/controller/expense/expense_screen_controller.dart'; -import 'package:marco/view/expense/expense_screen.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/utils.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/controller/expense/expense_screen_controller.dart'; +import 'package:on_field_work/view/expense/expense_screen.dart'; import 'package:collection/collection.dart'; class ExpenseByStatusWidget extends StatelessWidget { diff --git a/lib/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart b/lib/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart index a1eb053..e438d00 100644 --- a/lib/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart +++ b/lib/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/utils.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/utils.dart'; import 'package:intl/intl.dart'; // ========================= diff --git a/lib/helpers/widgets/dashbaord/project_progress_chart.dart b/lib/helpers/widgets/dashbaord/project_progress_chart.dart index ed2acb5..fc01eea 100644 --- a/lib/helpers/widgets/dashbaord/project_progress_chart.dart +++ b/lib/helpers/widgets/dashbaord/project_progress_chart.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; -import 'package:marco/model/dashboard/project_progress_model.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/utils.dart'; +import 'package:on_field_work/model/dashboard/project_progress_model.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/utils.dart'; class ProjectProgressChart extends StatelessWidget { final List data; diff --git a/lib/helpers/widgets/date_range_picker.dart b/lib/helpers/widgets/date_range_picker.dart index 83982bc..907f765 100644 --- a/lib/helpers/widgets/date_range_picker.dart +++ b/lib/helpers/widgets/date_range_picker.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/utils/utils.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/utils.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; typedef OnDateRangeSelected = void Function(DateTime? start, DateTime? end); diff --git a/lib/helpers/widgets/expense/expense_detail_helpers.dart b/lib/helpers/widgets/expense/expense_detail_helpers.dart index 1a5f450..dcb43ac 100644 --- a/lib/helpers/widgets/expense/expense_detail_helpers.dart +++ b/lib/helpers/widgets/expense/expense_detail_helpers.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; /// Returns a formatted color for the expense status. Color getExpenseStatusColor(String? status, {String? colorCode}) { diff --git a/lib/helpers/widgets/expense/expense_form_widgets.dart b/lib/helpers/widgets/expense/expense_form_widgets.dart index d383ac9..0d2c4a1 100644 --- a/lib/helpers/widgets/expense/expense_form_widgets.dart +++ b/lib/helpers/widgets/expense/expense_form_widgets.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; /// 🔹 Common Colors & Styles final _hintStyle = TextStyle(fontSize: 14, color: Colors.grey[600]); diff --git a/lib/helpers/widgets/expense/expense_main_components.dart b/lib/helpers/widgets/expense/expense_main_components.dart index 79a1b75..dccfff1 100644 --- a/lib/helpers/widgets/expense/expense_main_components.dart +++ b/lib/helpers/widgets/expense/expense_main_components.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/expense/expense_screen_controller.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/expense/expense_list_model.dart'; -import 'package:marco/view/expense/expense_detail_screen.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/expense/expense_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/expense/expense_list_model.dart'; +import 'package:on_field_work/view/expense/expense_detail_screen.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class ExpenseAppBar extends StatelessWidget implements PreferredSizeWidget { final ProjectController projectController; diff --git a/lib/helpers/widgets/my.dart b/lib/helpers/widgets/my.dart index a1dd282..c62500f 100644 --- a/lib/helpers/widgets/my.dart +++ b/lib/helpers/widgets/my.dart @@ -1,7 +1,7 @@ -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_constant.dart'; -import 'package:marco/helpers/widgets/my_screen_media.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_constant.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; import 'package:flutter/material.dart'; class My { diff --git a/lib/helpers/widgets/my_base_exception.dart b/lib/helpers/widgets/my_base_exception.dart index de1118d..944ec23 100644 --- a/lib/helpers/widgets/my_base_exception.dart +++ b/lib/helpers/widgets/my_base_exception.dart @@ -1,6 +1,6 @@ import 'dart:developer'; -import 'package:marco/helpers/widgets/my_exception.dart'; +import 'package:on_field_work/helpers/widgets/my_exception.dart'; class BaseException extends MyException { StackTrace? stackTrace; diff --git a/lib/helpers/widgets/my_bottom_navigation_bar.dart b/lib/helpers/widgets/my_bottom_navigation_bar.dart index 332a7a0..2b9b7ec 100644 --- a/lib/helpers/widgets/my_bottom_navigation_bar.dart +++ b/lib/helpers/widgets/my_bottom_navigation_bar.dart @@ -1,10 +1,10 @@ // ignore_for_file: unrelated_type_equality_checks -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_bottom_navigation_bar_item.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_bottom_navigation_bar_item.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; import 'package:flutter/material.dart'; enum MyBottomNavigationBarType { diff --git a/lib/helpers/widgets/my_breadcrumb.dart b/lib/helpers/widgets/my_breadcrumb.dart index 06b8e2a..46ad674 100644 --- a/lib/helpers/widgets/my_breadcrumb.dart +++ b/lib/helpers/widgets/my_breadcrumb.dart @@ -1,11 +1,11 @@ import 'package:flutter_lucide/flutter_lucide.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_breadcrumb_item.dart'; -import 'package:marco/helpers/widgets/my_constant.dart'; -import 'package:marco/helpers/widgets/my_responsive.dart'; -import 'package:marco/helpers/widgets/my_router.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_breadcrumb_item.dart'; +import 'package:on_field_work/helpers/widgets/my_constant.dart'; +import 'package:on_field_work/helpers/widgets/my_responsive.dart'; +import 'package:on_field_work/helpers/widgets/my_router.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; import 'package:flutter/material.dart'; class MyBreadcrumb extends StatelessWidget { diff --git a/lib/helpers/widgets/my_button.dart b/lib/helpers/widgets/my_button.dart index 42e3ebf..7750c97 100644 --- a/lib/helpers/widgets/my_button.dart +++ b/lib/helpers/widgets/my_button.dart @@ -1,4 +1,4 @@ -import 'package:marco/helpers/widgets/my_constant.dart'; +import 'package:on_field_work/helpers/widgets/my_constant.dart'; import 'package:flutter/material.dart'; enum MyButtonType { elevated, outlined, text } diff --git a/lib/helpers/widgets/my_card.dart b/lib/helpers/widgets/my_card.dart index e5afe95..b37f7a8 100644 --- a/lib/helpers/widgets/my_card.dart +++ b/lib/helpers/widgets/my_card.dart @@ -1,7 +1,7 @@ -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; -import 'package:marco/helpers/widgets/my_constant.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/helpers/widgets/my_constant.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; import 'package:flutter/material.dart'; class MyCard extends StatelessWidget { diff --git a/lib/helpers/widgets/my_confirmation_dialog.dart b/lib/helpers/widgets/my_confirmation_dialog.dart index f70b5e7..338a2fd 100644 --- a/lib/helpers/widgets/my_confirmation_dialog.dart +++ b/lib/helpers/widgets/my_confirmation_dialog.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class ConfirmDialog extends StatelessWidget { final String title; diff --git a/lib/helpers/widgets/my_constant.dart b/lib/helpers/widgets/my_constant.dart index d43f4e6..df808b5 100644 --- a/lib/helpers/widgets/my_constant.dart +++ b/lib/helpers/widgets/my_constant.dart @@ -1,4 +1,4 @@ -import 'package:marco/helpers/widgets/my_breadcrumb_item.dart'; +import 'package:on_field_work/helpers/widgets/my_breadcrumb_item.dart'; class MyConstantData { final double containerRadius; diff --git a/lib/helpers/widgets/my_container.dart b/lib/helpers/widgets/my_container.dart index 8241aab..e934e72 100644 --- a/lib/helpers/widgets/my_container.dart +++ b/lib/helpers/widgets/my_container.dart @@ -1,6 +1,6 @@ -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_constant.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_constant.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; import 'package:flutter/material.dart'; class MyContainer extends StatelessWidget { diff --git a/lib/helpers/widgets/my_custom_skeleton.dart b/lib/helpers/widgets/my_custom_skeleton.dart index 5bb5309..8b2db2e 100644 --- a/lib/helpers/widgets/my_custom_skeleton.dart +++ b/lib/helpers/widgets/my_custom_skeleton.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; class SkeletonLoaders { static Widget buildLoadingSkeleton() { diff --git a/lib/helpers/widgets/my_flex.dart b/lib/helpers/widgets/my_flex.dart index 157ef6d..abc8b64 100644 --- a/lib/helpers/widgets/my_flex.dart +++ b/lib/helpers/widgets/my_flex.dart @@ -1,10 +1,10 @@ -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_flex_item.dart'; -import 'package:marco/helpers/widgets/my_list_extension.dart'; -import 'package:marco/helpers/widgets/my_responsive.dart'; -import 'package:marco/helpers/widgets/my_screen_media.dart'; -import 'package:marco/helpers/widgets/my_screen_media_type.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_flex_item.dart'; +import 'package:on_field_work/helpers/widgets/my_list_extension.dart'; +import 'package:on_field_work/helpers/widgets/my_responsive.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media_type.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; import 'package:flutter/material.dart'; class MyFlex extends StatelessWidget { diff --git a/lib/helpers/widgets/my_flex_item.dart b/lib/helpers/widgets/my_flex_item.dart index 2d4ab46..7801c85 100644 --- a/lib/helpers/widgets/my_flex_item.dart +++ b/lib/helpers/widgets/my_flex_item.dart @@ -1,6 +1,6 @@ -import 'package:marco/helpers/widgets/my_display_type.dart'; -import 'package:marco/helpers/widgets/my_screen_media.dart'; -import 'package:marco/helpers/widgets/my_screen_media_type.dart'; +import 'package:on_field_work/helpers/widgets/my_display_type.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media_type.dart'; import 'package:flutter/material.dart'; class MyFlexItem extends StatelessWidget { diff --git a/lib/helpers/widgets/my_form_validator.dart b/lib/helpers/widgets/my_form_validator.dart index ed1f630..e5c48bf 100644 --- a/lib/helpers/widgets/my_form_validator.dart +++ b/lib/helpers/widgets/my_form_validator.dart @@ -1,4 +1,4 @@ -import 'package:marco/helpers/widgets/my_field_validator.dart'; +import 'package:on_field_work/helpers/widgets/my_field_validator.dart'; import 'package:flutter/material.dart'; import 'package:get/get_utils/get_utils.dart'; diff --git a/lib/helpers/widgets/my_image_compressor.dart b/lib/helpers/widgets/my_image_compressor.dart index ce8bb2b..d1d2d61 100644 --- a/lib/helpers/widgets/my_image_compressor.dart +++ b/lib/helpers/widgets/my_image_compressor.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as path; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; diff --git a/lib/helpers/widgets/my_loading_component.dart b/lib/helpers/widgets/my_loading_component.dart index b716abb..1d02fda 100644 --- a/lib/helpers/widgets/my_loading_component.dart +++ b/lib/helpers/widgets/my_loading_component.dart @@ -1,10 +1,10 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:loading_animation_widget/loading_animation_widget.dart'; -import 'package:marco/images.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; class LoadingComponent extends StatelessWidget { final bool isLoading; final Widget child; diff --git a/lib/helpers/widgets/my_on_boarding.dart b/lib/helpers/widgets/my_on_boarding.dart index c274324..95a06a4 100644 --- a/lib/helpers/widgets/my_on_boarding.dart +++ b/lib/helpers/widgets/my_on_boarding.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:marco/helpers/widgets/my_page_dragger.dart'; -import 'package:marco/helpers/widgets/my_page_indicator.dart'; -import 'package:marco/helpers/widgets/my_page_reveal.dart'; -import 'package:marco/helpers/widgets/my_pages.dart'; +import 'package:on_field_work/helpers/widgets/my_page_dragger.dart'; +import 'package:on_field_work/helpers/widgets/my_page_indicator.dart'; +import 'package:on_field_work/helpers/widgets/my_page_reveal.dart'; +import 'package:on_field_work/helpers/widgets/my_pages.dart'; import 'package:flutter/material.dart'; class MyOnBoarding extends StatefulWidget { diff --git a/lib/helpers/widgets/my_page_dragger.dart b/lib/helpers/widgets/my_page_dragger.dart index 2969e83..83f4807 100644 --- a/lib/helpers/widgets/my_page_dragger.dart +++ b/lib/helpers/widgets/my_page_dragger.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'dart:ui'; -import 'package:marco/helpers/widgets/my_page_indicator.dart'; +import 'package:on_field_work/helpers/widgets/my_page_indicator.dart'; import 'package:flutter/material.dart'; class MyPageDragger extends StatefulWidget { diff --git a/lib/helpers/widgets/my_page_indicator.dart b/lib/helpers/widgets/my_page_indicator.dart index 0d7d803..0019513 100644 --- a/lib/helpers/widgets/my_page_indicator.dart +++ b/lib/helpers/widgets/my_page_indicator.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:marco/helpers/widgets/my_pages.dart'; +import 'package:on_field_work/helpers/widgets/my_pages.dart'; import 'package:flutter/material.dart'; class MyPagerIndicator extends StatelessWidget { diff --git a/lib/helpers/widgets/my_responsive.dart b/lib/helpers/widgets/my_responsive.dart index e9b869b..9aba068 100644 --- a/lib/helpers/widgets/my_responsive.dart +++ b/lib/helpers/widgets/my_responsive.dart @@ -1,5 +1,5 @@ -import 'package:marco/helpers/widgets/my_screen_media.dart'; -import 'package:marco/helpers/widgets/my_screen_media_type.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media_type.dart'; import 'package:flutter/material.dart'; class MyResponsive extends StatelessWidget { diff --git a/lib/helpers/widgets/my_route.dart b/lib/helpers/widgets/my_route.dart index 6a7fef3..4c9b835 100644 --- a/lib/helpers/widgets/my_route.dart +++ b/lib/helpers/widgets/my_route.dart @@ -1,4 +1,4 @@ -import 'package:marco/helpers/widgets/my_middleware.dart'; +import 'package:on_field_work/helpers/widgets/my_middleware.dart'; import 'package:flutter/material.dart'; class MyRoute { diff --git a/lib/helpers/widgets/my_route_exception.dart b/lib/helpers/widgets/my_route_exception.dart index 8ec9b10..fe917df 100644 --- a/lib/helpers/widgets/my_route_exception.dart +++ b/lib/helpers/widgets/my_route_exception.dart @@ -1,4 +1,4 @@ -import 'package:marco/helpers/widgets/my_base_exception.dart'; +import 'package:on_field_work/helpers/widgets/my_base_exception.dart'; class RouteException extends BaseException { final String message; diff --git a/lib/helpers/widgets/my_router.dart b/lib/helpers/widgets/my_router.dart index 8d46ccb..91fb4f7 100644 --- a/lib/helpers/widgets/my_router.dart +++ b/lib/helpers/widgets/my_router.dart @@ -1,7 +1,7 @@ -import 'package:marco/helpers/widgets/my_middleware.dart'; -import 'package:marco/helpers/widgets/my_route.dart'; -import 'package:marco/helpers/widgets/my_route_exception.dart'; -import 'package:marco/helpers/widgets/my_routes.dart'; +import 'package:on_field_work/helpers/widgets/my_middleware.dart'; +import 'package:on_field_work/helpers/widgets/my_route.dart'; +import 'package:on_field_work/helpers/widgets/my_route_exception.dart'; +import 'package:on_field_work/helpers/widgets/my_routes.dart'; import 'package:flutter/material.dart'; diff --git a/lib/helpers/widgets/my_routes.dart b/lib/helpers/widgets/my_routes.dart index 4d2ec41..654e952 100644 --- a/lib/helpers/widgets/my_routes.dart +++ b/lib/helpers/widgets/my_routes.dart @@ -3,7 +3,7 @@ -import 'package:marco/helpers/widgets/my_route.dart'; +import 'package:on_field_work/helpers/widgets/my_route.dart'; class MyRoutes { static List _routes = []; diff --git a/lib/helpers/widgets/my_screen_media.dart b/lib/helpers/widgets/my_screen_media.dart index a350a75..96e882d 100644 --- a/lib/helpers/widgets/my_screen_media.dart +++ b/lib/helpers/widgets/my_screen_media.dart @@ -1,7 +1,7 @@ -import 'package:marco/helpers/widgets/my_display_type.dart'; -import 'package:marco/helpers/widgets/my_screen_media_type.dart'; +import 'package:on_field_work/helpers/widgets/my_display_type.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media_type.dart'; class MyScreenMedia { static int flexColumns = 12; diff --git a/lib/helpers/widgets/my_team_model_sheet.dart b/lib/helpers/widgets/my_team_model_sheet.dart index f879073..968a558 100644 --- a/lib/helpers/widgets/my_team_model_sheet.dart +++ b/lib/helpers/widgets/my_team_model_sheet.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class TeamBottomSheet { static void show({ diff --git a/lib/helpers/widgets/my_text.dart b/lib/helpers/widgets/my_text.dart index fb9960b..47bb06f 100644 --- a/lib/helpers/widgets/my_text.dart +++ b/lib/helpers/widgets/my_text.dart @@ -1,7 +1,7 @@ // ignore_for_file: annotate_overrides, overridden_fields import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; class MyText extends StatelessWidget { final Key? key; diff --git a/lib/helpers/widgets/my_text_style.dart b/lib/helpers/widgets/my_text_style.dart index 19fdb6f..cec0c05 100644 --- a/lib/helpers/widgets/my_text_style.dart +++ b/lib/helpers/widgets/my_text_style.dart @@ -1,6 +1,6 @@ // ignore_for_file: prefer_generic_function_type_aliases -import 'package:marco/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/helpers/widgets/my_validators.dart b/lib/helpers/widgets/my_validators.dart index 0e3df03..936d185 100644 --- a/lib/helpers/widgets/my_validators.dart +++ b/lib/helpers/widgets/my_validators.dart @@ -1,5 +1,5 @@ -import 'package:marco/helpers/utils/my_string_utils.dart'; -import 'package:marco/helpers/widgets/my_field_validator.dart'; +import 'package:on_field_work/helpers/utils/my_string_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_field_validator.dart'; class MyEmailValidator extends MyFieldValidatorRule { @override diff --git a/lib/helpers/widgets/responsive.dart b/lib/helpers/widgets/responsive.dart index 2c0c5ed..7570871 100644 --- a/lib/helpers/widgets/responsive.dart +++ b/lib/helpers/widgets/responsive.dart @@ -1,4 +1,4 @@ -import 'package:marco/helpers/widgets/my_screen_media.dart'; +import 'package:on_field_work/helpers/widgets/my_screen_media.dart'; export 'my_display_type.dart'; export 'my_screen_media.dart'; diff --git a/lib/helpers/widgets/team_members_bottom_sheet.dart b/lib/helpers/widgets/team_members_bottom_sheet.dart index 949f870..7d44099 100644 --- a/lib/helpers/widgets/team_members_bottom_sheet.dart +++ b/lib/helpers/widgets/team_members_bottom_sheet.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/model/directory/contact_bucket_list_model.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/model/directory/contact_bucket_list_model.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class TeamMembersBottomSheet { static void show( diff --git a/lib/helpers/widgets/tenant/all_organization_selector.dart b/lib/helpers/widgets/tenant/all_organization_selector.dart index 8a1fc67..10efce3 100644 --- a/lib/helpers/widgets/tenant/all_organization_selector.dart +++ b/lib/helpers/widgets/tenant/all_organization_selector.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/tenant/all_organization_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/all_organization_model.dart'; +import 'package:on_field_work/controller/tenant/all_organization_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/all_organization_model.dart'; class AllOrganizationListView extends StatelessWidget { final AllOrganizationController controller; diff --git a/lib/helpers/widgets/tenant/organization_selector.dart b/lib/helpers/widgets/tenant/organization_selector.dart index e902b24..0ca2476 100644 --- a/lib/helpers/widgets/tenant/organization_selector.dart +++ b/lib/helpers/widgets/tenant/organization_selector.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/tenant/organization_selection_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/attendance/organization_per_project_list_model.dart'; +import 'package:on_field_work/controller/tenant/organization_selection_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart'; class OrganizationSelector extends StatelessWidget { final OrganizationController controller; diff --git a/lib/helpers/widgets/tenant/service_selector.dart b/lib/helpers/widgets/tenant/service_selector.dart index d9c65a9..a0b876e 100644 --- a/lib/helpers/widgets/tenant/service_selector.dart +++ b/lib/helpers/widgets/tenant/service_selector.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/tenant/tenant_services_model.dart'; -import 'package:marco/controller/tenant/service_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/tenant/tenant_services_model.dart'; +import 'package:on_field_work/controller/tenant/service_controller.dart'; class ServiceSelector extends StatelessWidget { final ServiceController controller; diff --git a/lib/helpers/widgets/time_stamp_image_helper.dart b/lib/helpers/widgets/time_stamp_image_helper.dart index 954a205..74ffb48 100644 --- a/lib/helpers/widgets/time_stamp_image_helper.dart +++ b/lib/helpers/widgets/time_stamp_image_helper.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'dart:ui' as ui; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; class TimestampImageHelper { /// Adds a timestamp to an image file and returns a new File diff --git a/lib/main.dart b/lib/main.dart index 77307e9..9ca62c0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:marco/helpers/services/app_initializer.dart'; -import 'package:marco/view/my_app.dart'; -import 'package:marco/helpers/theme/app_notifier.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/view/layouts/offline_screen.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/app_initializer.dart'; +import 'package:on_field_work/view/my_app.dart'; +import 'package:on_field_work/helpers/theme/app_notifier.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/view/layouts/offline_screen.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/model/attendance/attendence_action_button.dart b/lib/model/attendance/attendence_action_button.dart index 9b1d35c..fefc312 100644 --- a/lib/model/attendance/attendence_action_button.dart +++ b/lib/model/attendance/attendence_action_button.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/helpers/utils/attendance_actions.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/attendance_actions.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class AttendanceActionButton extends StatefulWidget { final dynamic employee; diff --git a/lib/model/attendance/attendence_filter_sheet.dart b/lib/model/attendance/attendence_filter_sheet.dart index abeaaa7..38e1fc8 100644 --- a/lib/model/attendance/attendence_filter_sheet.dart +++ b/lib/model/attendance/attendence_filter_sheet.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; class AttendanceFilterBottomSheet extends StatefulWidget { final AttendanceController controller; diff --git a/lib/model/attendance/log_details_view.dart b/lib/model/attendance/log_details_view.dart index 598703f..1172445 100644 --- a/lib/model/attendance/log_details_view.dart +++ b/lib/model/attendance/log_details_view.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:cached_network_image/cached_network_image.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; class AttendanceLogViewButton extends StatefulWidget { final dynamic employee; diff --git a/lib/model/attendance/regualrize_action_button.dart b/lib/model/attendance/regualrize_action_button.dart index 450d4f8..8f8ce77 100644 --- a/lib/model/attendance/regualrize_action_button.dart +++ b/lib/model/attendance/regualrize_action_button.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/utils/attendance_actions.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/project_controller.dart'; +import 'package:on_field_work/helpers/utils/attendance_actions.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/project_controller.dart'; import 'package:get/get.dart'; enum ButtonActions { approve, reject } diff --git a/lib/model/dailyTaskPlanning/assign_task_bottom_sheet .dart b/lib/model/dailyTaskPlanning/assign_task_bottom_sheet .dart index 4db2228..99dae49 100644 --- a/lib/model/dailyTaskPlanning/assign_task_bottom_sheet .dart +++ b/lib/model/dailyTaskPlanning/assign_task_bottom_sheet .dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/tenant/organization_selection_controller.dart'; -import 'package:marco/controller/tenant/service_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/tenant/organization_selector.dart'; -import 'package:marco/helpers/widgets/tenant/service_selector.dart'; -import 'package:marco/model/attendance/organization_per_project_list_model.dart'; -import 'package:marco/model/tenant/tenant_services_model.dart'; +import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/tenant/organization_selection_controller.dart'; +import 'package:on_field_work/controller/tenant/service_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/tenant/organization_selector.dart'; +import 'package:on_field_work/helpers/widgets/tenant/service_selector.dart'; +import 'package:on_field_work/model/attendance/organization_per_project_list_model.dart'; +import 'package:on_field_work/model/tenant/tenant_services_model.dart'; class AssignTaskBottomSheet extends StatefulWidget { final String workLocation; diff --git a/lib/model/dailyTaskPlanning/comment_task_bottom_sheet.dart b/lib/model/dailyTaskPlanning/comment_task_bottom_sheet.dart index 24d37d6..df2cde1 100644 --- a/lib/model/dailyTaskPlanning/comment_task_bottom_sheet.dart +++ b/lib/model/dailyTaskPlanning/comment_task_bottom_sheet.dart @@ -4,17 +4,17 @@ import 'package:intl/intl.dart'; import 'dart:io'; import 'dart:math' as math; // --- Assumed Imports (ensure these paths are correct in your project) --- -import 'package:marco/controller/task_planning/report_task_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_team_model_sheet.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/model/dailyTaskPlanning/create_task_botom_sheet.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/task_planning/report_task_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_team_model_sheet.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/create_task_botom_sheet.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; // --- Form Field Keys (Unchanged) --- class _FormFieldKeys { diff --git a/lib/model/dailyTaskPlanning/create_task_botom_sheet.dart b/lib/model/dailyTaskPlanning/create_task_botom_sheet.dart index 1d5fe62..b187c28 100644 --- a/lib/model/dailyTaskPlanning/create_task_botom_sheet.dart +++ b/lib/model/dailyTaskPlanning/create_task_botom_sheet.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/task_planning/add_task_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/task_planning/add_task_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; void showCreateTaskBottomSheet({ required String workArea, diff --git a/lib/model/dailyTaskPlanning/daily_progress_report_filter.dart b/lib/model/dailyTaskPlanning/daily_progress_report_filter.dart index a289858..f968da8 100644 --- a/lib/model/dailyTaskPlanning/daily_progress_report_filter.dart +++ b/lib/model/dailyTaskPlanning/daily_progress_report_filter.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/task_planning/daily_task_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/controller/task_planning/daily_task_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; class DailyTaskFilterBottomSheet extends StatelessWidget { final DailyTaskController controller; diff --git a/lib/model/dailyTaskPlanning/daily_task_planning_filter.dart b/lib/model/dailyTaskPlanning/daily_task_planning_filter.dart index aa9a521..6018c24 100644 --- a/lib/model/dailyTaskPlanning/daily_task_planning_filter.dart +++ b/lib/model/dailyTaskPlanning/daily_task_planning_filter.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class DailyTaskPlanningFilter extends StatelessWidget { final DailyTaskPlanningController controller; diff --git a/lib/model/dailyTaskPlanning/report_action_bottom_sheet.dart b/lib/model/dailyTaskPlanning/report_action_bottom_sheet.dart index 0a75eb2..e080e63 100644 --- a/lib/model/dailyTaskPlanning/report_action_bottom_sheet.dart +++ b/lib/model/dailyTaskPlanning/report_action_bottom_sheet.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/task_planning/report_task_action_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_team_model_sheet.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/model/dailyTaskPlanning/create_task_botom_sheet.dart'; -import 'package:marco/model/dailyTaskPlanning/report_action_widgets.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/task_planning/report_task_action_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_team_model_sheet.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/create_task_botom_sheet.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/report_action_widgets.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class ReportActionBottomSheet extends StatefulWidget { final Map taskData; diff --git a/lib/model/dailyTaskPlanning/report_action_widgets.dart b/lib/model/dailyTaskPlanning/report_action_widgets.dart index 8d5cc2f..783c225 100644 --- a/lib/model/dailyTaskPlanning/report_action_widgets.dart +++ b/lib/model/dailyTaskPlanning/report_action_widgets.dart @@ -1,10 +1,10 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; import 'package:get/get.dart'; /// Show labeled row with optional icon diff --git a/lib/model/dailyTaskPlanning/report_task_bottom_sheet.dart b/lib/model/dailyTaskPlanning/report_task_bottom_sheet.dart index 62841e6..5f5d814 100644 --- a/lib/model/dailyTaskPlanning/report_task_bottom_sheet.dart +++ b/lib/model/dailyTaskPlanning/report_task_bottom_sheet.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/task_planning/report_task_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/task_planning/report_task_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class ReportTaskBottomSheet extends StatefulWidget { final Map taskData; diff --git a/lib/model/dailyTaskPlanning/task_action_buttons.dart b/lib/model/dailyTaskPlanning/task_action_buttons.dart index e15d627..f6f4af0 100644 --- a/lib/model/dailyTaskPlanning/task_action_buttons.dart +++ b/lib/model/dailyTaskPlanning/task_action_buttons.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:marco/model/dailyTaskPlanning/comment_task_bottom_sheet.dart'; -import 'package:marco/model/dailyTaskPlanning/report_task_bottom_sheet.dart'; -import 'package:marco/model/dailyTaskPlanning/report_action_bottom_sheet.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/comment_task_bottom_sheet.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/report_task_bottom_sheet.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/report_action_bottom_sheet.dart'; class TaskActionButtons { static Widget reportButton({ diff --git a/lib/model/dailyTaskPlanning/task_list_model.dart b/lib/model/dailyTaskPlanning/task_list_model.dart index 98e32ee..5804974 100644 --- a/lib/model/dailyTaskPlanning/task_list_model.dart +++ b/lib/model/dailyTaskPlanning/task_list_model.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:marco/helpers/services/json_decoder.dart'; -import 'package:marco/model/identifier_model.dart'; +import 'package:on_field_work/helpers/services/json_decoder.dart'; +import 'package:on_field_work/model/identifier_model.dart'; import 'package:flutter/services.dart'; class TaskListModel extends IdentifierModel { diff --git a/lib/model/directory/add_comment_bottom_sheet.dart b/lib/model/directory/add_comment_bottom_sheet.dart index 25b5540..ac736da 100644 --- a/lib/model/directory/add_comment_bottom_sheet.dart +++ b/lib/model/directory/add_comment_bottom_sheet.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/directory/add_comment_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/directory/add_comment_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class AddCommentBottomSheet extends StatefulWidget { final String contactId; diff --git a/lib/model/directory/add_contact_bottom_sheet.dart b/lib/model/directory/add_contact_bottom_sheet.dart index f0f456d..05ededf 100644 --- a/lib/model/directory/add_contact_bottom_sheet.dart +++ b/lib/model/directory/add_contact_bottom_sheet.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:collection/collection.dart'; -import 'package:marco/controller/directory/add_contact_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/model/directory/contact_model.dart'; -import 'package:marco/helpers/utils/contact_picker_helper.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/directory/add_contact_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/model/directory/contact_model.dart'; +import 'package:on_field_work/helpers/utils/contact_picker_helper.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class AddContactBottomSheet extends StatefulWidget { final ContactModel? existingContact; diff --git a/lib/model/directory/create_bucket_bottom_sheet.dart b/lib/model/directory/create_bucket_bottom_sheet.dart index 212035d..64c3750 100644 --- a/lib/model/directory/create_bucket_bottom_sheet.dart +++ b/lib/model/directory/create_bucket_bottom_sheet.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/directory/create_bucket_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/controller/directory/create_bucket_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; class CreateBucketBottomSheet extends StatefulWidget { const CreateBucketBottomSheet({super.key}); diff --git a/lib/model/directory/directory_filter_bottom_sheet.dart b/lib/model/directory/directory_filter_bottom_sheet.dart index 4443f61..e851591 100644 --- a/lib/model/directory/directory_filter_bottom_sheet.dart +++ b/lib/model/directory/directory_filter_bottom_sheet.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class DirectoryFilterBottomSheet extends StatefulWidget { const DirectoryFilterBottomSheet({super.key}); diff --git a/lib/model/directory/edit_bucket_bottom_sheet.dart b/lib/model/directory/edit_bucket_bottom_sheet.dart index 7347b63..f4dedfb 100644 --- a/lib/model/directory/edit_bucket_bottom_sheet.dart +++ b/lib/model/directory/edit_bucket_bottom_sheet.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:collection/collection.dart'; -import 'package:marco/controller/directory/manage_bucket_controller.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/directory/contact_bucket_list_model.dart'; +import 'package:on_field_work/controller/directory/manage_bucket_controller.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/directory/contact_bucket_list_model.dart'; class EditBucketBottomSheet { static void show( diff --git a/lib/model/document/document_edit_bottom_sheet.dart b/lib/model/document/document_edit_bottom_sheet.dart index fa375dd..27fc11e 100644 --- a/lib/model/document/document_edit_bottom_sheet.dart +++ b/lib/model/document/document_edit_bottom_sheet.dart @@ -3,14 +3,14 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/document/document_upload_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/model/document/master_document_type_model.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/controller/document/document_upload_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/model/document/master_document_type_model.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; import 'package:url_launcher/url_launcher.dart'; class DocumentEditBottomSheet extends StatefulWidget { diff --git a/lib/model/document/document_upload_bottom_sheet.dart b/lib/model/document/document_upload_bottom_sheet.dart index 24313b2..17c0c16 100644 --- a/lib/model/document/document_upload_bottom_sheet.dart +++ b/lib/model/document/document_upload_bottom_sheet.dart @@ -3,13 +3,13 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/document/document_upload_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/document/document_upload_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class DocumentUploadBottomSheet extends StatefulWidget { final Function(Map) onSubmit; diff --git a/lib/model/document/user_document_filter_bottom_sheet.dart b/lib/model/document/user_document_filter_bottom_sheet.dart index c50fb1c..3ce1c5b 100644 --- a/lib/model/document/user_document_filter_bottom_sheet.dart +++ b/lib/model/document/user_document_filter_bottom_sheet.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/document/user_document_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/model/document/document_filter_model.dart'; +import 'package:on_field_work/controller/document/user_document_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/model/document/document_filter_model.dart'; import 'dart:convert'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; class UserDocumentFilterBottomSheet extends StatefulWidget { final String entityId; diff --git a/lib/model/employees/add_employee_bottom_sheet.dart b/lib/model/employees/add_employee_bottom_sheet.dart index 59dba23..9eba27c 100644 --- a/lib/model/employees/add_employee_bottom_sheet.dart +++ b/lib/model/employees/add_employee_bottom_sheet.dart @@ -3,15 +3,15 @@ import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/employee/add_employee_controller.dart'; -import 'package:marco/controller/employee/employees_screen_controller.dart'; -import 'package:marco/controller/tenant/all_organization_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/controller/employee/add_employee_controller.dart'; +import 'package:on_field_work/controller/employee/employees_screen_controller.dart'; +import 'package:on_field_work/controller/tenant/all_organization_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; class AddEmployeeBottomSheet extends StatefulWidget { final Map? employeeData; diff --git a/lib/model/employees/employee_detail_bottom_sheet.dart b/lib/model/employees/employee_detail_bottom_sheet.dart index 5509992..522987a 100644 --- a/lib/model/employees/employee_detail_bottom_sheet.dart +++ b/lib/model/employees/employee_detail_bottom_sheet.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/employee/employees_screen_controller.dart'; -import 'package:marco/view/employees/assign_employee_bottom_sheet.dart'; +import 'package:on_field_work/controller/employee/employees_screen_controller.dart'; +import 'package:on_field_work/view/employees/assign_employee_bottom_sheet.dart'; class EmployeeDetailBottomSheet extends StatefulWidget { final String employeeId; diff --git a/lib/model/employees/multiple_select_bottomsheet.dart b/lib/model/employees/multiple_select_bottomsheet.dart index 336bb1a..829dc4f 100644 --- a/lib/model/employees/multiple_select_bottomsheet.dart +++ b/lib/model/employees/multiple_select_bottomsheet.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; class EmployeeSelectionBottomSheet extends StatefulWidget { final List initiallySelected; diff --git a/lib/model/expense/add_expense_bottom_sheet.dart b/lib/model/expense/add_expense_bottom_sheet.dart index 5659de7..1f6711a 100644 --- a/lib/model/expense/add_expense_bottom_sheet.dart +++ b/lib/model/expense/add_expense_bottom_sheet.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/expense/add_expense_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/model/expense/expense_type_model.dart'; -import 'package:marco/model/expense/payment_types_model.dart'; -import 'package:marco/model/expense/employee_selector_bottom_sheet.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/utils/validators.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; -import 'package:marco/helpers/widgets/expense/expense_form_widgets.dart'; +import 'package:on_field_work/controller/expense/add_expense_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/model/expense/expense_type_model.dart'; +import 'package:on_field_work/model/expense/payment_types_model.dart'; +import 'package:on_field_work/model/expense/employee_selector_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/validators.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/widgets/expense/expense_form_widgets.dart'; /// Show bottom sheet wrapper Future showAddExpenseBottomSheet({ diff --git a/lib/model/expense/comment_bottom_sheet.dart b/lib/model/expense/comment_bottom_sheet.dart index 447a629..4f579c9 100644 --- a/lib/model/expense/comment_bottom_sheet.dart +++ b/lib/model/expense/comment_bottom_sheet.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; Future showCommentBottomSheet(BuildContext context, String actionText) async { final commentController = TextEditingController(); diff --git a/lib/model/expense/employee_selector_bottom_sheet.dart b/lib/model/expense/employee_selector_bottom_sheet.dart index 7da90c6..760028f 100644 --- a/lib/model/expense/employee_selector_bottom_sheet.dart +++ b/lib/model/expense/employee_selector_bottom_sheet.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; class ReusableEmployeeSelectorBottomSheet extends StatelessWidget { final TextEditingController searchController; diff --git a/lib/model/expense/employee_selector_for_filter_bottom_sheet.dart b/lib/model/expense/employee_selector_for_filter_bottom_sheet.dart index 890d932..2e4fd13 100644 --- a/lib/model/expense/employee_selector_for_filter_bottom_sheet.dart +++ b/lib/model/expense/employee_selector_for_filter_bottom_sheet.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class EmployeeSelectorBottomSheet extends StatefulWidget { final RxList selectedEmployees; diff --git a/lib/model/expense/reimbursement_bottom_sheet.dart b/lib/model/expense/reimbursement_bottom_sheet.dart index 6ca4d81..75db7b1 100644 --- a/lib/model/expense/reimbursement_bottom_sheet.dart +++ b/lib/model/expense/reimbursement_bottom_sheet.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/expense/expense_detail_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/expense/employee_selector_bottom_sheet.dart'; +import 'package:on_field_work/controller/expense/expense_detail_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/expense/employee_selector_bottom_sheet.dart'; class ReimbursementBottomSheet extends StatefulWidget { final String expenseId; diff --git a/lib/model/finance/add_payment_request_bottom_sheet.dart b/lib/model/finance/add_payment_request_bottom_sheet.dart index 0fe6e8d..b27dde4 100644 --- a/lib/model/finance/add_payment_request_bottom_sheet.dart +++ b/lib/model/finance/add_payment_request_bottom_sheet.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/finance/add_payment_request_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/utils/validators.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/expense/expense_form_widgets.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/controller/finance/add_payment_request_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/validators.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/expense/expense_form_widgets.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; Future showPaymentRequestBottomSheet({ bool isEdit = false, diff --git a/lib/model/finance/make_expense_bottom_sheet.dart b/lib/model/finance/make_expense_bottom_sheet.dart index 54cc8fe..9ffb114 100644 --- a/lib/model/finance/make_expense_bottom_sheet.dart +++ b/lib/model/finance/make_expense_bottom_sheet.dart @@ -1,12 +1,12 @@ // create_expense_bottom_sheet.dart import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/expense/expense_form_widgets.dart'; -import 'package:marco/helpers/utils/validators.dart'; -import 'package:marco/controller/finance/payment_request_detail_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/expense/expense_form_widgets.dart'; +import 'package:on_field_work/helpers/utils/validators.dart'; +import 'package:on_field_work/controller/finance/payment_request_detail_controller.dart'; Future showCreateExpenseBottomSheet({required String statusId}) { return Get.bottomSheet( diff --git a/lib/model/finance/payment_request_filter_bottom_sheet.dart b/lib/model/finance/payment_request_filter_bottom_sheet.dart index 8d680b2..d468da1 100644 --- a/lib/model/finance/payment_request_filter_bottom_sheet.dart +++ b/lib/model/finance/payment_request_filter_bottom_sheet.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/finance/payment_request_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/expense/employee_selector_for_filter_bottom_sheet.dart'; +import 'package:on_field_work/controller/finance/payment_request_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/expense/employee_selector_for_filter_bottom_sheet.dart'; class PaymentRequestFilterBottomSheet extends StatefulWidget { final PaymentRequestController controller; diff --git a/lib/model/finance/payment_request_rembursement_bottom_sheet.dart b/lib/model/finance/payment_request_rembursement_bottom_sheet.dart index f8f6983..c89f3b5 100644 --- a/lib/model/finance/payment_request_rembursement_bottom_sheet.dart +++ b/lib/model/finance/payment_request_rembursement_bottom_sheet.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/finance/payment_request_detail_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/expense/employee_selector_bottom_sheet.dart'; +import 'package:on_field_work/controller/finance/payment_request_detail_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/expense/employee_selector_bottom_sheet.dart'; class UpdatePaymentRequestWithReimbursement extends StatefulWidget { final String expenseId; diff --git a/lib/model/identifier_model.dart b/lib/model/identifier_model.dart index 9545686..f90c7ab 100644 --- a/lib/model/identifier_model.dart +++ b/lib/model/identifier_model.dart @@ -1,5 +1,5 @@ -import 'package:marco/model/model.dart'; +import 'package:on_field_work/model/model.dart'; abstract class IdentifierModel extends Model { final int id; diff --git a/lib/model/my_paginated_table.dart b/lib/model/my_paginated_table.dart index d35ba28..c14bf72 100644 --- a/lib/model/my_paginated_table.dart +++ b/lib/model/my_paginated_table.dart @@ -1,8 +1,8 @@ import 'dart:math' as math; import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; class MyPaginatedTable extends StatefulWidget { final String? title; diff --git a/lib/model/service_project/add_service_project_job_bottom_sheet.dart b/lib/model/service_project/add_service_project_job_bottom_sheet.dart index a08e0be..3b4d133 100644 --- a/lib/model/service_project/add_service_project_job_bottom_sheet.dart +++ b/lib/model/service_project/add_service_project_job_bottom_sheet.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; -import 'package:marco/controller/service_project/add_service_project_job_controller.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/employees/multiple_select_bottomsheet.dart'; -import 'package:marco/model/service_project/service_project_branches_model.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/controller/service_project/add_service_project_job_controller.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/employees/multiple_select_bottomsheet.dart'; +import 'package:on_field_work/model/service_project/service_project_branches_model.dart'; class AddServiceProjectJobBottomSheet extends StatefulWidget { final String projectId; diff --git a/lib/model/service_project/service_project_allocation_bottomsheet.dart b/lib/model/service_project/service_project_allocation_bottomsheet.dart index 7ea4614..3a1e0bf 100644 --- a/lib/model/service_project/service_project_allocation_bottomsheet.dart +++ b/lib/model/service_project/service_project_allocation_bottomsheet.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/controller/service_project/service_project_allocation_controller.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/employees/multiple_select_bottomsheet.dart'; -import 'package:marco/model/service_project/job_allocation_model.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/controller/service_project/service_project_allocation_controller.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/employees/multiple_select_bottomsheet.dart'; +import 'package:on_field_work/model/service_project/job_allocation_model.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class RoleEmployeeAllocation { final TeamRole role; diff --git a/lib/res/assets_res.dart b/lib/res/assets_res.dart index cc0b6c3..5a5d010 100644 --- a/lib/res/assets_res.dart +++ b/lib/res/assets_res.dart @@ -6,7 +6,7 @@ class AssetsRes { AssetsRes._(); - static const String PROJECT_NAME = 'marco'; + static const String PROJECT_NAME = 'on_field_work'; static const String PROJECT_VERSION = '1.0.0+1'; static const String LOADING_LOGO = 'assets/logo/loading_logo.png'; } diff --git a/lib/routes.dart b/lib/routes.dart index bfef6ea..bbd8931 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,30 +1,30 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/services/tenant_service.dart'; -import 'package:marco/view/auth/forgot_password_screen.dart'; -import 'package:marco/view/auth/login_screen.dart'; -import 'package:marco/view/auth/register_account_screen.dart'; -import 'package:marco/view/auth/reset_password_screen.dart'; -import 'package:marco/view/error_pages/coming_soon_screen.dart'; -import 'package:marco/view/error_pages/error_404_screen.dart'; -import 'package:marco/view/error_pages/error_500_screen.dart'; -import 'package:marco/view/dashboard/dashboard_screen.dart'; -import 'package:marco/view/Attendence/attendance_screen.dart'; -import 'package:marco/view/taskPlanning/daily_task_planning.dart'; -import 'package:marco/view/taskPlanning/daily_progress_report.dart'; -import 'package:marco/view/employees/employees_screen.dart'; -import 'package:marco/view/auth/login_option_screen.dart'; -import 'package:marco/view/auth/mpin_screen.dart'; -import 'package:marco/view/auth/mpin_auth_screen.dart'; -import 'package:marco/view/directory/directory_main_screen.dart'; -import 'package:marco/view/expense/expense_screen.dart'; -import 'package:marco/view/document/user_document_screen.dart'; -import 'package:marco/view/tenant/tenant_selection_screen.dart'; -import 'package:marco/view/finance/finance_screen.dart'; -import 'package:marco/view/finance/advance_payment_screen.dart'; -import 'package:marco/view/finance/payment_request_screen.dart'; -import 'package:marco/view/service_project/service_project_screen.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/services/tenant_service.dart'; +import 'package:on_field_work/view/auth/forgot_password_screen.dart'; +import 'package:on_field_work/view/auth/login_screen.dart'; +import 'package:on_field_work/view/auth/register_account_screen.dart'; +import 'package:on_field_work/view/auth/reset_password_screen.dart'; +import 'package:on_field_work/view/error_pages/coming_soon_screen.dart'; +import 'package:on_field_work/view/error_pages/error_404_screen.dart'; +import 'package:on_field_work/view/error_pages/error_500_screen.dart'; +import 'package:on_field_work/view/dashboard/dashboard_screen.dart'; +import 'package:on_field_work/view/Attendence/attendance_screen.dart'; +import 'package:on_field_work/view/taskPlanning/daily_task_planning.dart'; +import 'package:on_field_work/view/taskPlanning/daily_progress_report.dart'; +import 'package:on_field_work/view/employees/employees_screen.dart'; +import 'package:on_field_work/view/auth/login_option_screen.dart'; +import 'package:on_field_work/view/auth/mpin_screen.dart'; +import 'package:on_field_work/view/auth/mpin_auth_screen.dart'; +import 'package:on_field_work/view/directory/directory_main_screen.dart'; +import 'package:on_field_work/view/expense/expense_screen.dart'; +import 'package:on_field_work/view/document/user_document_screen.dart'; +import 'package:on_field_work/view/tenant/tenant_selection_screen.dart'; +import 'package:on_field_work/view/finance/finance_screen.dart'; +import 'package:on_field_work/view/finance/advance_payment_screen.dart'; +import 'package:on_field_work/view/finance/payment_request_screen.dart'; +import 'package:on_field_work/view/service_project/service_project_screen.dart'; class AuthMiddleware extends GetMiddleware { @override RouteSettings? redirect(String? route) { diff --git a/lib/view/Attendence/attendance_logs_tab.dart b/lib/view/Attendence/attendance_logs_tab.dart index 9bb3bdc..2b89fc8 100644 --- a/lib/view/Attendence/attendance_logs_tab.dart +++ b/lib/view/Attendence/attendance_logs_tab.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/attendance/log_details_view.dart'; -import 'package:marco/model/attendance/attendence_action_button.dart'; -import 'package:marco/helpers/utils/attendance_actions.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/attendance/log_details_view.dart'; +import 'package:on_field_work/model/attendance/attendence_action_button.dart'; +import 'package:on_field_work/helpers/utils/attendance_actions.dart'; class AttendanceLogsTab extends StatefulWidget { final AttendanceController controller; diff --git a/lib/view/Attendence/attendance_screen.dart b/lib/view/Attendence/attendance_screen.dart index 2a5614a..b782fdb 100644 --- a/lib/view/Attendence/attendance_screen.dart +++ b/lib/view/Attendence/attendance_screen.dart @@ -1,19 +1,19 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_flex.dart'; -import 'package:marco/helpers/widgets/my_flex_item.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/model/attendance/attendence_filter_sheet.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/view/Attendence/regularization_requests_tab.dart'; -import 'package:marco/view/Attendence/attendance_logs_tab.dart'; -import 'package:marco/view/Attendence/todays_attendance_tab.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_flex.dart'; +import 'package:on_field_work/helpers/widgets/my_flex_item.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/model/attendance/attendence_filter_sheet.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/view/Attendence/regularization_requests_tab.dart'; +import 'package:on_field_work/view/Attendence/attendance_logs_tab.dart'; +import 'package:on_field_work/view/Attendence/todays_attendance_tab.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; class AttendanceScreen extends StatefulWidget { const AttendanceScreen({super.key}); diff --git a/lib/view/Attendence/attendence_log_screen.dart b/lib/view/Attendence/attendence_log_screen.dart index 05266ae..9ee894d 100644 --- a/lib/view/Attendence/attendence_log_screen.dart +++ b/lib/view/Attendence/attendence_log_screen.dart @@ -1,23 +1,23 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; -import 'package:marco/helpers/widgets/my_breadcrumb.dart'; -import 'package:marco/helpers/widgets/my_breadcrumb_item.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_flex.dart'; -import 'package:marco/helpers/widgets/my_flex_item.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/view/layouts/layout.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/helpers/widgets/my_breadcrumb.dart'; +import 'package:on_field_work/helpers/widgets/my_breadcrumb_item.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_flex.dart'; +import 'package:on_field_work/helpers/widgets/my_flex_item.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/view/layouts/layout.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; import 'package:intl/intl.dart'; -import 'package:marco/model/attendance/attendence_action_button.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/model/attendance/log_details_view.dart'; +import 'package:on_field_work/model/attendance/attendence_action_button.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/model/attendance/log_details_view.dart'; class AttendenceLogScreen extends StatefulWidget { const AttendenceLogScreen({super.key}); diff --git a/lib/view/Attendence/regularization_requests_tab.dart b/lib/view/Attendence/regularization_requests_tab.dart index 6db7739..52eea9d 100644 --- a/lib/view/Attendence/regularization_requests_tab.dart +++ b/lib/view/Attendence/regularization_requests_tab.dart @@ -2,15 +2,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/attendance/log_details_view.dart'; -import 'package:marco/model/attendance/regualrize_action_button.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/attendance/log_details_view.dart'; +import 'package:on_field_work/model/attendance/regualrize_action_button.dart'; class RegularizationRequestsTab extends StatelessWidget { final AttendanceController controller; diff --git a/lib/view/Attendence/todays_attendance_tab.dart b/lib/view/Attendence/todays_attendance_tab.dart index 3ac6d35..ff5d525 100644 --- a/lib/view/Attendence/todays_attendance_tab.dart +++ b/lib/view/Attendence/todays_attendance_tab.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/attendance/attendance_screen_controller.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/attendance/log_details_view.dart'; -import 'package:marco/model/attendance/attendence_action_button.dart'; +import 'package:on_field_work/controller/attendance/attendance_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/attendance/log_details_view.dart'; +import 'package:on_field_work/model/attendance/attendence_action_button.dart'; class TodaysAttendanceTab extends StatelessWidget { final AttendanceController controller; diff --git a/lib/view/auth/email_login_form.dart b/lib/view/auth/email_login_form.dart index e716c02..b4e36bb 100644 --- a/lib/view/auth/email_login_form.dart +++ b/lib/view/auth/email_login_form.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/login_controller.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/controller/auth/login_controller.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; class EmailLoginForm extends StatefulWidget { EmailLoginForm({super.key}); diff --git a/lib/view/auth/forgot_password_screen.dart b/lib/view/auth/forgot_password_screen.dart index d9e8150..9b85f4a 100644 --- a/lib/view/auth/forgot_password_screen.dart +++ b/lib/view/auth/forgot_password_screen.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/forgot_password_controller.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; -import 'package:marco/helpers/widgets/wave_background.dart'; +import 'package:on_field_work/controller/auth/forgot_password_controller.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/helpers/widgets/wave_background.dart'; class ForgotPasswordScreen extends StatefulWidget { const ForgotPasswordScreen({super.key}); @@ -124,7 +124,7 @@ class _ForgotPasswordScreenState extends State return Column( children: [ MyText( - "Welcome to Marco", + "Welcome to On Field Work", fontSize: 24, fontWeight: 600, color: Colors.black87, diff --git a/lib/view/auth/login_option_screen.dart b/lib/view/auth/login_option_screen.dart index 2f08def..c514a92 100644 --- a/lib/view/auth/login_option_screen.dart +++ b/lib/view/auth/login_option_screen.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; -import 'package:marco/view/auth/email_login_form.dart'; -import 'package:marco/view/auth/otp_login_form.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/view/auth/request_demo_bottom_sheet.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/wave_background.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/view/auth/email_login_form.dart'; +import 'package:on_field_work/view/auth/otp_login_form.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/view/auth/request_demo_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/wave_background.dart'; enum LoginOption { email, otp } @@ -182,7 +182,7 @@ class _WelcomeScreenState extends State return Column( children: [ MyText( - "Welcome to Marco", + "Welcome to On Field Work", fontSize: 26, fontWeight: 800, color: Colors.black87, diff --git a/lib/view/auth/login_screen.dart b/lib/view/auth/login_screen.dart index 56d0733..9748825 100644 --- a/lib/view/auth/login_screen.dart +++ b/lib/view/auth/login_screen.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/login_controller.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/view/layouts/auth_layout.dart'; -import 'package:marco/images.dart'; -import 'package:marco/view/auth/request_demo_bottom_sheet.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/controller/auth/login_controller.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/view/layouts/auth_layout.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/view/auth/request_demo_bottom_sheet.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; class LoginScreen extends StatefulWidget { const LoginScreen({super.key}); diff --git a/lib/view/auth/mpin_auth_screen.dart b/lib/view/auth/mpin_auth_screen.dart index fdef51d..ace339c 100644 --- a/lib/view/auth/mpin_auth_screen.dart +++ b/lib/view/auth/mpin_auth_screen.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/mpin_controller.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/wave_background.dart'; +import 'package:on_field_work/controller/auth/mpin_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/wave_background.dart'; class MPINAuthScreen extends StatefulWidget { @@ -92,7 +92,7 @@ class _MPINAuthScreenState extends State children: [ const SizedBox(height: 12), MyText( - "Welcome to Marco", + "Welcome to On Field Work", fontSize: 24, fontWeight: 800, color: Colors.black87, diff --git a/lib/view/auth/mpin_screen.dart b/lib/view/auth/mpin_screen.dart index b453b29..772d195 100644 --- a/lib/view/auth/mpin_screen.dart +++ b/lib/view/auth/mpin_screen.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/mpin_controller.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/controller/auth/mpin_controller.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; class MPINScreen extends StatelessWidget { const MPINScreen({super.key}); diff --git a/lib/view/auth/otp_login_form.dart b/lib/view/auth/otp_login_form.dart index e8b75b0..ecd8b32 100644 --- a/lib/view/auth/otp_login_form.dart +++ b/lib/view/auth/otp_login_form.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/controller/auth/otp_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/controller/auth/otp_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class OTPLoginScreen extends StatefulWidget { const OTPLoginScreen({super.key}); diff --git a/lib/view/auth/register_account_screen.dart b/lib/view/auth/register_account_screen.dart index 1262d83..01f9ae8 100644 --- a/lib/view/auth/register_account_screen.dart +++ b/lib/view/auth/register_account_screen.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/register_account_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/view/layouts/auth_layout.dart'; +import 'package:on_field_work/controller/auth/register_account_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/view/layouts/auth_layout.dart'; class RegisterAccountScreen extends StatefulWidget { const RegisterAccountScreen({super.key}); diff --git a/lib/view/auth/request_demo_bottom_sheet.dart b/lib/view/auth/request_demo_bottom_sheet.dart index d7f839d..2673d8e 100644 --- a/lib/view/auth/request_demo_bottom_sheet.dart +++ b/lib/view/auth/request_demo_bottom_sheet.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_form_validator.dart'; -import 'package:marco/helpers/services/auth_service.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_form_validator.dart'; +import 'package:on_field_work/helpers/services/auth_service.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; class OrganizationFormBottomSheet { static void show(BuildContext context) { diff --git a/lib/view/auth/reset_password_screen.dart b/lib/view/auth/reset_password_screen.dart index 53b22be..e1cf2dc 100644 --- a/lib/view/auth/reset_password_screen.dart +++ b/lib/view/auth/reset_password_screen.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/auth/reset_password_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/view/layouts/auth_layout.dart'; +import 'package:on_field_work/controller/auth/reset_password_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/view/layouts/auth_layout.dart'; class ResetPasswordScreen extends StatefulWidget { const ResetPasswordScreen({super.key}); diff --git a/lib/view/dashboard/dashboard_screen.dart b/lib/view/dashboard/dashboard_screen.dart index 9cbe20d..59c8e95 100644 --- a/lib/view/dashboard/dashboard_screen.dart +++ b/lib/view/dashboard/dashboard_screen.dart @@ -1,22 +1,22 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/dynamicMenu/dynamic_menu_controller.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/dashbaord/attendance_overview_chart.dart'; -import 'package:marco/helpers/widgets/dashbaord/project_progress_chart.dart'; -import 'package:marco/helpers/widgets/dashbaord/expense_breakdown_chart.dart'; -import 'package:marco/helpers/widgets/dashbaord/expense_by_status_widget.dart'; -import 'package:marco/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart'; -import 'package:marco/helpers/widgets/dashbaord/dashboard_overview_widgets.dart'; -import 'package:marco/view/layouts/layout.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/dynamicMenu/dynamic_menu_controller.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/attendance_overview_chart.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/project_progress_chart.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/expense_breakdown_chart.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/expense_by_status_widget.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/dashboard_overview_widgets.dart'; +import 'package:on_field_work/view/layouts/layout.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; class DashboardScreen extends StatefulWidget { const DashboardScreen({super.key}); diff --git a/lib/view/directory/contact_detail_screen.dart b/lib/view/directory/contact_detail_screen.dart index badb0bf..b031fe0 100644 --- a/lib/view/directory/contact_detail_screen.dart +++ b/lib/view/directory/contact_detail_screen.dart @@ -1,18 +1,18 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/directory/contact_model.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/utils/launcher_utils.dart'; -import 'package:marco/model/directory/add_comment_bottom_sheet.dart'; -import 'package:marco/model/directory/add_contact_bottom_sheet.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/directory/contact_model.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/utils/launcher_utils.dart'; +import 'package:on_field_work/model/directory/add_comment_bottom_sheet.dart'; +import 'package:on_field_work/model/directory/add_contact_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class ContactDetailScreen extends StatefulWidget { final ContactModel contact; diff --git a/lib/view/directory/directory_main_screen.dart b/lib/view/directory/directory_main_screen.dart index c5d55a1..473efaf 100644 --- a/lib/view/directory/directory_main_screen.dart +++ b/lib/view/directory/directory_main_screen.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/controller/directory/notes_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/controller/directory/notes_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; -import 'package:marco/view/directory/directory_view.dart'; -import 'package:marco/view/directory/notes_view.dart'; +import 'package:on_field_work/view/directory/directory_view.dart'; +import 'package:on_field_work/view/directory/notes_view.dart'; class DirectoryMainScreen extends StatefulWidget { const DirectoryMainScreen({super.key}); diff --git a/lib/view/directory/directory_view.dart b/lib/view/directory/directory_view.dart index caf5433..cf91ca5 100644 --- a/lib/view/directory/directory_view.dart +++ b/lib/view/directory/directory_view.dart @@ -1,23 +1,23 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/controller/directory/create_bucket_controller.dart'; -import 'package:marco/helpers/utils/launcher_utils.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/directory/add_contact_bottom_sheet.dart'; -import 'package:marco/model/directory/directory_filter_bottom_sheet.dart'; -import 'package:marco/model/directory/create_bucket_bottom_sheet.dart'; -import 'package:marco/view/directory/contact_detail_screen.dart'; -import 'package:marco/view/directory/manage_bucket_screen.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/controller/directory/create_bucket_controller.dart'; +import 'package:on_field_work/helpers/utils/launcher_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/directory/add_contact_bottom_sheet.dart'; +import 'package:on_field_work/model/directory/directory_filter_bottom_sheet.dart'; +import 'package:on_field_work/model/directory/create_bucket_bottom_sheet.dart'; +import 'package:on_field_work/view/directory/contact_detail_screen.dart'; +import 'package:on_field_work/view/directory/manage_bucket_screen.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; class DirectoryView extends StatefulWidget { @override diff --git a/lib/view/directory/edit_bucket_model.dart b/lib/view/directory/edit_bucket_model.dart index b4a331f..71646b3 100644 --- a/lib/view/directory/edit_bucket_model.dart +++ b/lib/view/directory/edit_bucket_model.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; class EditBucketBottomSheet extends StatelessWidget { const EditBucketBottomSheet({super.key}); diff --git a/lib/view/directory/manage_bucket_screen.dart b/lib/view/directory/manage_bucket_screen.dart index d43bde7..9cca6d9 100644 --- a/lib/view/directory/manage_bucket_screen.dart +++ b/lib/view/directory/manage_bucket_screen.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/directory/directory_controller.dart'; -import 'package:marco/controller/directory/manage_bucket_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/team_members_bottom_sheet.dart'; -import 'package:marco/model/directory/edit_bucket_bottom_sheet.dart'; +import 'package:on_field_work/controller/directory/directory_controller.dart'; +import 'package:on_field_work/controller/directory/manage_bucket_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/team_members_bottom_sheet.dart'; +import 'package:on_field_work/model/directory/edit_bucket_bottom_sheet.dart'; class ManageBucketsScreen extends StatefulWidget { final PermissionController permissionController; diff --git a/lib/view/directory/notes_view.dart b/lib/view/directory/notes_view.dart index d374fdc..9378819 100644 --- a/lib/view/directory/notes_view.dart +++ b/lib/view/directory/notes_view.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/controller/directory/notes_controller.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/controller/directory/notes_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class NotesView extends StatefulWidget { const NotesView({super.key}); diff --git a/lib/view/document/document_details_page.dart b/lib/view/document/document_details_page.dart index 1c07d7b..e645cc5 100644 --- a/lib/view/document/document_details_page.dart +++ b/lib/view/document/document_details_page.dart @@ -2,17 +2,17 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/model/document/document_details_model.dart'; -import 'package:marco/controller/document/document_details_controller.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/document/document_edit_bottom_sheet.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/model/document/document_details_model.dart'; +import 'package:on_field_work/controller/document/document_details_controller.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/document/document_edit_bottom_sheet.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; class DocumentDetailsPage extends StatefulWidget { final String documentId; diff --git a/lib/view/document/user_document_screen.dart b/lib/view/document/user_document_screen.dart index ced6530..8a11f63 100644 --- a/lib/view/document/user_document_screen.dart +++ b/lib/view/document/user_document_screen.dart @@ -3,23 +3,23 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/document/document_details_controller.dart'; -import 'package:marco/controller/document/document_upload_controller.dart'; -import 'package:marco/controller/document/user_document_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/document/document_upload_bottom_sheet.dart'; -import 'package:marco/model/document/documents_list_model.dart'; -import 'package:marco/model/document/user_document_filter_bottom_sheet.dart'; -import 'package:marco/view/document/document_details_page.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/controller/document/document_details_controller.dart'; +import 'package:on_field_work/controller/document/document_upload_controller.dart'; +import 'package:on_field_work/controller/document/user_document_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/document/document_upload_bottom_sheet.dart'; +import 'package:on_field_work/model/document/documents_list_model.dart'; +import 'package:on_field_work/model/document/user_document_filter_bottom_sheet.dart'; +import 'package:on_field_work/view/document/document_details_page.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class UserDocumentsPage extends StatefulWidget { final String? entityId; diff --git a/lib/view/employees/assign_employee_bottom_sheet.dart b/lib/view/employees/assign_employee_bottom_sheet.dart index 61440ea..f6ae76a 100644 --- a/lib/view/employees/assign_employee_bottom_sheet.dart +++ b/lib/view/employees/assign_employee_bottom_sheet.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/controller/employee/assign_projects_controller.dart'; -import 'package:marco/model/global_project_model.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/controller/employee/assign_projects_controller.dart'; +import 'package:on_field_work/model/global_project_model.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; class AssignProjectBottomSheet extends StatefulWidget { final String employeeId; diff --git a/lib/view/employees/employee_detail_screen.dart b/lib/view/employees/employee_detail_screen.dart index 18d35c4..a65d6bc 100644 --- a/lib/view/employees/employee_detail_screen.dart +++ b/lib/view/employees/employee_detail_screen.dart @@ -1,20 +1,20 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/employee/employees_screen_controller.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/launcher_utils.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/model/employees/add_employee_bottom_sheet.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/view/employees/manage_reporting_bottom_sheet.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/view/employees/assign_employee_bottom_sheet.dart'; -import 'package:marco/model/employees/employee_details_model.dart'; +import 'package:on_field_work/controller/employee/employees_screen_controller.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/launcher_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/model/employees/add_employee_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/view/employees/manage_reporting_bottom_sheet.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/view/employees/assign_employee_bottom_sheet.dart'; +import 'package:on_field_work/model/employees/employee_details_model.dart'; class EmployeeDetailPage extends StatefulWidget { final String employeeId; diff --git a/lib/view/employees/employee_profile_screen.dart b/lib/view/employees/employee_profile_screen.dart index 726c452..5dbcfbd 100644 --- a/lib/view/employees/employee_profile_screen.dart +++ b/lib/view/employees/employee_profile_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/view/employees/employee_detail_screen.dart'; -import 'package:marco/view/document/user_document_screen.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/view/employees/employee_detail_screen.dart'; +import 'package:on_field_work/view/document/user_document_screen.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; class EmployeeProfilePage extends StatefulWidget { final String employeeId; diff --git a/lib/view/employees/employees_screen.dart b/lib/view/employees/employees_screen.dart index db1f821..da60eca 100644 --- a/lib/view/employees/employees_screen.dart +++ b/lib/view/employees/employees_screen.dart @@ -1,22 +1,22 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/employees/add_employee_bottom_sheet.dart'; -import 'package:marco/controller/employee/employees_screen_controller.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/helpers/utils/launcher_utils.dart'; -import 'package:marco/view/employees/assign_employee_bottom_sheet.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/view/employees/employee_profile_screen.dart'; -import 'package:marco/view/employees/manage_reporting_bottom_sheet.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/employees/add_employee_bottom_sheet.dart'; +import 'package:on_field_work/controller/employee/employees_screen_controller.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/utils/launcher_utils.dart'; +import 'package:on_field_work/view/employees/assign_employee_bottom_sheet.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/view/employees/employee_profile_screen.dart'; +import 'package:on_field_work/view/employees/manage_reporting_bottom_sheet.dart'; class EmployeesScreen extends StatefulWidget { const EmployeesScreen({super.key}); diff --git a/lib/view/employees/manage_reporting_bottom_sheet.dart b/lib/view/employees/manage_reporting_bottom_sheet.dart index 9bdf9f7..83b495d 100644 --- a/lib/view/employees/manage_reporting_bottom_sheet.dart +++ b/lib/view/employees/manage_reporting_bottom_sheet.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/controller/employee/employees_screen_controller.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/controller/employee/employees_screen_controller.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class ManageReportingBottomSheet extends StatefulWidget { final EmployeeModel? initialEmployee; diff --git a/lib/view/error_pages/coming_soon_screen.dart b/lib/view/error_pages/coming_soon_screen.dart index 5e8e455..8fc9ec5 100644 --- a/lib/view/error_pages/coming_soon_screen.dart +++ b/lib/view/error_pages/coming_soon_screen.dart @@ -1,9 +1,9 @@ -import 'package:marco/controller/error_pages/coming_soon_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; +import 'package:on_field_work/controller/error_pages/coming_soon_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/view/error_pages/error_404_screen.dart b/lib/view/error_pages/error_404_screen.dart index fa7b3c6..9d24f1a 100644 --- a/lib/view/error_pages/error_404_screen.dart +++ b/lib/view/error_pages/error_404_screen.dart @@ -1,9 +1,9 @@ -import 'package:marco/controller/error_pages/error_404_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; +import 'package:on_field_work/controller/error_pages/error_404_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/view/error_pages/error_500_screen.dart b/lib/view/error_pages/error_500_screen.dart index de7003f..fe42291 100644 --- a/lib/view/error_pages/error_500_screen.dart +++ b/lib/view/error_pages/error_500_screen.dart @@ -1,9 +1,9 @@ -import 'package:marco/controller/error_pages/error_500_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; +import 'package:on_field_work/controller/error_pages/error_500_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/view/expense/expense_detail_screen.dart b/lib/view/expense/expense_detail_screen.dart index 7c06879..6d0c4be 100644 --- a/lib/view/expense/expense_detail_screen.dart +++ b/lib/view/expense/expense_detail_screen.dart @@ -1,27 +1,27 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/expense/expense_detail_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/expense/add_expense_bottom_sheet.dart'; -import 'package:marco/model/expense/comment_bottom_sheet.dart'; -import 'package:marco/model/expense/expense_detail_model.dart'; -import 'package:marco/model/expense/reimbursement_bottom_sheet.dart'; -import 'package:marco/controller/expense/add_expense_controller.dart'; -import 'package:marco/helpers/services/app_logger.dart'; +import 'package:on_field_work/controller/expense/expense_detail_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/expense/add_expense_bottom_sheet.dart'; +import 'package:on_field_work/model/expense/comment_bottom_sheet.dart'; +import 'package:on_field_work/model/expense/expense_detail_model.dart'; +import 'package:on_field_work/model/expense/reimbursement_bottom_sheet.dart'; +import 'package:on_field_work/controller/expense/add_expense_controller.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/helpers/widgets/expense/expense_detail_helpers.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/model/employees/employee_info.dart'; +import 'package:on_field_work/helpers/widgets/expense/expense_detail_helpers.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; import 'package:timeline_tile/timeline_tile.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class ExpenseDetailScreen extends StatefulWidget { final String expenseId; diff --git a/lib/view/expense/expense_filter_bottom_sheet.dart b/lib/view/expense/expense_filter_bottom_sheet.dart index 0c6d565..f2da450 100644 --- a/lib/view/expense/expense_filter_bottom_sheet.dart +++ b/lib/view/expense/expense_filter_bottom_sheet.dart @@ -2,15 +2,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/expense/expense_screen_controller.dart'; -import 'package:marco/helpers/utils/base_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/expense/employee_selector_for_filter_bottom_sheet.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/controller/expense/expense_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/base_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/expense/employee_selector_for_filter_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; class ExpenseFilterBottomSheet extends StatefulWidget { final ExpenseController expenseController; diff --git a/lib/view/expense/expense_screen.dart b/lib/view/expense/expense_screen.dart index 453ae00..d0f2c9f 100644 --- a/lib/view/expense/expense_screen.dart +++ b/lib/view/expense/expense_screen.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/expense/expense_screen_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/model/expense/expense_list_model.dart'; -import 'package:marco/model/expense/add_expense_bottom_sheet.dart'; -import 'package:marco/view/expense/expense_filter_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/expense/expense_main_components.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/expense/expense_screen_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/model/expense/expense_list_model.dart'; +import 'package:on_field_work/model/expense/add_expense_bottom_sheet.dart'; +import 'package:on_field_work/view/expense/expense_filter_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/expense/expense_main_components.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; class ExpenseMainScreen extends StatefulWidget { const ExpenseMainScreen({super.key}); diff --git a/lib/view/finance/advance_payment_screen.dart b/lib/view/finance/advance_payment_screen.dart index 2c1fe40..afa41bb 100644 --- a/lib/view/finance/advance_payment_screen.dart +++ b/lib/view/finance/advance_payment_screen.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/finance/advance_payment_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/controller/finance/advance_payment_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; diff --git a/lib/view/finance/finance_screen.dart b/lib/view/finance/finance_screen.dart index eaa1508..32cba67 100644 --- a/lib/view/finance/finance_screen.dart +++ b/lib/view/finance/finance_screen.dart @@ -1,18 +1,18 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/dynamicMenu/dynamic_menu_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/dashbaord/expense_breakdown_chart.dart'; -import 'package:marco/helpers/widgets/dashbaord/expense_by_status_widget.dart'; -import 'package:marco/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart'; -import 'package:marco/controller/dashboard/dashboard_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/model/dynamicMenu/dynamic_menu_model.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/dynamicMenu/dynamic_menu_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/expense_breakdown_chart.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/expense_by_status_widget.dart'; +import 'package:on_field_work/helpers/widgets/dashbaord/monthly_expense_dashboard_chart.dart'; +import 'package:on_field_work/controller/dashboard/dashboard_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/model/dynamicMenu/dynamic_menu_model.dart'; class FinanceScreen extends StatefulWidget { const FinanceScreen({super.key}); diff --git a/lib/view/finance/payment_request_detail_screen.dart b/lib/view/finance/payment_request_detail_screen.dart index 1dc3720..a00aefd 100644 --- a/lib/view/finance/payment_request_detail_screen.dart +++ b/lib/view/finance/payment_request_detail_screen.dart @@ -1,26 +1,26 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/finance/payment_request_detail_controller.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/finance/payment_request_detail_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; import 'package:timeline_tile/timeline_tile.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/model/finance/payment_request_details_model.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/model/finance/payment_request_details_model.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:marco/helpers/widgets/image_viewer_dialog.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/helpers/widgets/image_viewer_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; import 'package:timeago/timeago.dart' as timeago; -import 'package:marco/model/expense/comment_bottom_sheet.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/model/finance/payment_request_rembursement_bottom_sheet.dart'; -import 'package:marco/model/finance/make_expense_bottom_sheet.dart'; -import 'package:marco/model/finance/add_payment_request_bottom_sheet.dart'; +import 'package:on_field_work/model/expense/comment_bottom_sheet.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/model/finance/payment_request_rembursement_bottom_sheet.dart'; +import 'package:on_field_work/model/finance/make_expense_bottom_sheet.dart'; +import 'package:on_field_work/model/finance/add_payment_request_bottom_sheet.dart'; class PaymentRequestDetailScreen extends StatefulWidget { final String paymentRequestId; diff --git a/lib/view/finance/payment_request_screen.dart b/lib/view/finance/payment_request_screen.dart index f826785..e259b97 100644 --- a/lib/view/finance/payment_request_screen.dart +++ b/lib/view/finance/payment_request_screen.dart @@ -1,18 +1,18 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/controller/finance/payment_request_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/finance/payment_request_filter_bottom_sheet.dart'; -import 'package:marco/model/finance/add_payment_request_bottom_sheet.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/view/finance/payment_request_detail_screen.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/controller/finance/payment_request_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/finance/payment_request_filter_bottom_sheet.dart'; +import 'package:on_field_work/model/finance/add_payment_request_bottom_sheet.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/view/finance/payment_request_detail_screen.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; class PaymentRequestMainScreen extends StatefulWidget { const PaymentRequestMainScreen({super.key}); diff --git a/lib/view/layouts/auth_layout.dart b/lib/view/layouts/auth_layout.dart index e21455a..332fd1a 100644 --- a/lib/view/layouts/auth_layout.dart +++ b/lib/view/layouts/auth_layout.dart @@ -1,12 +1,12 @@ -import 'package:marco/controller/layout/auth_layout_controller.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_flex.dart'; -import 'package:marco/helpers/widgets/my_flex_item.dart'; -import 'package:marco/helpers/widgets/my_responsive.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/controller/layout/auth_layout_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_flex.dart'; +import 'package:on_field_work/helpers/widgets/my_flex_item.dart'; +import 'package:on_field_work/helpers/widgets/my_responsive.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/images.dart'; +import 'package:on_field_work/images.dart'; class AuthLayout extends StatelessWidget { final Widget? child; diff --git a/lib/view/layouts/layout.dart b/lib/view/layouts/layout.dart index 10405c3..2aaf940 100644 --- a/lib/view/layouts/layout.dart +++ b/lib/view/layouts/layout.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/layout/layout_controller.dart'; -import 'package:marco/helpers/widgets/my_responsive.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/images.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/view/layouts/user_profile_right_bar.dart'; +import 'package:on_field_work/controller/layout/layout_controller.dart'; +import 'package:on_field_work/helpers/widgets/my_responsive.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/view/layouts/user_profile_right_bar.dart'; class Layout extends StatefulWidget { final Widget? child; diff --git a/lib/view/layouts/left_bar.dart b/lib/view/layouts/left_bar.dart index 8b332cf..fb55b26 100644 --- a/lib/view/layouts/left_bar.dart +++ b/lib/view/layouts/left_bar.dart @@ -1,19 +1,19 @@ -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/services/url_service.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; -import 'package:marco/widgets/custom_pop_menu.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/services/url_service.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/widgets/custom_pop_menu.dart'; import 'package:flutter/material.dart'; import 'package:get/route_manager.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; typedef LeftbarMenuFunction = void Function(String key); diff --git a/lib/view/layouts/offline_screen.dart b/lib/view/layouts/offline_screen.dart index 15fc1d8..76cf4eb 100644 --- a/lib/view/layouts/offline_screen.dart +++ b/lib/view/layouts/offline_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/images.dart'; -import 'package:marco/helpers/widgets/wave_background.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/helpers/widgets/wave_background.dart'; class OfflineScreen extends StatefulWidget { diff --git a/lib/view/layouts/right_bar.dart b/lib/view/layouts/right_bar.dart index b1d0160..67778ee 100644 --- a/lib/view/layouts/right_bar.dart +++ b/lib/view/layouts/right_bar.dart @@ -1,8 +1,8 @@ -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/widgets/custom_switch.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/widgets/custom_switch.dart'; import 'package:flutter/material.dart'; class RightBar extends StatefulWidget { diff --git a/lib/view/layouts/top_bar.dart b/lib/view/layouts/top_bar.dart index f79e7a3..a2fd536 100644 --- a/lib/view/layouts/top_bar.dart +++ b/lib/view/layouts/top_bar.dart @@ -1,20 +1,20 @@ -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; -import 'package:marco/helpers/widgets/my_button.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_dashed_divider.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_text_style.dart'; -import 'package:marco/widgets/custom_pop_menu.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/helpers/widgets/my_button.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_dashed_divider.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_text_style.dart'; +import 'package:on_field_work/widgets/custom_pop_menu.dart'; import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; class TopBar extends StatefulWidget { const TopBar({super.key}); diff --git a/lib/view/layouts/user_profile_right_bar.dart b/lib/view/layouts/user_profile_right_bar.dart index a36a555..ddca327 100644 --- a/lib/view/layouts/user_profile_right_bar.dart +++ b/lib/view/layouts/user_profile_right_bar.dart @@ -3,18 +3,18 @@ import 'package:flutter/material.dart'; import 'package:flutter_lucide/flutter_lucide.dart'; import 'package:get/get.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/model/employees/employee_info.dart'; -import 'package:marco/controller/auth/mpin_controller.dart'; -import 'package:marco/view/employees/employee_profile_screen.dart'; -import 'package:marco/helpers/services/tenant_service.dart'; -import 'package:marco/view/tenant/tenant_selection_screen.dart'; -import 'package:marco/controller/tenant/tenant_switch_controller.dart'; -import 'package:marco/helpers/theme/theme_editor_widget.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/model/employees/employee_info.dart'; +import 'package:on_field_work/controller/auth/mpin_controller.dart'; +import 'package:on_field_work/view/employees/employee_profile_screen.dart'; +import 'package:on_field_work/helpers/services/tenant_service.dart'; +import 'package:on_field_work/view/tenant/tenant_selection_screen.dart'; +import 'package:on_field_work/controller/tenant/tenant_switch_controller.dart'; +import 'package:on_field_work/helpers/theme/theme_editor_widget.dart'; class UserProfileBar extends StatefulWidget { final bool isCondensed; diff --git a/lib/view/my_app.dart b/lib/view/my_app.dart index 5b4a66a..068843e 100644 --- a/lib/view/my_app.dart +++ b/lib/view/my_app.dart @@ -3,15 +3,15 @@ import 'package:get/get.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:provider/provider.dart'; -import 'package:marco/helpers/services/app_logger.dart'; -import 'package:marco/helpers/extensions/app_localization_delegate.dart'; -import 'package:marco/helpers/services/localizations/language.dart'; -import 'package:marco/helpers/services/navigation_services.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/theme/theme_customizer.dart'; -import 'package:marco/helpers/theme/app_notifier.dart'; -import 'package:marco/routes.dart'; +import 'package:on_field_work/helpers/services/app_logger.dart'; +import 'package:on_field_work/helpers/extensions/app_localization_delegate.dart'; +import 'package:on_field_work/helpers/services/localizations/language.dart'; +import 'package:on_field_work/helpers/services/navigation_services.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/theme/theme_customizer.dart'; +import 'package:on_field_work/helpers/theme/app_notifier.dart'; +import 'package:on_field_work/routes.dart'; class MyApp extends StatelessWidget { const MyApp({super.key}); diff --git a/lib/view/service_project/jobs_tab.dart b/lib/view/service_project/jobs_tab.dart index bc18038..cbc14b6 100644 --- a/lib/view/service_project/jobs_tab.dart +++ b/lib/view/service_project/jobs_tab.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/controller/service_project/service_project_details_screen_controller.dart'; -import 'package:marco/view/service_project/service_project_job_detail_screen.dart'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/controller/service_project/service_project_details_screen_controller.dart'; +import 'package:on_field_work/view/service_project/service_project_job_detail_screen.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; class JobsTab extends StatefulWidget { final ScrollController scrollController; diff --git a/lib/view/service_project/service_project_details_screen.dart b/lib/view/service_project/service_project_details_screen.dart index 1105ee9..e3e0073 100644 --- a/lib/view/service_project/service_project_details_screen.dart +++ b/lib/view/service_project/service_project_details_screen.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/controller/service_project/service_project_details_screen_controller.dart'; -import 'package:marco/helpers/utils/launcher_utils.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/model/service_project/add_service_project_job_bottom_sheet.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/model/service_project/service_project_allocation_bottomsheet.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/view/service_project/jobs_tab.dart'; +import 'package:on_field_work/controller/service_project/service_project_details_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/launcher_utils.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/model/service_project/add_service_project_job_bottom_sheet.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/model/service_project/service_project_allocation_bottomsheet.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/view/service_project/jobs_tab.dart'; class ServiceProjectDetailsScreen extends StatefulWidget { final String projectId; diff --git a/lib/view/service_project/service_project_job_detail_screen.dart b/lib/view/service_project/service_project_job_detail_screen.dart index 34ac74a..cd36d6b 100644 --- a/lib/view/service_project/service_project_job_detail_screen.dart +++ b/lib/view/service_project/service_project_job_detail_screen.dart @@ -1,23 +1,23 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/controller/service_project/service_project_details_screen_controller.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/controller/service_project/service_project_details_screen_controller.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; import 'package:timeline_tile/timeline_tile.dart'; -import 'package:marco/model/service_project/service_project_job_detail_model.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; -import 'package:marco/helpers/services/api_service.dart'; -import 'package:marco/helpers/widgets/date_range_picker.dart'; -import 'package:marco/model/employees/multiple_select_bottomsheet.dart'; -import 'package:marco/model/employees/employee_model.dart'; -import 'package:marco/model/expense/comment_bottom_sheet.dart'; +import 'package:on_field_work/model/service_project/service_project_job_detail_model.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/helpers/services/api_service.dart'; +import 'package:on_field_work/helpers/widgets/date_range_picker.dart'; +import 'package:on_field_work/model/employees/multiple_select_bottomsheet.dart'; +import 'package:on_field_work/model/employees/employee_model.dart'; +import 'package:on_field_work/model/expense/comment_bottom_sheet.dart'; import 'package:image_picker/image_picker.dart'; import 'dart:io'; -import 'package:marco/helpers/widgets/my_confirmation_dialog.dart'; +import 'package:on_field_work/helpers/widgets/my_confirmation_dialog.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:marco/helpers/widgets/my_snackbar.dart'; +import 'package:on_field_work/helpers/widgets/my_snackbar.dart'; class JobDetailsScreen extends StatefulWidget { final String jobId; diff --git a/lib/view/service_project/service_project_screen.dart b/lib/view/service_project/service_project_screen.dart index e26d7a3..f8ed3b8 100644 --- a/lib/view/service_project/service_project_screen.dart +++ b/lib/view/service_project/service_project_screen.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/controller/service_project/service_project_screen_controller.dart'; -import 'package:marco/model/service_project/service_projects_list_model.dart'; -import 'package:marco/helpers/utils/date_time_utils.dart'; -import 'package:marco/view/service_project/service_project_details_screen.dart'; -import 'package:marco/helpers/widgets/custom_app_bar.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/controller/service_project/service_project_screen_controller.dart'; +import 'package:on_field_work/model/service_project/service_projects_list_model.dart'; +import 'package:on_field_work/helpers/utils/date_time_utils.dart'; +import 'package:on_field_work/view/service_project/service_project_details_screen.dart'; +import 'package:on_field_work/helpers/widgets/custom_app_bar.dart'; class ServiceProjectScreen extends StatefulWidget { const ServiceProjectScreen({super.key}); diff --git a/lib/view/splash_screen.dart b/lib/view/splash_screen.dart index 67552b6..7f84b21 100644 --- a/lib/view/splash_screen.dart +++ b/lib/view/splash_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:marco/images.dart'; +import 'package:on_field_work/images.dart'; class SplashScreen extends StatefulWidget { final String? message; diff --git a/lib/view/taskPlanning/daily_progress_report.dart b/lib/view/taskPlanning/daily_progress_report.dart index 8f85883..74d6cc0 100644 --- a/lib/view/taskPlanning/daily_progress_report.dart +++ b/lib/view/taskPlanning/daily_progress_report.dart @@ -1,22 +1,22 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/utils/my_shadow.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_container.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/task_planning/daily_task_controller.dart'; -import 'package:marco/model/dailyTaskPlanning/daily_progress_report_filter.dart'; -import 'package:marco/helpers/widgets/avatar.dart'; -import 'package:marco/controller/project_controller.dart'; -import 'package:marco/model/dailyTaskPlanning/task_action_buttons.dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/my_shadow.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_container.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/task_planning/daily_task_controller.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/daily_progress_report_filter.dart'; +import 'package:on_field_work/helpers/widgets/avatar.dart'; +import 'package:on_field_work/controller/project_controller.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/task_action_buttons.dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; class DailyProgressReportScreen extends StatefulWidget { const DailyProgressReportScreen({super.key}); diff --git a/lib/view/taskPlanning/daily_task_planning.dart b/lib/view/taskPlanning/daily_task_planning.dart index 65bf438..7e35ef5 100644 --- a/lib/view/taskPlanning/daily_task_planning.dart +++ b/lib/view/taskPlanning/daily_task_planning.dart @@ -1,20 +1,20 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/theme/app_theme.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_card.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/controller/permission_controller.dart'; -import 'package:marco/controller/task_Planning/daily_task_Planning_controller.dart'; -import 'package:marco/controller/project_controller.dart'; +import 'package:on_field_work/helpers/theme/app_theme.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_card.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/controller/permission_controller.dart'; +import 'package:on_field_work/controller/task_Planning/daily_task_Planning_controller.dart'; +import 'package:on_field_work/controller/project_controller.dart'; import 'package:percent_indicator/percent_indicator.dart'; -import 'package:marco/model/dailyTaskPlanning/assign_task_bottom_sheet .dart'; -import 'package:marco/helpers/widgets/my_custom_skeleton.dart'; -import 'package:marco/helpers/utils/permission_constants.dart'; -import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; -import 'package:marco/controller/tenant/service_controller.dart'; -import 'package:marco/helpers/widgets/tenant/service_selector.dart'; +import 'package:on_field_work/model/dailyTaskPlanning/assign_task_bottom_sheet .dart'; +import 'package:on_field_work/helpers/widgets/my_custom_skeleton.dart'; +import 'package:on_field_work/helpers/utils/permission_constants.dart'; +import 'package:on_field_work/helpers/widgets/my_refresh_indicator.dart'; +import 'package:on_field_work/controller/tenant/service_controller.dart'; +import 'package:on_field_work/helpers/widgets/tenant/service_selector.dart'; class DailyTaskPlanningScreen extends StatefulWidget { DailyTaskPlanningScreen({super.key}); diff --git a/lib/view/tenant/tenant_selection_screen.dart b/lib/view/tenant/tenant_selection_screen.dart index 7fe1875..21c8283 100644 --- a/lib/view/tenant/tenant_selection_screen.dart +++ b/lib/view/tenant/tenant_selection_screen.dart @@ -1,14 +1,14 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:marco/helpers/services/api_endpoints.dart'; -import 'package:marco/helpers/services/storage/local_storage.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_text.dart'; -import 'package:marco/images.dart'; -import 'package:marco/controller/tenant/tenant_selection_controller.dart'; -import 'package:marco/view/splash_screen.dart'; -import 'package:marco/helpers/widgets/wave_background.dart'; +import 'package:on_field_work/helpers/services/api_endpoints.dart'; +import 'package:on_field_work/helpers/services/storage/local_storage.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_text.dart'; +import 'package:on_field_work/images.dart'; +import 'package:on_field_work/controller/tenant/tenant_selection_controller.dart'; +import 'package:on_field_work/view/splash_screen.dart'; +import 'package:on_field_work/helpers/widgets/wave_background.dart'; class TenantSelectionScreen extends StatefulWidget { const TenantSelectionScreen({super.key}); diff --git a/lib/widgets/custom_pop_menu.dart b/lib/widgets/custom_pop_menu.dart index 6272216..1bdf01b 100644 --- a/lib/widgets/custom_pop_menu.dart +++ b/lib/widgets/custom_pop_menu.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; enum CustomPopupMenuPlacement { left, right, top, bottom } diff --git a/lib/widgets/custom_switch.dart b/lib/widgets/custom_switch.dart index 8cf890f..442fd79 100644 --- a/lib/widgets/custom_switch.dart +++ b/lib/widgets/custom_switch.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; -import 'package:marco/helpers/widgets/my_spacing.dart'; +import 'package:on_field_work/helpers/utils/mixins/ui_mixin.dart'; +import 'package:on_field_work/helpers/widgets/my_spacing.dart'; class CustomSwitch extends StatefulWidget { final bool value; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index fa2be66..77a63e1 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,7 +4,7 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "marco") +set(BINARY_NAME "on field work") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID set(APPLICATION_ID "com.marcoonfieldwork.aiot") diff --git a/linux/my_application.cc b/linux/my_application.cc index a3508cf..dd1759e 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "marco"); + gtk_header_bar_set_title(header_bar, "on field work"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "marco"); + gtk_window_set_title(window, "on field work"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index a89772a..a8c5309 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -64,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* marco.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "marco.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* on field work.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "on field work.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -131,7 +131,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* marco.app */, + 33CC10ED2044A3C60003C045 /* on field work.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* marco.app */; + productReference = 33CC10ED2044A3C60003C045 /* on field work.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index d640941..88b79b5 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -65,7 +65,7 @@ @@ -82,7 +82,7 @@ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 52293a5..1ec6933 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,7 +5,7 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = marco +PRODUCT_NAME = on field work // The application's bundle identifier PRODUCT_BUNDLE_IDENTIFIER = com.marcoonfieldwork.aiot diff --git a/pubspec.yaml b/pubspec.yaml index aa6af1f..57d23ed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: marco +name: on_field_work description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. @@ -118,7 +118,6 @@ flutter: - assets/logo/loading_logo.png - assets/social/ - assets/service-account.json - - assets/service-account.json # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg diff --git a/test/widget_test.dart b/test/widget_test.dart index 50cec9b..bb64fa5 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:marco/main.dart'; +import 'package:on_field_work/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/web/index.html b/web/index.html index 9eb53ab..6b63db2 100644 --- a/web/index.html +++ b/web/index.html @@ -23,13 +23,13 @@ - + - marco + on field work diff --git a/web/manifest.json b/web/manifest.json index d19d002..e53c254 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "marco", - "short_name": "marco", + "name": "on field work", + "short_name": "ofw", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 6a78c93..0d6ac17 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(marco LANGUAGES CXX) +project(on field work LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "marco") +set(BINARY_NAME "on field work") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 17bd9de..7b1327d 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "marco" "\0" + VALUE "FileDescription", "on field work" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "marco" "\0" + VALUE "InternalName", "on field work" "\0" VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "marco.exe" "\0" - VALUE "ProductName", "marco" "\0" + VALUE "OriginalFilename", "on field work.exe" "\0" + VALUE "ProductName", "on field work" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index 166739a..da1d2a4 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"marco", origin, size)) { + if (!window.Create(L"on field work", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);