From 0205c74f8c3ac3e8362cf02864c6cfdf9e857286 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Mon, 18 Nov 2024 17:42:47 -0300 Subject: [PATCH] wip: async changes --- .../sign_in_page/sign_in_page_widget.dart | 4 ++- .../sign_up_page/sign_up_page_widget.dart | 4 ++- .../welcome_page/welcome_page_widget.dart | 5 +-- .../services/deeplink/deep_link_service.dart | 34 +++++++++---------- 4 files changed, 25 insertions(+), 22 deletions(-) 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 828e8094..0e2d6cf1 100644 --- a/lib/pages/sign_in_page/sign_in_page_widget.dart +++ b/lib/pages/sign_in_page/sign_in_page_widget.dart @@ -25,7 +25,9 @@ class _SignInPageWidgetState extends State { void initState() { super.initState(); _model = createModel(context, () => SignInPageModel()); - DeepLinkService().ensureInitialization(); + WidgetsBinding.instance.addPostFrameCallback((_) async { + await DeepLinkService().ensureInitialization(); + }); } @override 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 16df509b..acf0c74e 100644 --- a/lib/pages/sign_up_page/sign_up_page_widget.dart +++ b/lib/pages/sign_up_page/sign_up_page_widget.dart @@ -26,7 +26,9 @@ class _SignUpPageWidgetState extends State { void initState() { super.initState(); _model = createModel(context, () => SignUpPageModel()); - DeepLinkService().ensureInitialization(); + WidgetsBinding.instance.addPostFrameCallback((_) async { + await DeepLinkService().ensureInitialization(); + }); } @override diff --git a/lib/pages/welcome_page/welcome_page_widget.dart b/lib/pages/welcome_page/welcome_page_widget.dart index a6759290..c7dac14d 100644 --- a/lib/pages/welcome_page/welcome_page_widget.dart +++ b/lib/pages/welcome_page/welcome_page_widget.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:hub/shared/helpers/base_storage.dart'; @@ -43,7 +42,9 @@ class _WelcomePageWidgetState extends State { setState(() {}); } }); - DeepLinkService().ensureInitialization(); + WidgetsBinding.instance.addPostFrameCallback((_) async { + await DeepLinkService().ensureInitialization(); + }); } @override diff --git a/lib/shared/services/deeplink/deep_link_service.dart b/lib/shared/services/deeplink/deep_link_service.dart index 51470eea..58eda9a6 100644 --- a/lib/shared/services/deeplink/deep_link_service.dart +++ b/lib/shared/services/deeplink/deep_link_service.dart @@ -54,24 +54,22 @@ class DeepLinkService { Future _showForgotPasswordScreen(String email, String token) async { try { - WidgetsBinding.instance.addPostFrameCallback((_) async { - final theme = FlutterFlowTheme.of(StorageHelper().context!); - final screen = ForgotPasswordScreen(email: email, token: token); - await showModalBottomSheet( - context: StorageHelper().context!, - builder: (context) => Padding( - padding: MediaQuery.viewInsetsOf(context), - child: screen, - ), - isScrollControlled: true, - backgroundColor: theme.primaryBackground, - showDragHandle: true, - useSafeArea: true, - enableDrag: true, - ).whenComplete(() { - StorageHelper().isRecovered = false; - print('showModalBottomSheet completed'); - }); + final FlutterFlowTheme theme = FlutterFlowTheme.of(StorageHelper().context!); + final ForgotPasswordScreen screen = ForgotPasswordScreen(email: email, token: token); + await showModalBottomSheet( + context: StorageHelper().context!, + builder: (context) => Padding( + padding: MediaQuery.viewInsetsOf(context), + child: screen, + ), + isScrollControlled: true, + backgroundColor: theme.primaryBackground, + showDragHandle: true, + useSafeArea: true, + enableDrag: true, + ).whenComplete(() { + StorageHelper().isRecovered = false; + print('showModalBottomSheet completed'); }); } catch (e, s) { print('Error showing forgot password screen: $e, $s');