diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart index 8706e9a0..fd6b3520 100644 --- a/integration_test/app_test.dart +++ b/integration_test/app_test.dart @@ -3,8 +3,8 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:hub/flutter_flow/random_data_util.dart'; import 'package:hub/main.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:integration_test/integration_test.dart'; late WidgetTester widget; diff --git a/lib/backend/api_requests/api_calls.dart b/lib/backend/api_requests/api_calls.dart index fcef9a98..96038903 100644 --- a/lib/backend/api_requests/api_calls.dart +++ b/lib/backend/api_requests/api_calls.dart @@ -4,8 +4,8 @@ import 'dart:developer'; import 'package:flutter/foundation.dart'; import 'package:hub/backend/notifications/firebase_messaging_service.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/log_util.dart'; import 'package:hub/shared/utils/validator_util.dart'; diff --git a/lib/backend/notifications/firebase_messaging_service.dart b/lib/backend/notifications/firebase_messaging_service.dart index 7dc5fd4f..390a2036 100644 --- a/lib/backend/notifications/firebase_messaging_service.dart +++ b/lib/backend/notifications/firebase_messaging_service.dart @@ -2,8 +2,8 @@ import 'dart:developer'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:hub/backend/api_requests/api_calls.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/log_util.dart'; import 'notification_service.dart'; diff --git a/lib/backend/notifications/notification_service.dart b/lib/backend/notifications/notification_service.dart index e6512034..db0a7c0f 100644 --- a/lib/backend/notifications/notification_service.dart +++ b/lib/backend/notifications/notification_service.dart @@ -8,8 +8,8 @@ import 'package:hub/flutter_flow/flutter_flow_icon_button.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/dialog_util.dart'; Future onMessageReceived(Map payload, String? extra, String? handleClick) async { diff --git a/lib/components/molecular_components/order_filter_modal/order_filter_modal_widget.dart b/lib/components/molecular_components/order_filter_modal/order_filter_modal_widget.dart index 46f268bf..4c74c366 100644 --- a/lib/components/molecular_components/order_filter_modal/order_filter_modal_widget.dart +++ b/lib/components/molecular_components/order_filter_modal/order_filter_modal_widget.dart @@ -4,7 +4,7 @@ import 'package:hub/components/molecular_components/order_filter_modal/order_fil import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; // ignore: unused_import import 'package:hub/shared/utils/limited_text_size.dart'; 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 8b7c9df2..8d5da9a3 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 @@ -3,8 +3,8 @@ import 'package:hub/components/organism_components/bottom_arrow_linked_locals_co import 'package:hub/components/templates_components/card_item_template_component/card_item_template_component_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; import 'package:hub/shared/utils/log_util.dart'; diff --git a/lib/components/organism_components/local_profile_component/local_profile_component_model.dart b/lib/components/organism_components/local_profile_component/local_profile_component_model.dart index bccb05c5..300dae93 100644 --- a/lib/components/organism_components/local_profile_component/local_profile_component_model.dart +++ b/lib/components/organism_components/local_profile_component/local_profile_component_model.dart @@ -1,5 +1,5 @@ -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'local_profile_component_widget.dart' show LocalProfileComponentWidget; diff --git a/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart b/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart index 30214c33..144f440b 100644 --- a/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart +++ b/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart @@ -3,8 +3,8 @@ import 'dart:developer'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import '/flutter_flow/custom_functions.dart' as functions; import '/flutter_flow/flutter_flow_theme.dart'; diff --git a/lib/components/organism_components/menu_component/menu_component_model.dart b/lib/components/organism_components/menu_component/menu_component_model.dart index 4364203d..cbbed6e1 100644 --- a/lib/components/organism_components/menu_component/menu_component_model.dart +++ b/lib/components/organism_components/menu_component/menu_component_model.dart @@ -10,8 +10,8 @@ import 'package:hub/components/organism_components/menu_staggered_view_component import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/shared/extensions/dialog_extensions.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/services/authentication/authentication_service.dart'; import 'package:material_symbols_icons/symbols.dart'; 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 a8ae03e4..247ec513 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 @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:hub/backend/api_requests/api_manager.dart'; import 'package:hub/components/organism_components/schedule_visit_detail/schedule_visit_detail_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + // ignore: unused_import import 'package:intl/intl.dart'; 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 211ab6ce..67f2947d 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 @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hub/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class UpArrowLinkedLocalsComponentModel extends FlutterFlowModel { late final String devUUID; 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 5e38346f..d28b326c 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 @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + import '/backend/api_requests/api_calls.dart'; import '/flutter_flow/flutter_flow_util.dart'; 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 bb0d3126..d79132e3 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 @@ -3,8 +3,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; 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 b9865a35..b7d768b8 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 @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hub/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; class LiberationHistoryItemDetailsTemplateComponentModel extends FlutterFlowModel { 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 f7366c79..7a214573 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 @@ -4,8 +4,9 @@ import 'package:flutter/material.dart'; import 'package:hub/backend/api_requests/api_manager.dart'; import 'package:hub/components/templates_components/provisional_schedule_template/provisional_shcedule_template_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class ScheduleProvisionalVisitPageModel extends FlutterFlowModel { String cliUUID = ''; 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 494337f1..f7ff104f 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 @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/validator_util.dart'; import '/backend/api_requests/api_calls.dart'; 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 332234e6..fa7df0ce 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 @@ -4,9 +4,9 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:hub/components/atomic_components/shared_components_atoms/atom_image_svg_theme.dart'; import 'package:hub/shared/components/atoms/atom_terms_of_use.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; import 'package:hub/shared/utils/validator_util.dart'; import '/flutter_flow/flutter_flow_animations.dart'; 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 c9153f31..2a2aa5e6 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 @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + import '/backend/api_requests/api_calls.dart'; import '/flutter_flow/flutter_flow_util.dart'; 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 aee5f3da..ff8624ea 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 @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:hub/backend/api_requests/api_manager.dart'; import 'package:hub/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class VisitorSearchModalTemplateComponentModel extends FlutterFlowModel { late final String devUUID; diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart index e82d3691..8eb651c3 100644 --- a/lib/flutter_flow/nav/nav.dart +++ b/lib/flutter_flow/nav/nav.dart @@ -29,8 +29,8 @@ import 'package:hub/pages/sign_up_page/sign_up_page_widget.dart'; import 'package:hub/pages/vehicles_on_the_property/vehicles_on_the_property.dart'; import 'package:hub/pages/visits_on_the_property/visits_on_the_property_screen.dart'; import 'package:hub/pages/welcome_page/welcome_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:provider/provider.dart'; export 'package:go_router/go_router.dart'; diff --git a/lib/main.dart b/lib/main.dart index 55765c25..73b3123b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -18,8 +18,8 @@ import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/internationalization.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/pages/forgot_password_page/forgot_password_screen.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/services/localization/localization_service.dart'; import 'package:responsive_framework/responsive_framework.dart'; diff --git a/lib/pages/acess_history_page/acess_history_page_model.dart b/lib/pages/acess_history_page/acess_history_page_model.dart index 046011df..3bd7ff88 100644 --- a/lib/pages/acess_history_page/acess_history_page_model.dart +++ b/lib/pages/acess_history_page/acess_history_page_model.dart @@ -4,8 +4,9 @@ import 'package:hub/components/molecular_components/message_opt_modal/opt_modal_ import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/flutter_flow/request_manager.dart'; import 'package:hub/pages/acess_history_page/acess_history_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class AcessHistoryPageModel extends FlutterFlowModel { late final String devUUID; 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 4cb346c3..8df206f9 100644 --- a/lib/pages/fast_pass_page/fast_pass_page_widget.dart +++ b/lib/pages/fast_pass_page/fast_pass_page_widget.dart @@ -7,8 +7,8 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart' as hub; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/webview_util.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:webview_flutter/webview_flutter.dart'; @@ -25,11 +25,11 @@ class _FastPassPageWidgetState extends State { late InAppWebViewController _controllerIOS; Future> initVariables() async { - final email = (await StorageHelper().g(hub.SecureStorageKey.email.value)) ?? ''; - final name = (await StorageHelper().g(hub.KeychainStorageKey.userName.value)) ?? ''; - final devUUID = (await StorageHelper().g(hub.KeychainStorageKey.devUUID.value)) ?? ''; - final userUUID = (await StorageHelper().g(hub.KeychainStorageKey.userUUID.value)) ?? ''; - final cliUUID = (await StorageHelper().g(hub.KeychainStorageKey.clientUUID.value)) ?? ''; + final email = (await StorageHelper().g(SecureStorageKey.email.value)) ?? ''; + final name = (await StorageHelper().g(KeychainStorageKey.userName.value)) ?? ''; + final devUUID = (await StorageHelper().g(KeychainStorageKey.devUUID.value)) ?? ''; + final userUUID = (await StorageHelper().g(KeychainStorageKey.userUUID.value)) ?? ''; + final cliUUID = (await StorageHelper().g(KeychainStorageKey.clientUUID.value)) ?? ''; 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 81aa567e..bbe26afa 100644 --- a/lib/pages/forgot_password_page/forgot_password_screen.dart +++ b/lib/pages/forgot_password_page/forgot_password_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import '../../flutter_flow/flutter_flow_animations.dart'; import '../../flutter_flow/flutter_flow_icon_button.dart'; diff --git a/lib/pages/home_page/home_page_model.dart b/lib/pages/home_page/home_page_model.dart index 17fc9a07..db3eb7e1 100644 --- a/lib/pages/home_page/home_page_model.dart +++ b/lib/pages/home_page/home_page_model.dart @@ -6,8 +6,9 @@ import 'package:hub/components/organism_components/menu_component/menu_component import 'package:hub/components/organism_components/message_well_component/message_well_component_model.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/pages/home_page/home_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class HomePageModel extends FlutterFlowModel { HomePageModel({required this.safeSetState}); diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index ca2ff3ce..02deb34a 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -7,7 +7,7 @@ import 'package:hub/flutter_flow/flutter_flow_icon_button.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/pages/home_page/home_page_model.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/widgets/drawer_widget/drawer_widget.dart'; class HomePageWidget extends StatefulWidget { diff --git a/lib/pages/liberation_history/liberation_history_model.dart b/lib/pages/liberation_history/liberation_history_model.dart index c7b7ea6e..9b107572 100644 --- a/lib/pages/liberation_history/liberation_history_model.dart +++ b/lib/pages/liberation_history/liberation_history_model.dart @@ -3,8 +3,9 @@ import 'package:hub/backend/api_requests/api_calls.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/flutter_flow/request_manager.dart'; import 'package:hub/pages/liberation_history/liberation_history_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class LiberationHistoryModel extends FlutterFlowModel { late final String devUUID; 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 b51112df..7db66d8a 100644 --- a/lib/pages/message_history_page/message_history_page_model.dart +++ b/lib/pages/message_history_page/message_history_page_model.dart @@ -3,8 +3,8 @@ import 'package:hub/backend/api_requests/api_manager.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/flutter_flow/request_manager.dart'; import 'package:hub/pages/message_history_page/message_history_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; class MessageHistoryPageModel extends FlutterFlowModel { late final String devUUID; diff --git a/lib/pages/package_order_page/package_order_page.dart b/lib/pages/package_order_page/package_order_page.dart index 80583700..c3d352f4 100644 --- a/lib/pages/package_order_page/package_order_page.dart +++ b/lib/pages/package_order_page/package_order_page.dart @@ -9,8 +9,8 @@ import 'package:hub/components/templates_components/details_component/details_co import 'package:hub/flutter_flow/flutter_flow_icon_button.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; import 'package:hub/shared/utils/log_util.dart'; diff --git a/lib/pages/people_on_the_property_page/people_on_the_property_page_model.dart b/lib/pages/people_on_the_property_page/people_on_the_property_page_model.dart index d99be82b..d706d938 100644 --- a/lib/pages/people_on_the_property_page/people_on_the_property_page_model.dart +++ b/lib/pages/people_on_the_property_page/people_on_the_property_page_model.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/pages/people_on_the_property_page/people_on_the_property_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + class PeopleOnThePropertyPageModel extends FlutterFlowModel { PeopleOnThePropertyPageModel({this.onRefresh}); 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 a7ee40c4..50c00460 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 @@ -8,8 +8,8 @@ import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/pages/pets_page/pets_page_model.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; import 'package:hub/shared/utils/log_util.dart'; diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index ec3d6ccc..4d4fd096 100644 --- a/lib/pages/pets_page/pets_page_model.dart +++ b/lib/pages/pets_page/pets_page_model.dart @@ -12,8 +12,8 @@ import 'package:hub/flutter_flow/flutter_flow_widgets.dart'; import 'package:hub/flutter_flow/form_field_controller.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/pages/pets_page/pets_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/image_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index f4fadd91..2339d95a 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -5,8 +5,8 @@ import 'package:hub/backend/api_requests/api_calls.dart'; import 'package:hub/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/services/authentication/authentication_service.dart'; import 'package:hub/shared/services/localization/localization_service.dart'; import 'package:share_plus/share_plus.dart'; 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 6bd4c12b..002192ad 100644 --- a/lib/pages/qr_code_page/qr_code_page_model.dart +++ b/lib/pages/qr_code_page/qr_code_page_model.dart @@ -4,8 +4,8 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/pages/qr_code_page/qr_code_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:qr_flutter/qr_flutter.dart'; class QrCodePageModel extends FlutterFlowModel { 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 23c8e894..b2005f96 100644 --- a/lib/pages/qr_code_page/qr_code_page_widget.dart +++ b/lib/pages/qr_code_page/qr_code_page_widget.dart @@ -17,8 +17,8 @@ import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/flutter_flow_widgets.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/pages/qr_code_page/qr_code_page_model.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/biometric_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; diff --git a/lib/pages/reception_page/reception_page_model.dart b/lib/pages/reception_page/reception_page_model.dart index bb4c4727..e0afe000 100644 --- a/lib/pages/reception_page/reception_page_model.dart +++ b/lib/pages/reception_page/reception_page_model.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:hub/flutter_flow/internationalization.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:share_plus/share_plus.dart'; class ReceptionPageModel with ChangeNotifier { diff --git a/lib/pages/reception_page/reception_page_widget.dart b/lib/pages/reception_page/reception_page_widget.dart index 77d4c65f..dde3e076 100644 --- a/lib/pages/reception_page/reception_page_widget.dart +++ b/lib/pages/reception_page/reception_page_widget.dart @@ -10,7 +10,7 @@ import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/flutter_flow_widgets.dart'; import 'package:hub/pages/reception_page/reception_page_model.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/services/authentication/authentication_service.dart'; import 'package:hub/shared/services/localization/localization_service.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; diff --git a/lib/pages/reservation_page/reservation_page_widget.dart b/lib/pages/reservation_page/reservation_page_widget.dart index 828f57b4..37b0fe1a 100644 --- a/lib/pages/reservation_page/reservation_page_widget.dart +++ b/lib/pages/reservation_page/reservation_page_widget.dart @@ -5,8 +5,8 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:hub/flutter_flow/internationalization.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart' as hub; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/utils/webview_util.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:webview_flutter/webview_flutter.dart'; @@ -22,11 +22,11 @@ class _ReservationPageWidgetState extends State { late WebViewController _controllerAll; Future> initVariables() async { - final email = (await StorageHelper().g(hub.SecureStorageKey.email.value)) ?? ''; - final name = (await StorageHelper().g(hub.KeychainStorageKey.userName.value)) ?? ''; - final devUUID = (await StorageHelper().g(hub.KeychainStorageKey.devUUID.value)) ?? ''; - final userUUID = (await StorageHelper().g(hub.KeychainStorageKey.userUUID.value)) ?? ''; - final clientId = (await StorageHelper().g(hub.KeychainStorageKey.clientUUID.value)) ?? ''; + final email = (await StorageHelper().g(SecureStorageKey.email.value)) ?? ''; + final name = (await StorageHelper().g(KeychainStorageKey.userName.value)) ?? ''; + final devUUID = (await StorageHelper().g(KeychainStorageKey.devUUID.value)) ?? ''; + final userUUID = (await StorageHelper().g(KeychainStorageKey.userUUID.value)) ?? ''; + final clientId = (await StorageHelper().g(KeychainStorageKey.clientUUID.value)) ?? ''; 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/schedule_complete_visit_page/schedule_complete_visit_page_model.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart index 00d863d2..c9d070c9 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 @@ -8,8 +8,9 @@ import 'package:hub/flutter_flow/form_field_controller.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/flutter_flow/request_manager.dart'; import 'package:hub/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + import 'package:hub/shared/mixins/status_mixin.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; import 'package:share_plus/share_plus.dart'; 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 ccc84b83..c20c8927 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 @@ -5,8 +5,8 @@ import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart'; import 'package:hub/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/mixins/status_mixin.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; 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 471bbee2..c3d22f90 100644 --- a/lib/pages/sign_in_page/sign_in_page_widget.dart +++ b/lib/pages/sign_in_page/sign_in_page_widget.dart @@ -1,4 +1,4 @@ -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/mixins/switcher_mixin.dart'; import '/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart'; 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 00d95f56..86425e6e 100644 --- a/lib/pages/sign_up_page/sign_up_page_widget.dart +++ b/lib/pages/sign_up_page/sign_up_page_widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/mixins/switcher_mixin.dart'; import '/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart'; diff --git a/lib/pages/visits_on_the_property/model.dart b/lib/pages/visits_on_the_property/model.dart index 2ec95700..c880c726 100644 --- a/lib/pages/visits_on_the_property/model.dart +++ b/lib/pages/visits_on_the_property/model.dart @@ -4,8 +4,8 @@ import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/internationalization.dart'; import 'package:hub/pages/vehicles_on_the_property/vehicles_on_the_property.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; class VisitsModel extends FlutterFlowModel { static VisitsModel? _instance; diff --git a/lib/pages/welcome_page/welcome_page_widget.dart b/lib/pages/welcome_page/welcome_page_widget.dart index 96cc2ec9..6effcb76 100644 --- a/lib/pages/welcome_page/welcome_page_widget.dart +++ b/lib/pages/welcome_page/welcome_page_widget.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/mixins/switcher_mixin.dart'; import '/components/templates_components/welcome_template_component/welcome_template_component_widget.dart'; diff --git a/lib/shared/helpers/database_helper.dart b/lib/shared/helpers/database/database_helper.dart similarity index 78% rename from lib/shared/helpers/database_helper.dart rename to lib/shared/helpers/database/database_helper.dart index 84b33c35..8163308b 100644 --- a/lib/shared/helpers/database_helper.dart +++ b/lib/shared/helpers/database/database_helper.dart @@ -1,5 +1,5 @@ -import 'package:hub/shared/helpers/keychain_storage.dart'; -import 'package:hub/shared/helpers/license_helper.dart'; +import 'package:hub/shared/helpers/license/license_helper.dart'; +import 'package:hub/shared/helpers/storage/keychain_storage.dart'; import 'package:hub/shared/services/license/license_service.dart'; import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart'; @@ -22,7 +22,7 @@ class DatabaseStorage { } Future init() async { - if (_database != null && _database!.isOpen) return; + if (_database != null) return; _database = await openDatabase( join(await getDatabasesPath(), _dbName), version: _dbVersion, @@ -30,23 +30,22 @@ class DatabaseStorage { onUpgrade: _onUpgrade, onDowngrade: _onDowngrade, ); + await LicenseService.setupLicense(database); } Future _onCreate(Database database, int version) async { log('Creating database...'); - await database.execute(KeychainDelegate.createTableQuery); - await database.execute(LicenseDelegate.createTableQuery); - await LicenseService.setupLicense(database); + await database.execute(KeychainHelper.createTableQuery); + await database.execute(LicenseHelper.createTableQuery); } Future _onUpgrade(Database database, int oldVersion, int newVersion) async { log('Upgrading database from version $oldVersion to $newVersion...'); if (oldVersion < 2) { - await database.execute(LicenseDelegate.createTableQuery); + await database.execute(LicenseHelper.createTableQuery); await LicenseService.setupLicense(database); } } Future _onDowngrade(Database database, int oldVersion, int newVersion) async {} - } diff --git a/lib/shared/helpers/license/license_helper.dart b/lib/shared/helpers/license/license_helper.dart new file mode 100644 index 00000000..52ee305a --- /dev/null +++ b/lib/shared/helpers/license/license_helper.dart @@ -0,0 +1,185 @@ +import 'dart:developer'; + +import 'package:hub/shared/helpers/database/database_helper.dart'; +import 'package:sqflite/sqflite.dart'; + +enum InactiveLicenseKey { + residents, + vehicles, + openedVisits, +} + +enum ActiveLicenseKey { + messages, + liberations, + reservations, + access, + orders, + completeSchedule, + providerSchedule, + deliverySchedule, + fastPass, +} + +extension InactiveLicenseKeyExtension on InactiveLicenseKey { + String get value { + switch (this) { + case InactiveLicenseKey.residents: + return 'FRE-HUB-RESIDENTS'; + case InactiveLicenseKey.vehicles: + return 'FRE-HUB-VEHICLES'; + case InactiveLicenseKey.openedVisits: + return 'FRE-HUB-OPENED-VISITS'; + default: + return ''; + } + } +} + +extension ActiveLicenseKeyExtension on ActiveLicenseKey { + String get value { + switch (this) { + case ActiveLicenseKey.messages: + return 'FRE-HUB-MESSAGES'; + case ActiveLicenseKey.liberations: + return 'FRE-HUB-LIBERATIONS'; + case ActiveLicenseKey.reservations: + return 'FRE-HUB-RESERVATIONS'; + case ActiveLicenseKey.access: + return 'FRE-HUB-ACCESS'; + case ActiveLicenseKey.orders: + return 'FRE-HUB-ORDERS'; + case ActiveLicenseKey.completeSchedule: + return 'FRE-HUB-COMPLETE-SCHEDULE'; + case ActiveLicenseKey.providerSchedule: + return 'FRE-HUB-AGE-PROV-PRESTADOR'; + case ActiveLicenseKey.deliverySchedule: + return 'FRE-HUB-AGE-PROV-DELIVERY'; + case ActiveLicenseKey.fastPass: + return 'FRE-HUB-FASTPASS'; + default: + return ''; + } + } +} + +enum LicenseStorageKey { + messages, + liberations, + reservations, + access, + openedVisits, + vehicles, + residents, + pets, + orders, + completeSchedule, + providerSchedule, + deliverySchedule, + fastPass, +} + +extension LicenseKeyExtension on LicenseStorageKey { + String get value { + switch (this) { + case LicenseStorageKey.messages: + return 'FRE-HUB-MESSAGES'; + case LicenseStorageKey.liberations: + return 'FRE-HUB-LIBERATIONS'; + case LicenseStorageKey.reservations: + return 'FRE-HUB-RESERVATIONS'; + case LicenseStorageKey.access: + return 'FRE-HUB-ACCESS'; + case LicenseStorageKey.openedVisits: + return 'FRE-HUB-OPENED-VISITS'; + case LicenseStorageKey.vehicles: + return 'FRE-HUB-VEHICLES'; + case LicenseStorageKey.residents: + return 'FRE-HUB-RESIDENTS'; + case LicenseStorageKey.pets: + return 'FRE-HUB-PETS'; + case LicenseStorageKey.orders: + return 'FRE-HUB-ORDERS'; + case LicenseStorageKey.completeSchedule: + return 'FRE-HUB-COMPLETE-SCHEDULE'; + case LicenseStorageKey.providerSchedule: + return 'FRE-HUB-AGE-PROV-PRESTADOR'; + case LicenseStorageKey.deliverySchedule: + return 'FRE-HUB-AGE-PROV-DELIVERY'; + case LicenseStorageKey.fastPass: + return 'FRE-HUB-FASTPASS'; + default: + return ''; + } + } +} + +class LicenseHelper { + LicenseHelper._(); + + static final LicenseHelper instance = LicenseHelper._(); + + static const String tableLicense = 'license'; + + static String get createTableQuery => ''' + CREATE TABLE $tableLicense ( + key TEXT UNIQUE, + display TEXT, + expirationDate TEXT, + startDate TEXT, + quantity TEXT + ); + '''; + + Future init() async { + await DatabaseStorage.instance.init(); + } + + static Future insertLicenseFoo(final List key, final String display) async { + for (var element in key) { + DatabaseStorage.database.insert( + tableLicense, + { + 'key': element, + 'display': display, + 'expirationDate': '', + 'startDate': '', + 'quantity': '', + }, + conflictAlgorithm: ConflictAlgorithm.ignore, + ); + } + } + + Future g(String key) async { + var response = await DatabaseStorage.database.query(tableLicense, where: 'key = ?', whereArgs: [key]); + if (response.isEmpty) { + return null; + } + return response.first['value'].toString(); + } + + Future s(String key, T value) async { + log('setLicense($key, $value)'); + value as Map; + + await DatabaseStorage.database.insert( + tableLicense, + { + 'key': key, + 'display': value['display'], + 'expirationDate': value['expirationDate'], + 'startDate': value['startDate'], + 'quantity': value['quantity'], + }, + conflictAlgorithm: ConflictAlgorithm.replace); + } + + Future d(String key) async { + await DatabaseStorage.database.delete(tableLicense, where: 'key = ?', whereArgs: [key]); + } + + Future c() async { + await DatabaseStorage.database.delete(tableLicense); + } +} diff --git a/lib/shared/helpers/license_helper.dart b/lib/shared/helpers/license_helper.dart deleted file mode 100644 index 17896651..00000000 --- a/lib/shared/helpers/license_helper.dart +++ /dev/null @@ -1,80 +0,0 @@ -import 'dart:developer'; - -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/database_helper.dart'; -import 'package:sqflite/sqflite.dart'; - -class LicenseDelegate implements BaseStorage { - LicenseDelegate._(); - - static final LicenseDelegate instance = LicenseDelegate._(); - - static const String tableLicense = 'license'; - - static String get createTableQuery => ''' - CREATE TABLE $tableLicense ( - key TEXT UNIQUE, - display TEXT, - expirationDate TEXT, - startDate TEXT, - quantity TEXT - ); - '''; - - @override - Future init() async { - await DatabaseStorage.instance.init(); - } - - @override - Future get(String key) async { - var response = await DatabaseStorage.database.query(tableLicense, where: 'key = ?', whereArgs: [key]); - if (response.isEmpty) { - return null; - } - return response.first['value'].toString(); - } - - @override - Future set(String key, T value) async { - log('setLicense($key, $value)'); - value as Map; - - await DatabaseStorage.database.insert( - tableLicense, - { - 'key': key, - 'display': value['display'], - 'expirationDate': value['expirationDate'], - 'startDate': value['startDate'], - 'quantity': value['quantity'], - }, - conflictAlgorithm: ConflictAlgorithm.replace); - } - - static Future insertLicenseFoo(final List key, final String display) async { - for (var element in key) { - DatabaseStorage.database.insert( - LicenseDelegate.tableLicense, - { - 'key': element, - 'display': display, - 'expirationDate': '', - 'startDate': '', - 'quantity': '', - }, - conflictAlgorithm: ConflictAlgorithm.ignore, - ); - } - } - - @override - Future delete(String key) async { - await DatabaseStorage.database.delete(tableLicense, where: 'key = ?', whereArgs: [key]); - } - - @override - Future clearAll() async { - await DatabaseStorage.database.delete(tableLicense); - } -} diff --git a/lib/shared/helpers/base_storage.dart b/lib/shared/helpers/storage/base_storage.dart similarity index 54% rename from lib/shared/helpers/base_storage.dart rename to lib/shared/helpers/storage/base_storage.dart index 76efbc99..972734bf 100644 --- a/lib/shared/helpers/base_storage.dart +++ b/lib/shared/helpers/storage/base_storage.dart @@ -145,113 +145,3 @@ extension KeychainStorageKeyExtension on KeychainStorageKey { } } -enum InactiveLicenseKey { - residents, - vehicles, - openedVisits, -} - -enum ActiveLicenseKey { - messages, - liberations, - reservations, - access, - orders, - completeSchedule, - providerSchedule, - deliverySchedule, - fastPass, -} - -extension InactiveLicenseKeyExtension on InactiveLicenseKey { - String get value { - switch (this) { - case InactiveLicenseKey.residents: - return 'FRE-HUB-RESIDENTS'; - case InactiveLicenseKey.vehicles: - return 'FRE-HUB-VEHICLES'; - case InactiveLicenseKey.openedVisits: - return 'FRE-HUB-OPENED-VISITS'; - default: - return ''; - } - } -} - -extension ActiveLicenseKeyExtension on ActiveLicenseKey { - String get value { - switch (this) { - case ActiveLicenseKey.messages: - return 'FRE-HUB-MESSAGES'; - case ActiveLicenseKey.liberations: - return 'FRE-HUB-LIBERATIONS'; - case ActiveLicenseKey.reservations: - return 'FRE-HUB-RESERVATIONS'; - case ActiveLicenseKey.access: - return 'FRE-HUB-ACCESS'; - case ActiveLicenseKey.orders: - return 'FRE-HUB-ORDERS'; - case ActiveLicenseKey.completeSchedule: - return 'FRE-HUB-COMPLETE-SCHEDULE'; - case ActiveLicenseKey.providerSchedule: - return 'FRE-HUB-AGE-PROV-PRESTADOR'; - case ActiveLicenseKey.deliverySchedule: - return 'FRE-HUB-AGE-PROV-DELIVERY'; - case ActiveLicenseKey.fastPass: - return 'FRE-HUB-FASTPASS'; - default: - return ''; - } - } -} - -enum LicenseStorageKey { - messages, - liberations, - reservations, - access, - openedVisits, - vehicles, - residents, - pets, - orders, - completeSchedule, - providerSchedule, - deliverySchedule, - fastPass, -} - -extension LicenseKeyExtension on LicenseStorageKey { - String get value { - switch (this) { - case LicenseStorageKey.messages: - return 'FRE-HUB-MESSAGES'; - case LicenseStorageKey.liberations: - return 'FRE-HUB-LIBERATIONS'; - case LicenseStorageKey.reservations: - return 'FRE-HUB-RESERVATIONS'; - case LicenseStorageKey.access: - return 'FRE-HUB-ACCESS'; - case LicenseStorageKey.openedVisits: - return 'FRE-HUB-OPENED-VISITS'; - case LicenseStorageKey.vehicles: - return 'FRE-HUB-VEHICLES'; - case LicenseStorageKey.residents: - return 'FRE-HUB-RESIDENTS'; - case LicenseStorageKey.pets: - return 'FRE-HUB-PETS'; - case LicenseStorageKey.orders: - return 'FRE-HUB-ORDERS'; - case LicenseStorageKey.completeSchedule: - return 'FRE-HUB-COMPLETE-SCHEDULE'; - case LicenseStorageKey.providerSchedule: - return 'FRE-HUB-AGE-PROV-PRESTADOR'; - case LicenseStorageKey.deliverySchedule: - return 'FRE-HUB-AGE-PROV-DELIVERY'; - case LicenseStorageKey.fastPass: - return 'FRE-HUB-FASTPASS'; - default: - return ''; - } - } -} diff --git a/lib/shared/helpers/keychain_storage.dart b/lib/shared/helpers/storage/keychain_storage.dart similarity index 84% rename from lib/shared/helpers/keychain_storage.dart rename to lib/shared/helpers/storage/keychain_storage.dart index 8be43ccc..c14aa6b5 100644 --- a/lib/shared/helpers/keychain_storage.dart +++ b/lib/shared/helpers/storage/keychain_storage.dart @@ -1,11 +1,11 @@ -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/database_helper.dart'; +import 'package:hub/shared/helpers/database/database_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; import 'package:sqflite/sqflite.dart'; -class KeychainDelegate implements BaseStorage { - KeychainDelegate._(); +class KeychainHelper implements BaseStorage { + KeychainHelper._(); - static final KeychainDelegate instance = KeychainDelegate._(); + static final KeychainHelper instance = KeychainHelper._(); static const String tableKeychain = 'keychain'; diff --git a/lib/shared/helpers/secure_storage.dart b/lib/shared/helpers/storage/secure_storage.dart similarity index 92% rename from lib/shared/helpers/secure_storage.dart rename to lib/shared/helpers/storage/secure_storage.dart index b579c543..1d40ee71 100644 --- a/lib/shared/helpers/secure_storage.dart +++ b/lib/shared/helpers/storage/secure_storage.dart @@ -1,5 +1,5 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; class SecureStorage implements BaseStorage { SecureStorage._(); diff --git a/lib/shared/helpers/shared_preferences_storage.dart b/lib/shared/helpers/storage/shared_preferences_storage.dart similarity index 92% rename from lib/shared/helpers/shared_preferences_storage.dart rename to lib/shared/helpers/storage/shared_preferences_storage.dart index 9a9b4fd1..3cc38a6e 100644 --- a/lib/shared/helpers/shared_preferences_storage.dart +++ b/lib/shared/helpers/storage/shared_preferences_storage.dart @@ -1,4 +1,4 @@ -import 'package:hub/shared/helpers/base_storage.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; import 'package:shared_preferences/shared_preferences.dart'; class SharedPreferencesStorage implements BaseStorage { diff --git a/lib/shared/helpers/storage_helper.dart b/lib/shared/helpers/storage/storage_helper.dart similarity index 81% rename from lib/shared/helpers/storage_helper.dart rename to lib/shared/helpers/storage/storage_helper.dart index 4c5418d3..3e97ddf5 100644 --- a/lib/shared/helpers/storage_helper.dart +++ b/lib/shared/helpers/storage/storage_helper.dart @@ -1,9 +1,8 @@ import 'package:flutter/cupertino.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/database_helper.dart'; -import 'package:hub/shared/helpers/keychain_storage.dart'; -import 'package:hub/shared/helpers/secure_storage.dart'; -import 'package:hub/shared/helpers/shared_preferences_storage.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/keychain_storage.dart'; +import 'package:hub/shared/helpers/storage/secure_storage.dart'; +import 'package:hub/shared/helpers/storage/shared_preferences_storage.dart'; class StorageHelper { static final StorageHelper _instance = StorageHelper._internal(); @@ -21,7 +20,7 @@ class StorageHelper { Future init() async { await SecureStorage.instance.init(); await SharedPreferencesStorage.instance.init(); - await DatabaseStorage.instance.init(); + await KeychainHelper.instance.init(); String? isFirstRun = await SharedPreferencesStorage.instance.get(SharedPreferencesKey.isFirstRun.value); @@ -38,7 +37,7 @@ class StorageHelper { case Storage.sharedPreferences: return SharedPreferencesStorage.instance; default: - return KeychainDelegate.instance; + return KeychainHelper.instance; } } @@ -48,7 +47,7 @@ class StorageHelper { } else if (SharedPreferencesKey.values.map((e) => e.value).toList().contains(key)) { return SharedPreferencesStorage.instance; } else { - return KeychainDelegate.instance; + return KeychainHelper.instance; } } diff --git a/lib/shared/services/authentication/authentication_service.dart b/lib/shared/services/authentication/authentication_service.dart index 040087d2..db52f8bf 100644 --- a/lib/shared/services/authentication/authentication_service.dart +++ b/lib/shared/services/authentication/authentication_service.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; + import 'package:hub/shared/utils/snackbar_util.dart'; import '../../../backend/api_requests/api_calls.dart'; diff --git a/lib/shared/services/license/license_service.dart b/lib/shared/services/license/license_service.dart index 215aa663..bea7bc4a 100644 --- a/lib/shared/services/license/license_service.dart +++ b/lib/shared/services/license/license_service.dart @@ -3,11 +3,12 @@ import 'dart:developer'; import 'package:hub/backend/api_requests/api_calls.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/database_helper.dart'; -import 'package:hub/shared/helpers/license_helper.dart'; +import 'package:hub/shared/helpers/database/database_helper.dart'; + +import 'package:hub/shared/helpers/license/license_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; import 'package:sqflite/sqflite.dart'; class LicenseService { @@ -16,8 +17,8 @@ class LicenseService { LicenseService._internal(); static Future setupLicense(Database database) async { - await LicenseDelegate.insertLicenseFoo(InactiveLicenseKey.values.map((e) => e.value).toList(), 'INVISIVEL'); - await LicenseDelegate.insertLicenseFoo(ActiveLicenseKey.values.map((e) => e.value).toList(), 'VISIVEL'); + await LicenseHelper.insertLicenseFoo(InactiveLicenseKey.values.map((e) => e.value).toList(), 'INVISIVEL'); + await LicenseHelper.insertLicenseFoo(ActiveLicenseKey.values.map((e) => e.value).toList(), 'VISIVEL'); } static Future initLicenseService() async { diff --git a/lib/shared/services/localization/localization_service.dart b/lib/shared/services/localization/localization_service.dart index 08501be0..8a168906 100644 --- a/lib/shared/services/localization/localization_service.dart +++ b/lib/shared/services/localization/localization_service.dart @@ -3,12 +3,11 @@ import 'dart:developer'; import 'package:flutter/material.dart'; -import 'package:http/src/response.dart'; import 'package:hub/backend/api_requests/api_manager.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/database_helper.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/database/database_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/services/license/license_service.dart'; import 'package:hub/shared/utils/dialog_util.dart'; diff --git a/lib/shared/utils/share_util.dart b/lib/shared/utils/share_util.dart index 67a4e183..511e143a 100644 --- a/lib/shared/utils/share_util.dart +++ b/lib/shared/utils/share_util.dart @@ -1,5 +1,5 @@ -import 'package:hub/shared/helpers/base_storage.dart'; -import 'package:hub/shared/helpers/storage_helper.dart'; +import 'package:hub/shared/helpers/storage/base_storage.dart'; +import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:share_plus/share_plus.dart'; class ShareUtil {