WIP

lib/pages/fast_pass_page/fast_pass_page_widget.dart

@@ -94,8 +94,8 @@ class _FastPassPageWidgetState extends State<FastPassPageWidget> {
                         },
                         onNavigationRequest: (NavigationRequest request) {
                           if (request.url.startsWith('http') ||
-                            request.url
+                              request.url.startsWith(
-                                .startsWith('https://api.whatsapp.com/send') ||
+                                  'https://api.whatsapp.com/send') ||
                               request.url.startsWith('https://wa.me')) {
                             launchUrlString(request.url);
                             return NavigationDecision.prevent;
@@ -106,9 +106,7 @@ class _FastPassPageWidgetState extends State<FastPassPageWidget> {
                           if (url.url.toString().contains('/hub/home')) {
                             Navigator.pop(context);
                           }
-                        }
+                        }),
-                    ),
-
                   )
                   ..loadRequest(Uri.parse(url)),
               ),

lib/pages/home_page/home_page_widget.dart

@@ -27,8 +27,11 @@ class HomePageWidget extends StatefulWidget {
 class _HomePageWidgetState extends State<HomePageWidget> {
   late HomePageModel _model;
   final scaffoldKey = GlobalKey<ScaffoldState>();
+  LocalProfileComponentWidget _localProfileComponentWidget =
+      const LocalProfileComponentWidget();
 
-  Future checkData() async {
+  Future<void> checkData() async {
+    try {
       final response = await PhpGroup.getDadosCall.call(
         devUUID: AppState().devUUID,
         userUUID: AppState().userUUID,
@@ -36,42 +39,56 @@ class _HomePageWidgetState extends State<HomePageWidget> {
         atividade: 'getDados',
       );
 
-    switch (response.statusCode) {
+      if (response.statusCode == 200) {
-      case 200:
         if (response.jsonBody['error'] == false) {
           AppState().whatsapp = response.jsonBody['whatsapp'];
           AppState().provisional = response.jsonBody['provisional'];
           AppState().name = response.jsonBody['visitado']['VDO_NOME'];
-        } else {
-          if (response.jsonBody['error_msg'] !=
-              r'''Usuario nao possui vinculo ativo com esse condominio''') {
-            log(response.jsonBody['error_msg']);
-            await DialogUtil.warningDefault(context)
-                .whenComplete(() => checkData());
-          }
-        }
-        break;
-      default:
-        await DialogUtil.warningDefault(context)
-            .whenComplete(() => checkData());
-
           safeSetState(() {});
-        break;
+        } else {
+          final errorMsg = response.jsonBody['error_msg'];
+          if (errorMsg !=
+              r'''Usuario nao possui vinculo ativo com esse condominio''') {
+            log(errorMsg);
+            await DialogUtil.warningDefault(context)
+                .whenComplete(() => checkData());
+            safeSetState(() {});
+          }
+        }
+      } else {
+        await DialogUtil.warningDefault(context)
+            .whenComplete(() => checkData());
+        safeSetState(() {});
+      }
+    } catch (e) {
+      log('Error in checkData: $e');
+      await DialogUtil.warningDefault(context).whenComplete(() => checkData());
     }
   }
 
-  Future checkLocal() async {
+  Future<void> checkLocal() async {
+    try {
       final response = await PhpGroup.getLocalsCall.call(
         devUUID: AppState().devUUID,
         userUUID: AppState().userUUID,
       );
       log(response.jsonBody.toString());
-    List<dynamic> locals = response.jsonBody['locais'] ?? [];
 
+      List<dynamic> locals = response.jsonBody['locais'] ?? [];
       final activeLocals =
           locals.where((local) => local['CLU_STATUS'] == 'A').toList();
       log("activeLocals $activeLocals");
-    if (activeLocals.isEmpty) {
+
+      if (activeLocals.isEmpty || AppState().cliUUID.isEmpty) {
+        await showBottomSheet().then((_) => checkData());
+      }
+    } catch (e) {
+      log('Error in checkLocal: $e');
+      await showBottomSheet().then((_) => checkData());
+    }
+  }
+
+  Future<void> showBottomSheet() async {
     await showModalBottomSheet(
       isScrollControlled: true,
       backgroundColor: Colors.transparent,
@@ -82,43 +99,24 @@ class _HomePageWidgetState extends State<HomePageWidget> {
         padding: MediaQuery.viewInsetsOf(context),
         child: const BottomArrowLinkedLocalsComponentWidget(),
       ),
-      ).then((_) => checkData());
+    ).then((_) => safeSetState(() {
-    } else if (AppState().cliUUID.isEmpty) {
+          _localProfileComponentWidget = const LocalProfileComponentWidget();
-      showModalBottomSheet(
+        }));
-        isScrollControlled: true,
-        backgroundColor: Colors.transparent,
-        enableDrag: false,
-        isDismissible: false,
-        context: context,
-        builder: (context) {
-          return Padding(
-            padding: MediaQuery.viewInsetsOf(context),
-            child: const BottomArrowLinkedLocalsComponentWidget(),
-          );
-        },
-      ).then((_) => checkData());
-    }
   }
 
   @override
   void initState() {
     super.initState();
+
     _model = createModel(context, () => HomePageModel());
 
     AppState().context = context;
 
-    checkLocal();
-
     () async {
+      await checkLocal().whenComplete(() => log('checkLocal completed'));
       await FirebaseMessagingService().updateDeviceToken();
     }();
 
-    () async {
-      await FirebaseMessagingService().updateDeviceToken();
-    }();
-
-    WidgetsBinding.instance.addPostFrameCallback((_) async {});
-
     _model.textController ??= TextEditingController();
     _model.textFieldFocusNode ??= FocusNode();
   }
@@ -244,7 +242,7 @@ class _HomePageWidgetState extends State<HomePageWidget> {
     return wrapWithModel(
       model: _model.localComponentModel,
       updateCallback: () => safeSetState(() {}),
-      child: const LocalProfileComponentWidget(),
+      child: _localProfileComponentWidget,
     );
   }
 }

lib/pages/preferences_settings_page/preferences_settings_model.dart

@@ -310,9 +310,9 @@ class PreferencesPageModel with ChangeNotifier {
                         )
                             .then((value) {
                           if (value.jsonBody['error'] == false) {
-                            // AppState().deleteCliUUID();
+                            AppState().deleteCliUUID();
-                            // AppState().deleteLocal();
+                            AppState().deleteLocal();
-                            // AppState().deleteOwnerUUID();
+                            AppState().deleteOwnerUUID();
                             context.goNamed(
                               'homePage',
                               extra: <String, dynamic>{

lib/pages/preferences_settings_page/preferences_settings_widget.dart

@@ -47,7 +47,6 @@ class PreferencesPageWidget extends StatelessWidget {
                 ),
                 style: FlutterFlowTheme.of(context).headlineMedium.override(
                       fontFamily: 'Nunito',
-                      fontWeight: FontWeight.bold,
                       color: FlutterFlowTheme.of(context).primaryText,
                       fontSize: 15.0,
                       letterSpacing: 0.0,