From cf8d789c2b1f455953f2b0cd772f567a8dd038f3 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 6 Nov 2024 15:24:17 -0300 Subject: [PATCH 1/5] =?UTF-8?q?part.=20fix=20velocidade=20na=20navega?= =?UTF-8?q?=C3=A7=C3=A3o=20entre=20telas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu_button_item_widget.dart | 30 +++++++------------ .../menu_card_item/menu_card_item.dart | 30 +++++++------------ .../menu_item/menu_item.dart | 14 ++++----- .../menu_component/menu_component_widget.dart | 1 - 4 files changed, 27 insertions(+), 48 deletions(-) diff --git a/lib/components/atomic_components/menu_button_item/menu_button_item_widget.dart b/lib/components/atomic_components/menu_button_item/menu_button_item_widget.dart index e8b734aa..f8071bd7 100644 --- a/lib/components/atomic_components/menu_button_item/menu_button_item_widget.dart +++ b/lib/components/atomic_components/menu_button_item/menu_button_item_widget.dart @@ -9,17 +9,17 @@ import '../../../shared/services/localization/localization_service.dart'; class MenuButtonWidget extends MenuEntry { const MenuButtonWidget({ super.key, - this.action, - this.title, - this.icon, - }); + required this.action, + required this.title, + required this.icon, + }) : super(action: action, title: title, icon: icon); @override - final Function()? action; + final Function() action; @override - final String? title; + final String title; @override - final IconData? icon; + final IconData icon; @override _MenuButtonWidgetState createState() => _MenuButtonWidgetState(); @@ -39,19 +39,9 @@ class _MenuButtonWidgetState extends State { onTap: _isProcessing ? null : () async { - setState(() { - _isProcessing = true; - }); - await LocalizationService.processLocals(context).then((value) async { - if (value) { - await widget.action?.call(); - } else { - DialogUnavailable.unavailableCredentials(context); - } - }); - setState(() { - _isProcessing = false; - }); + setState(() { _isProcessing = true; }); + await widget.action.call(); + setState(() { _isProcessing = false; }); }, child: Padding( padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 0), diff --git a/lib/components/atomic_components/menu_card_item/menu_card_item.dart b/lib/components/atomic_components/menu_card_item/menu_card_item.dart index c82491f2..83afb4d6 100644 --- a/lib/components/atomic_components/menu_card_item/menu_card_item.dart +++ b/lib/components/atomic_components/menu_card_item/menu_card_item.dart @@ -9,17 +9,17 @@ import '../../../shared/services/localization/localization_service.dart'; class MenuCardItem extends MenuEntry { const MenuCardItem({ super.key, - this.action, - this.title, - this.icon, - }); + required this.action, + required this.title, + required this.icon, + }) : super(action: action, title: title, icon: icon); @override - final Function()? action; + final Function() action; @override - final String? title; + final String title; @override - final IconData? icon; + final IconData icon; @override _MenuCardItemState createState() => _MenuCardItemState(); @@ -39,19 +39,9 @@ class _MenuCardItemState extends State { onTap: _isProcessing ? null : () async { - setState(() { - _isProcessing = true; - }); - await LocalizationService.processLocals(context).then((value) async { - if (value) { - await widget.action?.call(); - } else { - DialogUnavailable.unavailableCredentials(context); - } - }); - setState(() { - _isProcessing = false; - }); + setState(() { _isProcessing = true; }); + await widget.action.call(); + setState(() { _isProcessing = false; }); }, child: Card( elevation: 0, diff --git a/lib/components/molecular_components/menu_item/menu_item.dart b/lib/components/molecular_components/menu_item/menu_item.dart index ce3aac0a..790b3fb4 100644 --- a/lib/components/molecular_components/menu_item/menu_item.dart +++ b/lib/components/molecular_components/menu_item/menu_item.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; abstract class MenuEntry extends StatefulWidget { const MenuEntry({ super.key, - this.action, - this.title, - this.icon, + required this.action, + required this.title, + required this.icon, }); - final Function()? action; - final String? title; - final IconData? icon; -} + final Function() action; + final String title; + final IconData icon; +} \ No newline at end of file diff --git a/lib/components/organism_components/menu_component/menu_component_widget.dart b/lib/components/organism_components/menu_component/menu_component_widget.dart index cd97a109..f9b12e64 100644 --- a/lib/components/organism_components/menu_component/menu_component_widget.dart +++ b/lib/components/organism_components/menu_component/menu_component_widget.dart @@ -562,7 +562,6 @@ class _MenuComponentWidgetState extends State { ptText: 'Sair da Conta', ), ), - MenuCardItem(icon: null, action: () {}, title: ''), ]; }(); From e333b525fb008dc2793e902908791c30ff0f31c9 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 6 Nov 2024 15:26:11 -0300 Subject: [PATCH 2/5] fix: menu de senha no toggleNotify --- .../preferences_settings_widget.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/preferences_settings_page/preferences_settings_widget.dart b/lib/pages/preferences_settings_page/preferences_settings_widget.dart index 1249f1d0..dc3b66b7 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_widget.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_widget.dart @@ -190,10 +190,10 @@ class _PreferencesPageWidgetState extends State { child: GestureDetector( onTap: () { switch (index) { - case 3: + case 4: model.toggleAccess(context); break; - case 4: + case 5: model.togglePanic(context); break; default: From 568df2830ffc4da5bf680763eef9e4b0124f499c Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 6 Nov 2024 15:28:28 -0300 Subject: [PATCH 3/5] fix: cobertura de alguns cenarios para entra com 0-left no modal de pesquisa de visitantes --- .../visitor_search_modal_template_component_model.dart | 2 +- .../visitor_search_modal_template_component_widget.dart | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 eb9d3806..f9f4e6f5 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 @@ -46,4 +46,4 @@ class VisitorSearchModalTemplateComponentModel extends FlutterFlowModel Date: Wed, 6 Nov 2024 16:27:49 -0300 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20erro=20na=20valida=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20biometria=20quando=20o=20usu=C3=A1rio=20fechava=20o=20modal?= =?UTF-8?q?=20de=20leitura=20biom=C3=A9trica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/qr_code_page/qr_code_page_widget.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 cb30c56f..d02e5f12 100644 --- a/lib/pages/qr_code_page/qr_code_page_widget.dart +++ b/lib/pages/qr_code_page/qr_code_page_widget.dart @@ -324,8 +324,9 @@ class _QrCodePageWidgetState extends State with TickerProvider Future _showBiometricsAuth(BuildContext context) async { await BiometricHelper.checkBiometrics() .then((value) async => await BiometricHelper.authenticateBiometric().then((value) async { - final key = - await StorageHelper().get(SecureStorageKey.fingerprintPass.value, Storage.SecureStorage) ?? ''; + if (value == false) throw Exception('Biometric authentication failed'); + final key = await StorageHelper().get(SecureStorageKey.fingerprintPass.value, Storage.SecureStorage); + if (key == null || key.isEmpty) throw Exception('No key found'); safeSetState(() { if (animationsMap['barcodeOnActionTriggerAnimation'] != null) { animationsMap['barcodeOnActionTriggerAnimation']!.controller.stop(); From b991e06b859467f637ea77615e4e03375c757086 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 6 Nov 2024 17:34:42 -0300 Subject: [PATCH 5/5] fix: bug nav transaction --- .../menu_component/menu_component_model.dart | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 fd12d678..106dbf6c 100644 --- a/lib/components/organism_components/menu_component/menu_component_model.dart +++ b/lib/components/organism_components/menu_component/menu_component_model.dart @@ -38,7 +38,7 @@ class MenuComponentModel extends FlutterFlowModel { '/qrCodePage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -51,7 +51,7 @@ class MenuComponentModel extends FlutterFlowModel { '/scheduleCompleteVisitPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -67,7 +67,7 @@ class MenuComponentModel extends FlutterFlowModel { '/deliverySchedule', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -86,7 +86,7 @@ class MenuComponentModel extends FlutterFlowModel { '/provisionalSchedule', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -104,7 +104,7 @@ class MenuComponentModel extends FlutterFlowModel { '/fastPassPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -160,7 +160,7 @@ class MenuComponentModel extends FlutterFlowModel { '/registerVisitorPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -173,7 +173,7 @@ class MenuComponentModel extends FlutterFlowModel { '/peopleOnThePropertyPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -198,7 +198,7 @@ class MenuComponentModel extends FlutterFlowModel { '/preferencesSettings', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -214,7 +214,7 @@ class MenuComponentModel extends FlutterFlowModel { '/packageOrder', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -233,7 +233,7 @@ class MenuComponentModel extends FlutterFlowModel { '/reservation', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -295,7 +295,7 @@ class MenuComponentModel extends FlutterFlowModel { '/liberationHistory', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -308,7 +308,7 @@ class MenuComponentModel extends FlutterFlowModel { '/acessHistoryPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -321,7 +321,7 @@ class MenuComponentModel extends FlutterFlowModel { '/scheduleCompleteVisitPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -334,7 +334,7 @@ class MenuComponentModel extends FlutterFlowModel { '/messageHistoryPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ), @@ -350,7 +350,7 @@ class MenuComponentModel extends FlutterFlowModel { '/petsPage', extra: { kTransitionInfoKey: const TransitionInfo( - hasTransition: true, + hasTransition: false, transitionType: PageTransitionType.scale, alignment: Alignment.bottomCenter, ),