From a7af306b3182ab945b823768b406dcbb466ddc87 Mon Sep 17 00:00:00 2001 From: jantunesmesias Date: Wed, 28 Aug 2024 17:39:17 -0300 Subject: [PATCH] WIP --- lib/actions/actions.dart | 9 +++++---- lib/pages/home_page/home_page_widget.dart | 19 ++++++++++++------- .../preferences_settings_model.dart | 6 +++--- .../preferences_settings_widget.dart | 4 +++- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/lib/actions/actions.dart b/lib/actions/actions.dart index 1547db1d..12dde5a2 100644 --- a/lib/actions/actions.dart +++ b/lib/actions/actions.dart @@ -299,8 +299,8 @@ Future toggleSignUpPage(BuildContext context) async { } Future toggleApp(BuildContext context, bool haveLocal) async { - if (haveLocal == true) - context.goNamed( + if (haveLocal == true) { + context.pushNamed( 'homePage', extra: { kTransitionInfoKey: const TransitionInfo( @@ -309,8 +309,8 @@ Future toggleApp(BuildContext context, bool haveLocal) async { ), }, ); - else if (haveLocal == false) - context.goNamed( + } else if (haveLocal == false) { + context.pushNamed( 'receptionPage', extra: { kTransitionInfoKey: const TransitionInfo( @@ -319,6 +319,7 @@ Future toggleApp(BuildContext context, bool haveLocal) async { ) }, ); + } } Future visitCancelAction(BuildContext context, diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index 91ec6881..0a9110b5 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -15,10 +15,9 @@ import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/pages/home_page/home_page_model.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/widgets/drawer_widget/drawer_widget.dart'; -import 'package:provider/provider.dart'; class HomePageWidget extends StatefulWidget { - const HomePageWidget({super.key}); + const HomePageWidget({Key? key}); @override State createState() => _HomePageWidgetState(); @@ -30,6 +29,10 @@ class _HomePageWidgetState extends State { LocalProfileComponentWidget _localProfileComponentWidget = const LocalProfileComponentWidget(); + _HomePageWidgetState() { + log('HomePageWidget'); + } + Future checkData() async { try { final response = await PhpGroup.getDadosCall.call( @@ -67,6 +70,7 @@ class _HomePageWidgetState extends State { } Future checkLocal() async { + log('Checklocal'); try { final response = await PhpGroup.getLocalsCall.call( devUUID: AppState().devUUID, @@ -80,9 +84,6 @@ class _HomePageWidgetState extends State { if (activeLocals.isEmpty || AppState().cliUUID.isEmpty) { await showBottomSheet().then((_) => checkData()); } - if (AppState().cliUUID.isEmpty) { - await showBottomSheet().then((_) => checkData()); - } } catch (e) { log('Error in checkLocal: $e'); await showBottomSheet().then((_) => checkData()); @@ -110,11 +111,14 @@ class _HomePageWidgetState extends State { super.initState(); _model = createModel(context, () => HomePageModel()); + _model.updateOnChange = true; AppState().context = context; - () async { + WidgetsBinding.instance.addPostFrameCallback((_) async { await checkLocal(); + }); + () async { await FirebaseMessagingService().updateDeviceToken(); }(); @@ -131,7 +135,8 @@ class _HomePageWidgetState extends State { @override Widget build(BuildContext context) { - context.watch(); + // context.watch(); + return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index 68c8fa21..d118c578 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -316,7 +316,7 @@ class PreferencesPageModel with ChangeNotifier { AppState().deleteLocal(); AppState().deleteOwnerUUID(); - context.goNamed( + context.pushNamed( 'homePage', extra: { kTransitionInfoKey: const TransitionInfo( @@ -372,7 +372,7 @@ class PreferencesPageModel with ChangeNotifier { ), ); }); - notifyListeners(); + // notifyListeners(); } catch (err, stack) { Navigator.pop(context); ScaffoldMessenger.of(context).showSnackBar( @@ -417,7 +417,7 @@ class PreferencesPageModel with ChangeNotifier { ], ); }); - notifyListeners(); + // notifyListeners(); } void deleteAccount(BuildContext context) { diff --git a/lib/pages/preferences_settings_page/preferences_settings_widget.dart b/lib/pages/preferences_settings_page/preferences_settings_widget.dart index f9817091..c493bbf6 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_widget.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_widget.dart @@ -138,7 +138,9 @@ class PreferencesPageWidget extends StatelessWidget { break; case 5: icon = Icons.landscape; - onPressed = () => model.localUnlink(context); + onPressed = () { + model.localUnlink(context); + }; isEnabled = false; content = FFLocalizations.of(context).getVariableText( ptText: 'Desative para se desvincular do local selecionado',