From 55dfa5fc94e8cc7f6c82dd9a07361b27adbff045 Mon Sep 17 00:00:00 2001 From: jantunesmesias Date: Thu, 22 Aug 2024 11:10:31 -0300 Subject: [PATCH] WIP --- lib/main.dart | 29 ++++------------------- lib/pages/home_page/home_page_widget.dart | 3 ++- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 51fd3518..a0de4a05 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,22 +1,18 @@ import 'dart:developer'; -import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_web_plugins/url_strategy.dart'; import 'package:hub/backend/notifications/firebase_messaging_service.dart'; import 'package:hub/backend/notifications/notification_service.dart'; -import 'package:hub/blocs/connectivity_bloc/connectivity_bloc.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart'; 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/no_connection_page/no_connection_page.dart'; import 'package:provider/provider.dart'; import 'package:responsive_framework/responsive_framework.dart'; @@ -50,17 +46,7 @@ Future initializeApp() async { void main() async { await initializeApp(); - runApp( - MultiProvider( - providers: [ - ChangeNotifierProvider(create: (_) => AppState()), - BlocProvider( - create: (context) => ConnectivityBloc(Connectivity()), - ), - ], - child: const App(), - ), - ); + runApp(const App()); } class App extends StatefulWidget { @@ -104,15 +90,10 @@ class _AppState extends State { @override Widget build(BuildContext context) { - return BlocListener( - listener: (context, state) { - if (state is ConnectivityFailure) { - Navigator.pushReplacement( - context, - MaterialPageRoute(builder: (context) => const NoConnectionScreen()), - ); - } - }, + return MultiProvider( + providers: [ + ChangeNotifierProvider(create: (_) => AppState()), + ], child: MaterialApp.router( title: 'FREHub', builder: (context, widget) => ResponsiveBreakpoints.builder( diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index 9b4b7267..b663358f 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -51,7 +51,8 @@ class _HomePageWidgetState extends State { AppState().whatsapp = value.jsonBody['whatsapp']; AppState().provisional = value.jsonBody['provisional']; } else { - await DialogUtil.warningDefault(context); + await DialogUtil.warningDefault(context) + .whenComplete(() => safeSetState(() {})); } }); }();