diff --git a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart index 2286cc0a..6dc7b85b 100644 --- a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart +++ b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart @@ -107,13 +107,13 @@ class _BottomArrowLinkedLocalsComponentWidgetState if (isEnabled) { final local = locals[0]; - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientName.key, local['CLI_NOME']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerName.key, local['CLU_OWNER_DSC']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientUUID.key, local['CLI_ID']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerUUID.key, local['CLU_OWNER_ID']); context.pop(); @@ -145,8 +145,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState Future _fetchResponseLink(String status, String cliID) async { try { - await StorageRepositoryImpl() - .set(ProfileStorageKey.clientUUID.key, cliID); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, cliID); var response = await PhpGroup.resopndeVinculo.call(tarefa: status); if (response.jsonBody['error'] == false) { @@ -157,7 +156,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState enText: "Link Activated Successfully") }; } else { - await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); return response.jsonBody; } } catch (e, s) { @@ -209,13 +208,13 @@ class _BottomArrowLinkedLocalsComponentWidgetState statusHashMap: [_statusHashMap(local)], onTapCardItemAction: () async { if (local['CLU_STATUS'] == 'A') { - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientUUID.key, local['CLI_ID']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientName.key, local['CLI_NOME']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerName.key, local['CLU_OWNER_DSC']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerUUID.key, local['CLU_OWNER_ID']); context.pop(true); diff --git a/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart b/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart index a1e4b4bf..734cb294 100644 --- a/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart +++ b/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart @@ -58,15 +58,11 @@ class ScheduleVisitDetailModel } Future initDB() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } @override diff --git a/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart b/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart index fd45ad3b..be8b36d1 100644 --- a/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart +++ b/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart @@ -16,18 +16,13 @@ class UpArrowLinkedLocalsComponentModel } Future initDB() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; } @override diff --git a/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart b/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart index 1d872c2d..03352151 100644 --- a/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart +++ b/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart @@ -32,15 +32,11 @@ class AccessNotificationModalTemplateComponentModel } Future initDB() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } @override diff --git a/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart b/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart index 9260e4a7..d4938cff 100644 --- a/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart +++ b/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart @@ -49,8 +49,7 @@ class _PassKeyTemplateWidgetState extends State { Future _initialize() async { _accessPass = - await StorageRepositoryImpl().get(SecureStorageKey.accessPass.value) ?? - ''; + await StorageHelper().get(SecureStorageKey.accessPass.value) ?? ''; } @override diff --git a/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart b/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart index 21be638e..0fefa607 100644 --- a/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart +++ b/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart @@ -27,15 +27,11 @@ class LiberationHistoryItemDetailsTemplateComponentModel void initState(BuildContext context) {} Future initDatabase() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; ; } diff --git a/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart b/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart index 9d738419..c1e82767 100644 --- a/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart +++ b/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart @@ -147,21 +147,15 @@ class ScheduleProvisionalVisitPageModel } Future init() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; ownerName = - (await StorageRepositoryImpl().get(ProfileStorageKey.ownerName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.ownerName.key)) ?? ''; ownerUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? ''; setState?.call(); } } diff --git a/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart b/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart index 4240befd..acff7931 100644 --- a/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart +++ b/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart @@ -135,15 +135,11 @@ class RegisiterVistorTemplateComponentModel } Future initializeDatabase() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; ; } diff --git a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart index 0b64bf27..3ad2c626 100644 --- a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart +++ b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart @@ -94,9 +94,8 @@ class _SignUpTemplateComponentWidgetState } Future _initialize() async { - _deviceType = (await StorageRepositoryImpl() - .get(SecureStorageKey.deviceType.value)) ?? - ''; + _deviceType = + (await StorageHelper().get(SecureStorageKey.deviceType.value)) ?? ''; } @override diff --git a/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart b/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart index dc92ba8f..d115ada3 100644 --- a/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart +++ b/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart @@ -36,15 +36,11 @@ class ViewVisitDetailModel extends FlutterFlowModel { } Future initializeDatabase() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; ; } diff --git a/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart b/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart index 3d573b22..17cc8baf 100644 --- a/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart +++ b/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart @@ -38,15 +38,11 @@ class VisitorSearchModalTemplateComponentModel } Future initDatabase() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; ; } diff --git a/lib/features/auth/authentication_service.dart b/lib/features/auth/authentication_service.dart index e427a48d..12393545 100644 --- a/lib/features/auth/authentication_service.dart +++ b/lib/features/auth/authentication_service.dart @@ -28,12 +28,10 @@ class AuthenticationService { List locals = response.jsonBody['locais'] ?? []; if (locals.isEmpty) { - await StorageRepositoryImpl() - .set(SecureStorageKey.haveLocal.value, false); + await StorageHelper().set(SecureStorageKey.haveLocal.value, false); context.go('/receptionPage'); } else { - await StorageRepositoryImpl() - .set(SecureStorageKey.isLogged.value, true); + await StorageHelper().set(SecureStorageKey.isLogged.value, true); context .go('/homePage', extra: {'update': LocalsRepositoryImpl().update}); } @@ -53,7 +51,7 @@ class AuthenticationService { final ApiCallResponse? response; final LoginCall callback = PhpGroup.loginCall; String deviceDescription = randomString(10, 10, true, false, false); - await StorageRepositoryImpl() + await StorageHelper() .set(SecureStorageKey.deviceDescription.value, deviceDescription); final String? devUUID; @@ -69,11 +67,9 @@ class AuthenticationService { devUUID = await DeviceUtil.getDevUUID(); if ((email != '') && (passwd != '')) { - await StorageRepositoryImpl().set(SecureStorageKey.email.value, email); - await StorageRepositoryImpl() - .set(SecureStorageKey.password.value, passwd); - await StorageRepositoryImpl() - .set(ProfileStorageKey.devUUID.key, devUUID!); + await StorageHelper().set(SecureStorageKey.email.value, email); + await StorageHelper().set(SecureStorageKey.password.value, passwd); + await StorageHelper().set(ProfileStorageKey.devUUID.key, devUUID!); response = await callback.call(); if (response.jsonBody['error'] == false) { @@ -82,14 +78,11 @@ class AuthenticationService { userDevUUID = response.jsonBody['user']['dev_id']; userName = response.jsonBody['user']['name']; - await StorageRepositoryImpl() - .set(ProfileStorageKey.userUUID.key, userUUID); - await StorageRepositoryImpl() + await StorageHelper().set(ProfileStorageKey.userUUID.key, userUUID); + await StorageHelper() .set(ProfileStorageKey.userDevUUID.key, userDevUUID); - await StorageRepositoryImpl() - .set(ProfileStorageKey.status.key, status); - await StorageRepositoryImpl() - .set(ProfileStorageKey.userName.key, userName); + await StorageHelper().set(ProfileStorageKey.status.key, status); + await StorageHelper().set(ProfileStorageKey.userName.key, userName); await login(context); } else { @@ -156,8 +149,8 @@ class AuthenticationService { ), }; - await StorageRepositoryImpl().clean(Storage.databaseStorage); - await StorageRepositoryImpl().clean(Storage.secureStorage); + await StorageHelper().clean(Storage.databaseStorage); + await StorageHelper().clean(Storage.secureStorage); await LicenseRepositoryImpl().cleanLicense(); DatabaseService.isInitialized = false; await DatabaseService.instance.init(); diff --git a/lib/features/backend/api_requests/api_calls.dart b/lib/features/backend/api_requests/api_calls.dart index 24f88aa2..b5665bea 100644 --- a/lib/features/backend/api_requests/api_calls.dart +++ b/lib/features/backend/api_requests/api_calls.dart @@ -70,14 +70,11 @@ class GetProvSchedules { Future call(final String page, final String status) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getAgendamentoProv'; const String pageSize = '10'; final bool isFiltered = status != '' && status != '.*'; @@ -111,14 +108,11 @@ class GetOpenedVisits { Future call(final String page) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getOpenedVisits'; const String pageSize = '10'; return await ApiManager.instance.makeApiCall( @@ -149,12 +143,11 @@ class GetResidentsByProperty { Future call(final String page) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? ''; + await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; final String userUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; final String cliID = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key) ?? - ''; + await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? ''; const String atividade = 'getResidentsByProperty'; const String pageSize = '10'; return await ApiManager.instance.makeApiCall( @@ -184,14 +177,11 @@ class GetVehiclesByProperty { Future call(final String page) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getVehiclesByProperty'; const String pageSize = '10'; return await ApiManager.instance.makeApiCall( @@ -223,14 +213,11 @@ class GetLicense { Future call() async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'getLicense', @@ -260,11 +247,9 @@ class UnregisterDevice { Future call() async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'unregisterDevice', @@ -292,14 +277,11 @@ class DeletePet { Future call({final int? petID = 0}) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'excluirPet'; return await ApiManager.instance.makeApiCall( @@ -343,14 +325,11 @@ class UpdatePet { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'atualizarPet'; return await ApiManager.instance.makeApiCall( @@ -397,14 +376,11 @@ class GetPets { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'consultaPets'; return await ApiManager.instance.makeApiCall( @@ -437,14 +413,11 @@ class GetPetPhoto { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'consultaFotoPet'; return await ApiManager.instance.makeApiCall( @@ -486,14 +459,11 @@ class RegisterPet { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'cadastrarPet'; return await ApiManager.instance.makeApiCall( @@ -539,14 +509,11 @@ class BuscaEnconcomendas { final String? status, }) async { final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getEncomendas'; final String baseUrl = PhpGroup.getBaseUrl(); @@ -589,14 +556,11 @@ class CancelaVisita { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'cancelaVisita'; return await ApiManager.instance.makeApiCall( @@ -629,11 +593,9 @@ class CancelaVisita { class DeleteAccount { Future call() async { final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String baseUrl = PhpGroup.getBaseUrl(); return await ApiManager.instance.makeApiCall( @@ -665,14 +627,11 @@ class ChangePanic { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -707,14 +666,11 @@ class ChangePass { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -749,14 +705,11 @@ class RespondeVinculo { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'respondeVinculo', @@ -789,14 +742,11 @@ class ChangeNotifica { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -829,17 +779,13 @@ class UpdateIDE { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; - final String newIde = (await StorageRepositoryImpl() - .get(ProfileStorageKey.userDevUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + final String newIde = + (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -872,13 +818,11 @@ class UpdToken { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String token = - (await StorageRepositoryImpl().get(SecureStorageKey.token.value)) ?? ''; + (await StorageHelper().get(SecureStorageKey.token.value)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'updToken', @@ -906,19 +850,16 @@ class LoginCall { Future call() async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String email = - (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; + (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; final String password = - (await StorageRepositoryImpl().get(SecureStorageKey.password.value)) ?? + (await StorageHelper().get(SecureStorageKey.password.value)) ?? ''; + final String type = + (await StorageHelper().get(SecureStorageKey.deviceType.value)) ?? ''; + final String description = + (await StorageHelper().get(SecureStorageKey.deviceDescription.value)) ?? ''; - final String type = (await StorageRepositoryImpl() - .get(SecureStorageKey.deviceType.value)) ?? - ''; - final String description = (await StorageRepositoryImpl() - .get(SecureStorageKey.deviceDescription.value)) ?? - ''; late final String token; try { token = await FirebaseMessagingService.getToken(); @@ -1002,14 +943,11 @@ class ChangePasswordCall { }) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'changePassword', @@ -1069,9 +1007,9 @@ class GetLocalsCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? ''; + await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; final String userUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; return await ApiManager.instance .makeApiCall( @@ -1113,14 +1051,11 @@ class PostScheduleVisitorCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'putVisitante'; return await ApiManager.instance.makeApiCall( @@ -1174,14 +1109,11 @@ class PostScheduleVisitCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'putVisita'; return await ApiManager.instance.makeApiCall( @@ -1234,14 +1166,11 @@ class GetScheduleVisitCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getVisitas'; return await ApiManager.instance.makeApiCall( @@ -1514,14 +1443,11 @@ class GetDadosCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getDados'; return await ApiManager.instance @@ -1765,14 +1691,11 @@ class GetVisitorByDocCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getVisitante'; return await ApiManager.instance.makeApiCall( @@ -1825,14 +1748,11 @@ class GetFotoVisitanteCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getFotoVisitante'; return await ApiManager.instance.makeApiCall( @@ -1870,14 +1790,11 @@ class PostProvVisitSchedulingCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'putAgendamentoProv'; return await ApiManager.instance.makeApiCall( @@ -1925,14 +1842,11 @@ class GetVisitsCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getVisitas'; return await ApiManager.instance.makeApiCall( @@ -2194,14 +2108,11 @@ class DeleteVisitCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'cancelaVisita'; return await ApiManager.instance.makeApiCall( @@ -2243,17 +2154,13 @@ class GetPessoasLocalCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String ownerUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'getPessoasLocal', @@ -2317,14 +2224,11 @@ class RespondeSolicitacaoCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'respondeSolicitacao'; return await ApiManager.instance.makeApiCall( @@ -2373,14 +2277,11 @@ class GetAccessCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getAcessos'; return await ApiManager.instance.makeApiCall( @@ -2628,14 +2529,11 @@ class GetLiberationsCall { Future.microtask(() async { final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; - final String cliUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + final String cliUUID = + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getSolicitacoes'; try { @@ -2826,14 +2724,11 @@ class GetMessagesCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final String userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const String atividade = 'getMensagens'; return await ApiManager.instance.makeApiCall( diff --git a/lib/features/history/presentation/blocs/access_history_bloc.dart b/lib/features/history/presentation/blocs/access_history_bloc.dart index a1f193ff..9e5bd113 100644 --- a/lib/features/history/presentation/blocs/access_history_bloc.dart +++ b/lib/features/history/presentation/blocs/access_history_bloc.dart @@ -32,15 +32,11 @@ class AcessHistoryPageModel extends FlutterFlowModel { } Future initDatabase() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } @override diff --git a/lib/features/history/presentation/blocs/provisional_history_bloc.dart b/lib/features/history/presentation/blocs/provisional_history_bloc.dart index 67e5d0c1..3c6b0d9e 100644 --- a/lib/features/history/presentation/blocs/provisional_history_bloc.dart +++ b/lib/features/history/presentation/blocs/provisional_history_bloc.dart @@ -47,14 +47,11 @@ class ProvisionalHistoryBloc ) async { emit(state.copyWith(isLoading: true)); final devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; emit(state.copyWith( devUUID: devUUID, userUUID: userUUID, diff --git a/lib/features/history/presentation/pages/provisional_history_page.dart b/lib/features/history/presentation/pages/provisional_history_page.dart index 5cf0afea..e69fc452 100644 --- a/lib/features/history/presentation/pages/provisional_history_page.dart +++ b/lib/features/history/presentation/pages/provisional_history_page.dart @@ -110,14 +110,14 @@ class ProvisionalHistoryState extends State { ptText: 'Consultar Agendas', enText: 'Provisional History', ), - style: theme.headlineMedium.override( - fontFamily: theme.headlineMediumFamily, - color: theme.primaryText, - fontSize: 16.0, - letterSpacing: 0.0, - useGoogleFonts: - GoogleFonts.asMap().containsKey(theme.headlineMediumFamily), - ), + style: FlutterFlowTheme.of(context).headlineMedium.override( + fontFamily: 'Nunito', + color: FlutterFlowTheme.of(context).primaryText, + fontSize: 15.0, + fontWeight: FontWeight.bold, + letterSpacing: 0.0, + useGoogleFonts: GoogleFonts.asMap().containsKey('Nunito'), + ), ); } diff --git a/lib/features/home/presentation/blocs/home_bloc.dart b/lib/features/home/presentation/blocs/home_bloc.dart index 9a12e337..c7b69418 100644 --- a/lib/features/home/presentation/blocs/home_bloc.dart +++ b/lib/features/home/presentation/blocs/home_bloc.dart @@ -18,19 +18,15 @@ class HomeBloc extends Bloc { Future _onHomeEvent(HomeEvent event, Emitter emit) async { final devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; final userName = - (await StorageRepositoryImpl().get(ProfileStorageKey.userName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userName.key)) ?? ''; final userEmail = - (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; + (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; emit(state.copyWith( devUUID: devUUID, diff --git a/lib/features/local/data/data_sources/locals_local_data_source.dart b/lib/features/local/data/data_sources/locals_local_data_source.dart index 660ce5ac..cac9e924 100644 --- a/lib/features/local/data/data_sources/locals_local_data_source.dart +++ b/lib/features/local/data/data_sources/locals_local_data_source.dart @@ -24,7 +24,7 @@ class LocalsLocalDataSourceImpl implements LocalsLocalDataSource { @override Future get(String key) async { final String? local = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); + await StorageHelper().get(ProfileStorageKey.clientUUID.key); var response = await DatabaseService.database.query( LocalsConstants.tableLocalsKeychain, where: 'key = ? AND local = ?', @@ -40,7 +40,7 @@ class LocalsLocalDataSourceImpl implements LocalsLocalDataSource { try { var date = DateTime.now().toIso8601String(); final String? local = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); + await StorageHelper().get(ProfileStorageKey.clientUUID.key); await DatabaseService.database.insert( LocalsConstants.tableLocalsKeychain, @@ -61,7 +61,7 @@ class LocalsLocalDataSourceImpl implements LocalsLocalDataSource { @override Future delete(String key) async { final String? local = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); + await StorageHelper().get(ProfileStorageKey.clientUUID.key); await DatabaseService.database.delete(LocalsConstants.tableLocalsKeychain, where: 'key = ? AND local = ?', whereArgs: [key, local]); } diff --git a/lib/features/local/data/data_sources/locals_remote_data_source.dart b/lib/features/local/data/data_sources/locals_remote_data_source.dart index a8b2233f..bf4b710b 100644 --- a/lib/features/local/data/data_sources/locals_remote_data_source.dart +++ b/lib/features/local/data/data_sources/locals_remote_data_source.dart @@ -56,14 +56,12 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource { final bool isEnable = !isEmpty && isActive; if (isEnable) { - await StorageRepositoryImpl() - .set(SecureStorageKey.haveLocal.value, true); - await StorageRepositoryImpl() - .set(SecureStorageKey.isLogged.value, true); + await StorageHelper().set(SecureStorageKey.haveLocal.value, true); + await StorageHelper().set(SecureStorageKey.isLogged.value, true); await WidgetsBinding.instance.endOfFrame; - await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); - await StorageRepositoryImpl().set(ProfileStorageKey.ownerUUID.key, ''); - StorageRepositoryImpl().context?.go('/homePage'); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.ownerUUID.key, ''); + StorageHelper().context?.go('/homePage'); } } catch (e, s) { log(e.toString(), stackTrace: s); @@ -148,11 +146,9 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource { @override Future checkLocals(BuildContext context) async { String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; String cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; return cliUUID.isEmpty && cliName.isEmpty; } @@ -227,12 +223,9 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource { final bool status = await PhpGroup.resopndeVinculo.call(tarefa: 'I').then((value) async { if (value.jsonBody['error'] == false) { - await StorageRepositoryImpl() - .set(ProfileStorageKey.clientName.key, ''); - await StorageRepositoryImpl() - .set(ProfileStorageKey.ownerName.key, ''); - await StorageRepositoryImpl() - .set(ProfileStorageKey.clientUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.clientName.key, ''); + await StorageHelper().set(ProfileStorageKey.ownerName.key, ''); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); context.pop(); context.go('/homePage', extra: {'update': LocalsRepositoryImpl().update}); diff --git a/lib/features/local/data/repositories/locals_repository_impl.dart b/lib/features/local/data/repositories/locals_repository_impl.dart index 5c5fd0a6..37b49a95 100644 --- a/lib/features/local/data/repositories/locals_repository_impl.dart +++ b/lib/features/local/data/repositories/locals_repository_impl.dart @@ -38,16 +38,16 @@ class LocalsRepositoryImpl implements LocalsRepository { } Future unselect() async { - await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); - await StorageRepositoryImpl().set(ProfileStorageKey.clientName.key, ''); - await StorageRepositoryImpl().set(ProfileStorageKey.ownerName.key, ''); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.clientName.key, ''); + await StorageHelper().set(ProfileStorageKey.ownerName.key, ''); } Future check(BuildContext context) async { final String? cliUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); + await StorageHelper().get(ProfileStorageKey.clientUUID.key); final String? ownerUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key); + await StorageHelper().get(ProfileStorageKey.ownerUUID.key); final bool haveCli = cliUUID != null && cliUUID.isNotEmpty; final bool haveOwner = ownerUUID != null && ownerUUID.isNotEmpty; if (!haveCli && !haveOwner) { @@ -78,7 +78,7 @@ class LocalsRepositoryImpl implements LocalsRepository { } Future _handleUpdateError(BuildContext context) async { - await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); const String errorMsg = 'Erro ao atualizar locais'; await DialogUtil.error(context, errorMsg); } diff --git a/lib/features/local/presentation/blocs/local_profile_bloc.dart b/lib/features/local/presentation/blocs/local_profile_bloc.dart index 3bce66d6..bca9c819 100644 --- a/lib/features/local/presentation/blocs/local_profile_bloc.dart +++ b/lib/features/local/presentation/blocs/local_profile_bloc.dart @@ -41,14 +41,11 @@ class LocalProfileBloc extends Bloc { Future _onLocalProfileEvent( LocalProfileEvent event, Emitter emit) async { final cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; final ownerName = - (await StorageRepositoryImpl().get(ProfileStorageKey.ownerName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.ownerName.key)) ?? ''; final cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; emit(state.copyWith( cliName: cliName, cliUUID: cliUUID, ownerName: ownerName)); } @@ -75,14 +72,11 @@ class LocalProfileComponentModel Future getData() async { cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; ownerName = - (await StorageRepositoryImpl().get(ProfileStorageKey.ownerName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.ownerName.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; setStateCallback?.call(); } diff --git a/lib/features/local/utils/local_util.dart b/lib/features/local/utils/local_util.dart index c7ab1664..202e911a 100644 --- a/lib/features/local/utils/local_util.dart +++ b/lib/features/local/utils/local_util.dart @@ -12,9 +12,9 @@ import 'package:hub/shared/utils/log_util.dart'; class LocalUtil { static void handleError(BuildContext context, String errorMsg) async { final String devUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? ''; + await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; final String userUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; final bool isAuthenticated = userUUID.isNotEmpty && devUUID.isNotEmpty; final bool isDevLinked = !errorMsg.contains('Esse dispositivo nao pertence a esse usuario'); @@ -43,21 +43,21 @@ class LocalUtil { BuildContext context, List locals) async { log('() => isUnavailable'); try { - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientUUID.key, locals[0]['CLI_ID']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerUUID.key, locals[0]['CLU_OWNER_ID']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientName.key, locals[0]['CLI_NOME']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerName.key, locals[0]['CLU_OWNER_DSC']); var response = await PhpGroup.resopndeVinculo.call(tarefa: 'A'); if (response.jsonBody['error'] == true) { - await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); - await StorageRepositoryImpl().set(ProfileStorageKey.ownerUUID.key, ''); - await StorageRepositoryImpl().set(ProfileStorageKey.clientName.key, ''); - await StorageRepositoryImpl().set(ProfileStorageKey.ownerName.key, ''); + await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.ownerUUID.key, ''); + await StorageHelper().set(ProfileStorageKey.clientName.key, ''); + await StorageHelper().set(ProfileStorageKey.ownerName.key, ''); return false; } @@ -76,15 +76,15 @@ class LocalUtil { static Future handleEnabled(BuildContext context, dynamic local) async { log('() => isEnabled'); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientUUID.key, local['CLI_ID']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerUUID.key, local['CLU_OWNER_ID']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.clientName.key, local['CLI_NOME']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.ownerName.key, local['CLU_OWNER_DSC']); - await StorageRepositoryImpl() + await StorageHelper() .set(ProfileStorageKey.userName.key, local['USU_NOME']); return await LocalsRemoteDataSourceImpl().processData(context); } @@ -106,45 +106,45 @@ class LocalUtil { static Future updateStorageUtil(Map jsonBody) async { try { - await StorageRepositoryImpl() + await StorageHelper() .set(LocalsStorageKey.whatsapp.key, jsonBody['whatsapp'] ?? false); - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.provisional.key, jsonBody['provisional'] ?? false); - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.pets.key, jsonBody['pet'] ?? false, ); - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.notify.key, _processSystemOption( jsonBody['visitado']['VDO_NOTTERCEIROS'], ), ); if (jsonBody['visitado']['VDO_TEM_SENHA_ACESSO'] == '') { - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.access.key, _processSystemOption(jsonBody['visitado']['VDO_TEM_SENHA_ACESSO']), ); - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.panic.key, _processSystemOption(jsonBody['visitado']['VDO_TEM_SENHA_PANICO']), ); } - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.petAmount.key, jsonBody['petAmountRegister']?.toString().isEmpty ?? true ? '0' : jsonBody['petAmountRegister'].toString()); - await StorageRepositoryImpl().set(ProfileStorageKey.userName.key, + await StorageHelper().set(ProfileStorageKey.userName.key, jsonBody['visitado']['VDO_NOME'] ?? ''); - await StorageRepositoryImpl().set(ProfileStorageKey.userEmail.key, + await StorageHelper().set(ProfileStorageKey.userEmail.key, jsonBody['visitado']['VDO_EMAIL'] ?? ''); - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.provisional.key, jsonBody['provisional'] ?? false); final bool isNewVersion = jsonBody['newVersion'] ?? false; - await StorageRepositoryImpl() + await StorageHelper() .set(LocalsStorageKey.isNewVersion.key, isNewVersion); return isNewVersion; } catch (e, s) { @@ -159,8 +159,7 @@ class LocalUtil { static Future isInactived(List locals) async { String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; return locals .where( (local) => local['CLI_ID'] != cliUUID && local['CLU_STATUS'] == 'A') @@ -176,34 +175,27 @@ class LocalUtil { static Future isUnselected() async { String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; String cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; String ownerUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? ''; return cliUUID.isEmpty && cliName.isEmpty && ownerUUID.isEmpty; } static Future isSelected(bool isInactived) async { String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; String cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; return cliUUID.isNotEmpty && cliName.isNotEmpty && isInactived; } static Future isAvailable() async { String cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; String cliName = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; return cliUUID.isNotEmpty && cliName.isNotEmpty; } } diff --git a/lib/features/menu/presentation/mappers/menu_entry.dart b/lib/features/menu/presentation/mappers/menu_entry.dart index 5a30b7ef..aec4f987 100644 --- a/lib/features/menu/presentation/mappers/menu_entry.dart +++ b/lib/features/menu/presentation/mappers/menu_entry.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:hub/features/module/index.dart'; import 'package:hub/flutter_flow/internationalization.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; +import 'package:material_symbols_icons/symbols.dart'; enum MenuEntryType { Home, Drawer, Property } @@ -171,7 +172,7 @@ class MenuEntry implements BaseModule { ), MenuEntry( key: 'FRE-HUB-PROVISIONAL-HISTORY', - icon: Icons.person_search_outlined, + icon: Symbols.calendar_clock, name: FFLocalizations.of(navigatorKey.currentContext!).getVariableText( ptText: 'Consultar Agendas', enText: 'Provisional History', diff --git a/lib/features/module/data/data_sources/license_local_data_source.dart b/lib/features/module/data/data_sources/license_local_data_source.dart index f6b7266c..25251b41 100644 --- a/lib/features/module/data/data_sources/license_local_data_source.dart +++ b/lib/features/module/data/data_sources/license_local_data_source.dart @@ -41,7 +41,7 @@ class LicenseLocalDataSourceImpl implements LicenseLocalDataSource { @override Future isNewVersion() async { final String? reponse = - await StorageRepositoryImpl().get(LocalsStorageKey.isNewVersion.key); + await StorageHelper().get(LocalsStorageKey.isNewVersion.key); final bool isNewVersion = reponse.toBoolean(); return isNewVersion; } diff --git a/lib/features/module/domain/entities/license.dart b/lib/features/module/domain/entities/license.dart index 5a6e74f5..17a70650 100644 --- a/lib/features/module/domain/entities/license.dart +++ b/lib/features/module/domain/entities/license.dart @@ -60,7 +60,7 @@ class License { } static Future _precessWpp() async { - final bool whatsapp = await StorageRepositoryImpl() + final bool whatsapp = await StorageHelper() .get(LocalsStorageKey.whatsapp.key) .then((v) => v.toBoolean()); if (whatsapp) @@ -70,7 +70,7 @@ class License { } static Future _processProvisional() async { - final bool provisional = await StorageRepositoryImpl() + final bool provisional = await StorageHelper() .get(LocalsStorageKey.provisional.key) .then((v) => v.toBoolean()); if (provisional) @@ -80,7 +80,7 @@ class License { } static Future _processPets() async { - final bool pets = await StorageRepositoryImpl() + final bool pets = await StorageHelper() .get(LocalsStorageKey.pets.key) .then((v) => v.toBoolean()); if (pets) diff --git a/lib/features/notification/deep_link_service.dart b/lib/features/notification/deep_link_service.dart index fdfc4512..f7aa1ac0 100644 --- a/lib/features/notification/deep_link_service.dart +++ b/lib/features/notification/deep_link_service.dart @@ -24,7 +24,7 @@ class DeepLinkService { _appLinks = AppLinks(); print('initDeepLinks'); _linkSubscription = _appLinks.uriLinkStream.listen((uri) async { - if (!StorageRepositoryImpl().isRecovered) { + if (!StorageHelper().isRecovered) { await _handleDeepLink(uri); } }); @@ -37,9 +37,9 @@ class DeepLinkService { Future _handleDeepLink(Uri uri) async { try { print('Handling deep link: $uri'); - if (StorageRepositoryImpl().isRecovered) return; + if (StorageHelper().isRecovered) return; - StorageRepositoryImpl().isRecovered = true; + StorageHelper().isRecovered = true; final email = uri.queryParameters['email'] ?? ''; final token = uri.queryParameters['token'] ?? ''; print('email: $email, token: $token'); @@ -68,7 +68,7 @@ class DeepLinkService { useSafeArea: true, enableDrag: true, ).whenComplete(() { - StorageRepositoryImpl().isRecovered = false; + StorageHelper().isRecovered = false; print('showModalBottomSheet completed'); }); }); diff --git a/lib/features/notification/firebase_messaging_service.dart b/lib/features/notification/firebase_messaging_service.dart index f753900a..68fc300a 100644 --- a/lib/features/notification/firebase_messaging_service.dart +++ b/lib/features/notification/firebase_messaging_service.dart @@ -45,8 +45,7 @@ class FirebaseMessagingService { final String? deviceToken = await _firebaseMessaging.getToken(); if (deviceToken != null) { - await StorageRepositoryImpl() - .set(SecureStorageKey.token.value, deviceToken); + await StorageHelper().set(SecureStorageKey.token.value, deviceToken); final ApiCallResponse? response; response = await PhpGroup.updToken.call(); diff --git a/lib/features/notification/notification_service.dart b/lib/features/notification/notification_service.dart index f6077087..8e1662d6 100644 --- a/lib/features/notification/notification_service.dart +++ b/lib/features/notification/notification_service.dart @@ -16,8 +16,7 @@ Future onMessageReceived( final localId = jsonDecode(payload['local']!)['CLI_ID']; final cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; answersRequest( {required BuildContext context, @@ -252,7 +251,7 @@ Future onMessageReceived( break; case 'enroll_cond': - await StorageRepositoryImpl().set(SecureStorageKey.haveLocal.value, true); + await StorageHelper().set(SecureStorageKey.haveLocal.value, true); navigatorKey.currentContext!.go('/homePage'); break; default: @@ -289,13 +288,13 @@ class NotificationService { await AwesomeNotifications() .isNotificationAllowed() .then((isAllowed) async { - final bool requestOSnotification = (await StorageRepositoryImpl() + final bool requestOSnotification = (await StorageHelper() .get(LocalsStorageKey.requestOSNotification.key)) == 'true'; if (requestOSnotification == false) { if (isAllowed == false) { - await StorageRepositoryImpl() + await StorageHelper() .set(LocalsStorageKey.requestOSNotification.key, true); await AwesomeNotifications().requestPermissionToSendNotifications(); } diff --git a/lib/features/storage/repositories/storage_repository_impl.dart b/lib/features/storage/repositories/storage_repository_impl.dart index 62c06253..30f3fd0d 100644 --- a/lib/features/storage/repositories/storage_repository_impl.dart +++ b/lib/features/storage/repositories/storage_repository_impl.dart @@ -4,11 +4,10 @@ import 'package:flutter/cupertino.dart'; import 'package:hub/features/profile/data/data_sources/profile_local_data_source.dart'; import 'package:hub/features/storage/index.dart'; -class StorageRepositoryImpl implements StorageRepository { - static final StorageRepositoryImpl _instance = - StorageRepositoryImpl._internal(); - factory StorageRepositoryImpl() => _instance; - StorageRepositoryImpl._internal(); +class StorageHelper implements StorageRepository { + static final StorageHelper _instance = StorageHelper._internal(); + factory StorageHelper() => _instance; + StorageHelper._internal(); late BuildContext? _context; BuildContext? get context => _context; diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart index dd644f4f..007b1dda 100644 --- a/lib/flutter_flow/nav/nav.dart +++ b/lib/flutter_flow/nav/nav.dart @@ -86,20 +86,20 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { builder: (context, _) { return FutureBuilder( future: () async { - final bool isLogged = await StorageRepositoryImpl() - .get(SecureStorageKey.isLogged.value) == - 'true'; - final bool haveLocal = await StorageRepositoryImpl() - .get(SecureStorageKey.haveLocal.value) == - 'true'; - final bool haveUserUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.userUUID.key)) - ?.isNotEmpty ?? - false; - final bool haveDevUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.devUUID.key)) - ?.isNotEmpty ?? - false; + final bool isLogged = + await StorageHelper().get(SecureStorageKey.isLogged.value) == + 'true'; + final bool haveLocal = + await StorageHelper().get(SecureStorageKey.haveLocal.value) == + 'true'; + final bool haveUserUUID = + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) + ?.isNotEmpty ?? + false; + final bool haveDevUUID = + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) + ?.isNotEmpty ?? + false; if (isLogged && haveDevUUID && haveUserUUID) { return haveLocal diff --git a/lib/initialization.dart b/lib/initialization.dart index d8458100..27bdc509 100644 --- a/lib/initialization.dart +++ b/lib/initialization.dart @@ -16,7 +16,7 @@ import 'package:hub/flutter_flow/nav/nav.dart'; Future initializeApp() async { WidgetsFlutterBinding.ensureInitialized(); await _initializeTracking(); - await StorageRepositoryImpl().init(); + await StorageHelper().init(); await _initializeFirebase(); await _initializeNotificationService(); diff --git a/lib/main.dart b/lib/main.dart index d0ed8268..b97e09e4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -29,8 +29,8 @@ void main() async { Future _foregroundHandlerMessage(RemoteMessage message) async { if (message.data['click_action'] == 'enroll_cond') { - await StorageRepositoryImpl().set(SecureStorageKey.haveLocal.value, true); - StorageRepositoryImpl().context?.go('/homePage'); + await StorageHelper().set(SecureStorageKey.haveLocal.value, true); + StorageHelper().context?.go('/homePage'); } if (!Platform.isIOS) { @@ -43,8 +43,8 @@ Future _foregroundHandlerMessage(RemoteMessage message) async { Future _backgroundHandlerMessage(RemoteMessage message) async { if (message.data['click_action'] == 'enroll_cond') { - await StorageRepositoryImpl().set(SecureStorageKey.haveLocal.value, true); - StorageRepositoryImpl().context?.go('/homePage'); + await StorageHelper().set(SecureStorageKey.haveLocal.value, true); + StorageHelper().context?.go('/homePage'); } } @@ -137,8 +137,7 @@ class _AppState extends State { FirebaseMessaging.onMessage.listen(_foregroundHandlerMessage); FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async { if (message.data['click_action'] == 'enroll_cond') { - await StorageRepositoryImpl() - .set(SecureStorageKey.haveLocal.value, true); + await StorageHelper().set(SecureStorageKey.haveLocal.value, true); log('onMessageOpenedApp'); } else { onMessageReceived(message.data, message.notification!.body, @@ -148,8 +147,7 @@ class _AppState extends State { FirebaseMessaging.instance.getInitialMessage().then((message) async { if (message != null) { if (message.data['click_action'] == 'enroll_cond') { - await StorageRepositoryImpl() - .set(SecureStorageKey.haveLocal.value, true); + await StorageHelper().set(SecureStorageKey.haveLocal.value, true); log('getInitialMessage'); } } diff --git a/lib/pages/fast_pass_page/fast_pass_page_widget.dart b/lib/pages/fast_pass_page/fast_pass_page_widget.dart index 7005069f..6cc9a845 100644 --- a/lib/pages/fast_pass_page/fast_pass_page_widget.dart +++ b/lib/pages/fast_pass_page/fast_pass_page_widget.dart @@ -25,19 +25,15 @@ class _FastPassPageWidgetState extends State { Future> initVariables() async { final email = - (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; + (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; final name = - (await StorageRepositoryImpl().get(ProfileStorageKey.userName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userName.key)) ?? ''; final devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const createdAt = '0000-00-00 00:00:00'; final url = 'https://hub.freaccess.com.br/hub/fast-pass/$cliUUID'; final freUserData = diff --git a/lib/pages/forgot_password_page/forgot_password_screen.dart b/lib/pages/forgot_password_page/forgot_password_screen.dart index 9c86037b..bf737647 100644 --- a/lib/pages/forgot_password_page/forgot_password_screen.dart +++ b/lib/pages/forgot_password_page/forgot_password_screen.dart @@ -112,7 +112,7 @@ class _ForgotPasswordScreenState extends State ), onPressed: () async { context.pop(); - StorageRepositoryImpl().isRecovered = false; + StorageHelper().isRecovered = false; }, ), title: Text( diff --git a/lib/pages/liberation_history/liberation_history_model.dart b/lib/pages/liberation_history/liberation_history_model.dart index dd6dca6b..dc93f26b 100644 --- a/lib/pages/liberation_history/liberation_history_model.dart +++ b/lib/pages/liberation_history/liberation_history_model.dart @@ -36,15 +36,11 @@ class LiberationHistoryModel extends FlutterFlowModel { } Future init() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } Future answersRequest( diff --git a/lib/pages/message_history_page/message_history_page_model.dart b/lib/pages/message_history_page/message_history_page_model.dart index 9152fe73..68efb77d 100644 --- a/lib/pages/message_history_page/message_history_page_model.dart +++ b/lib/pages/message_history_page/message_history_page_model.dart @@ -41,15 +41,11 @@ class MessageHistoryPageModel } Future init() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } @override diff --git a/lib/pages/package_order_page/package_order_page.dart b/lib/pages/package_order_page/package_order_page.dart index 04efe6ee..8bbbd340 100644 --- a/lib/pages/package_order_page/package_order_page.dart +++ b/lib/pages/package_order_page/package_order_page.dart @@ -66,8 +66,7 @@ class _PackageOrderPage extends State { Future initDatabase() async { cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key) ?? - ''); + (await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? ''); } @override diff --git a/lib/pages/pets_on_the_property_page/pets_history_screen.dart b/lib/pages/pets_on_the_property_page/pets_history_screen.dart index 81166b5c..98ad75cb 100644 --- a/lib/pages/pets_on_the_property_page/pets_history_screen.dart +++ b/lib/pages/pets_on_the_property_page/pets_history_screen.dart @@ -308,18 +308,14 @@ class _PetsHistoryScreenState extends State } ], onTapCardItemAction: () async { - final devUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.devUUID.key)) ?? - ''; - final userUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.userUUID.key)) ?? - ''; - final cliUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.clientUUID.key)) ?? - ''; - final cliName = (await StorageRepositoryImpl() - .get(ProfileStorageKey.clientName.key)) ?? - ''; + final devUUID = + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + final userUUID = + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + final cliUUID = + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + final cliName = + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; await showDialog( useSafeArea: true, context: context, diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index 1407a649..c8473787 100644 --- a/lib/pages/pets_page/pets_page_model.dart +++ b/lib/pages/pets_page/pets_page_model.dart @@ -149,18 +149,13 @@ class PetsPageModel extends FlutterFlowModel { textControllerObservation = TextEditingController(); WidgetsBinding.instance.addPostFrameCallback((_) async { - devUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? - ''; + devUUID = await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; userUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? - ''; + await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; cliUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key) ?? - ''; + await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? ''; petAmountRegister = - await StorageRepositoryImpl().get(LocalsStorageKey.petAmount.key) ?? - ''; + await StorageHelper().get(LocalsStorageKey.petAmount.key) ?? ''; }); } diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index fa844ec9..80925889 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -23,16 +23,11 @@ class PreferencesPageModel with ChangeNotifier { Future _initialize() async { isFingerprint = - await StorageRepositoryImpl().get(LocalsStorageKey.fingerprint.key) == - 'true'; - isPerson = await StorageRepositoryImpl().get(LocalsStorageKey.person.key) == - 'true'; - isNotify = await StorageRepositoryImpl().get(LocalsStorageKey.notify.key) == - 'true'; - isAccess = await StorageRepositoryImpl().get(LocalsStorageKey.access.key) == - 'true'; - isPanic = - await StorageRepositoryImpl().get(LocalsStorageKey.panic.key) == 'true'; + await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true'; + isPerson = await StorageHelper().get(LocalsStorageKey.person.key) == 'true'; + isNotify = await StorageHelper().get(LocalsStorageKey.notify.key) == 'true'; + isAccess = await StorageHelper().get(LocalsStorageKey.access.key) == 'true'; + isPanic = await StorageHelper().get(LocalsStorageKey.panic.key) == 'true'; notifyListeners(); } @@ -41,9 +36,8 @@ class PreferencesPageModel with ChangeNotifier { } Future enablePerson(BuildContext context) async { - final String userDevUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.userDevUUID.key)) ?? - ''; + final String userDevUUID = + (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? ''; notifyListeners(); Share.share( FFLocalizations.of(context).getVariableText( @@ -70,8 +64,7 @@ class PreferencesPageModel with ChangeNotifier { .call(notifica: value) .then((value) async { if (value.jsonBody['error'] == false) { - await StorageRepositoryImpl() - .set(LocalsStorageKey.notify.key, !isNotify); + await StorageHelper().set(LocalsStorageKey.notify.key, !isNotify); content = FFLocalizations.of(context).getVariableText( enText: 'Notification changed successfully', ptText: 'Notificação alterada com sucesso', @@ -94,8 +87,7 @@ class PreferencesPageModel with ChangeNotifier { SnackBarUtil.showSnackBar(context, content, isError: true); }) .then((_) async => isNotify = - await StorageRepositoryImpl().get(LocalsStorageKey.notify.key) == - 'true') + await StorageHelper().get(LocalsStorageKey.notify.key) == 'true') .whenComplete(() => notifyListeners()); context.pop(); } @@ -146,13 +138,13 @@ class PreferencesPageModel with ChangeNotifier { Future toggleAccess(BuildContext context) async { onChange(String key) async { - await StorageRepositoryImpl().set(SecureStorageKey.accessPass.value, key); + await StorageHelper().set(SecureStorageKey.accessPass.value, key); await PhpGroup.changePass .call(newSenha: key) .then((value) async { final String content; if (jsonDecode(value.jsonBody['error'].toString()) == false) { - await StorageRepositoryImpl() + await StorageHelper() .set(LocalsStorageKey.access.key, isAccess ? false : true); notifyListeners(); content = FFLocalizations.of(context).getVariableText( @@ -176,8 +168,7 @@ class PreferencesPageModel with ChangeNotifier { SnackBarUtil.showSnackBar(context, content, isError: true); }) .then((_) async => isAccess = - await StorageRepositoryImpl().get(LocalsStorageKey.access.key) == - 'true') + await StorageHelper().get(LocalsStorageKey.access.key) == 'true') .whenComplete(() => notifyListeners()); } @@ -186,13 +177,13 @@ class PreferencesPageModel with ChangeNotifier { Future togglePanic(BuildContext context) async { onChange(String key) async { - await StorageRepositoryImpl().set(SecureStorageKey.panicPass.value, key); + await StorageHelper().set(SecureStorageKey.panicPass.value, key); await PhpGroup.changePanic .call(newSenhaPanico: key) .then((value) async { final String content; if (jsonDecode(value.jsonBody['error'].toString()) == false) { - await StorageRepositoryImpl() + await StorageHelper() .set(LocalsStorageKey.panic.key, isPanic ? 'false' : 'true'); notifyListeners(); content = FFLocalizations.of(context).getVariableText( @@ -216,8 +207,7 @@ class PreferencesPageModel with ChangeNotifier { SnackBarUtil.showSnackBar(context, content, isError: true); }) .then((_) async => isPanic = - await StorageRepositoryImpl().get(LocalsStorageKey.panic.key) == - 'true') + await StorageHelper().get(LocalsStorageKey.panic.key) == 'true') .whenComplete(() => notifyListeners()); } @@ -232,15 +222,14 @@ class PreferencesPageModel with ChangeNotifier { onChange(String? key) async { isFingerprint = !isFingerprint; - await StorageRepositoryImpl() + await StorageHelper() .set(SecureStorageKey.fingerprintPass.value, key ?? ''); - await StorageRepositoryImpl().set( + await StorageHelper().set( LocalsStorageKey.fingerprint.key, isFingerprint ? 'true' : 'false'); notifyListeners(); SnackBarUtil.showSnackBar(context, content); isFingerprint = - await StorageRepositoryImpl().get(LocalsStorageKey.fingerprint.key) == - 'true'; + await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true'; } isFingerprint ? onChange(null) : _showPassKey(context, onChange); diff --git a/lib/pages/qr_code_page/qr_code_page_model.dart b/lib/pages/qr_code_page/qr_code_page_model.dart index f5d6a8b0..bec899f0 100644 --- a/lib/pages/qr_code_page/qr_code_page_model.dart +++ b/lib/pages/qr_code_page/qr_code_page_model.dart @@ -30,11 +30,9 @@ class QrCodePageModel extends FlutterFlowModel { Future initVariable() async { isFingerprint = - await StorageRepositoryImpl().get(LocalsStorageKey.fingerprint.key) == - 'true'; + await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true'; userDevUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.userDevUUID.key) ?? - ''; + await StorageHelper().get(ProfileStorageKey.userDevUUID.key) ?? ''; safeSetState?.call(); } diff --git a/lib/pages/qr_code_page/qr_code_page_widget.dart b/lib/pages/qr_code_page/qr_code_page_widget.dart index 1c92b82d..0fa56484 100644 --- a/lib/pages/qr_code_page/qr_code_page_widget.dart +++ b/lib/pages/qr_code_page/qr_code_page_widget.dart @@ -396,7 +396,7 @@ class _QrCodePageWidgetState extends State await BiometricHelper.authenticateBiometric().then((value) async { if (value == false) throw Exception('Biometric authentication failed'); - final key = await StorageRepositoryImpl() + final key = await StorageHelper() .get(SecureStorageKey.fingerprintPass.value); if (key == null || key.isEmpty) throw Exception('No key found'); safeSetState(() { diff --git a/lib/pages/reception_page/reception_page_model.dart b/lib/pages/reception_page/reception_page_model.dart index 0cbb2fba..e72e9b96 100644 --- a/lib/pages/reception_page/reception_page_model.dart +++ b/lib/pages/reception_page/reception_page_model.dart @@ -5,9 +5,8 @@ import 'package:share_plus/share_plus.dart'; class ReceptionPageModel with ChangeNotifier { Future getIdenfifier(BuildContext context) async { - final String userDevUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.userDevUUID.key)) ?? - ''; + final String userDevUUID = + (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? ''; notifyListeners(); Share.share( diff --git a/lib/pages/reception_page/reception_page_widget.dart b/lib/pages/reception_page/reception_page_widget.dart index 6ba4401e..e7d5718e 100644 --- a/lib/pages/reception_page/reception_page_widget.dart +++ b/lib/pages/reception_page/reception_page_widget.dart @@ -61,7 +61,7 @@ class _ReceptionPageWidgetState extends State double limitedBodyFontSize = LimitedFontSizeUtil.getBodyFontSize(context); double limitedInputFontSize = LimitedFontSizeUtil.getInputFontSize(context); - StorageRepositoryImpl().context = context; + StorageHelper().context = context; return ChangeNotifierProvider( create: (context) => ReceptionPageModel(), child: Scaffold( diff --git a/lib/pages/reservation_page/reservation_page_widget.dart b/lib/pages/reservation_page/reservation_page_widget.dart index ce32974a..a75cd567 100644 --- a/lib/pages/reservation_page/reservation_page_widget.dart +++ b/lib/pages/reservation_page/reservation_page_widget.dart @@ -23,19 +23,15 @@ class _ReservationPageWidgetState extends State { Future> initVariables() async { final email = - (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; + (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; final name = - (await StorageRepositoryImpl().get(ProfileStorageKey.userName.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userName.key)) ?? ''; final devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; final userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; final clientId = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; const createdAt = '0000-00-00 00:00:00'; final url = 'https://hub.freaccess.com.br/hub/reservation/$clientId'; final freUserData = diff --git a/lib/pages/residents_on_the_property/residents_on_the_property_model.dart b/lib/pages/residents_on_the_property/residents_on_the_property_model.dart index 067f574e..02c42ef4 100644 --- a/lib/pages/residents_on_the_property/residents_on_the_property_model.dart +++ b/lib/pages/residents_on_the_property/residents_on_the_property_model.dart @@ -18,12 +18,9 @@ class ResidentsOnThePropertyModel } void initVariables() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; onRefresh?.call(); } diff --git a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart index 651eae66..f7248d93 100644 --- a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart +++ b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart @@ -230,15 +230,11 @@ class ScheduleCompleteVisitPageModel } Future _initVariables() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } @override diff --git a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart index 09ed7282..bafb04bb 100644 --- a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart +++ b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart @@ -36,15 +36,11 @@ class _VisitHistoryWidgetState extends State List _visitWrap = []; Future _initVariables() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; userUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; } @override @@ -269,18 +265,14 @@ class _VisitHistoryWidgetState extends State }, ], onTapCardItemAction: () async { - final devUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.devUUID.key)) ?? - ''; - final userUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.userUUID.key)) ?? - ''; - final cliUUID = (await StorageRepositoryImpl() - .get(ProfileStorageKey.clientUUID.key)) ?? - ''; - final cliName = (await StorageRepositoryImpl() - .get(ProfileStorageKey.clientName.key)) ?? - ''; + final devUUID = + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + final userUUID = + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + final cliUUID = + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + final cliName = + (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; await showDialog( useSafeArea: true, diff --git a/lib/pages/sign_in_page/sign_in_page_widget.dart b/lib/pages/sign_in_page/sign_in_page_widget.dart index e7e18250..e632670a 100644 --- a/lib/pages/sign_in_page/sign_in_page_widget.dart +++ b/lib/pages/sign_in_page/sign_in_page_widget.dart @@ -33,7 +33,7 @@ class _SignInPageWidgetState extends State { @override Widget build(BuildContext context) { - StorageRepositoryImpl().context = context; + StorageHelper().context = context; return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/pages/sign_up_page/sign_up_page_widget.dart b/lib/pages/sign_up_page/sign_up_page_widget.dart index 324b05e0..e91ac753 100644 --- a/lib/pages/sign_up_page/sign_up_page_widget.dart +++ b/lib/pages/sign_up_page/sign_up_page_widget.dart @@ -36,7 +36,7 @@ class _SignUpPageWidgetState extends State { @override Widget build(BuildContext context) { - StorageRepositoryImpl().context = context; + StorageHelper().context = context; return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/pages/visits_on_the_property/model.dart b/lib/pages/visits_on_the_property/model.dart index c9f031f8..2ddcd047 100644 --- a/lib/pages/visits_on_the_property/model.dart +++ b/lib/pages/visits_on_the_property/model.dart @@ -30,12 +30,9 @@ class VisitsModel extends FlutterFlowModel { void dispose() {} Future initAsync() async { - devUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? - ''; + devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; cliUUID = - (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? - ''; + (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; onRefresh?.call(); } diff --git a/lib/pages/welcome_page/welcome_page_widget.dart b/lib/pages/welcome_page/welcome_page_widget.dart index 479a73d6..5b3f46ea 100644 --- a/lib/pages/welcome_page/welcome_page_widget.dart +++ b/lib/pages/welcome_page/welcome_page_widget.dart @@ -31,16 +31,13 @@ class _WelcomePageWidgetState extends State { // On page load action. SchedulerBinding.instance.addPostFrameCallback((_) async { if (isAndroid == true) { - await StorageRepositoryImpl() - .set(SecureStorageKey.deviceType.value, 'Android'); + await StorageHelper().set(SecureStorageKey.deviceType.value, 'Android'); setState(() {}); } else if (isiOS == true) { - await StorageRepositoryImpl() - .set(SecureStorageKey.deviceType.value, 'iOS'); + await StorageHelper().set(SecureStorageKey.deviceType.value, 'iOS'); setState(() {}); } else { - await StorageRepositoryImpl() - .set(SecureStorageKey.deviceType.value, 'Web'); + await StorageHelper().set(SecureStorageKey.deviceType.value, 'Web'); setState(() {}); } }); @@ -54,7 +51,7 @@ class _WelcomePageWidgetState extends State { @override Widget build(BuildContext context) { - StorageRepositoryImpl().context = context; + StorageHelper().context = context; return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/shared/utils/share_util.dart b/lib/shared/utils/share_util.dart index d4288e70..a9c410f7 100644 --- a/lib/shared/utils/share_util.dart +++ b/lib/shared/utils/share_util.dart @@ -3,10 +3,8 @@ import 'package:share_plus/share_plus.dart'; class ShareUtil { static Future showShare(payload) async { - final cliName = - await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key); - final cliUUID = - await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); + final cliName = await StorageHelper().get(ProfileStorageKey.clientName.key); + final cliUUID = await StorageHelper().get(ProfileStorageKey.clientUUID.key); for (var i = 0; i < payload['convites'].length; i++) { await Share.share('''