From add2b3a10f2a0f82a074e4e26660a5dd8797d5d3 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 9 Feb 2023 08:17:17 +0300 Subject: [PATCH] chat connection issue while logout fixed. --- lib/main.dart | 15 +++++++++------ lib/ui/landing/widget/app_drawer.dart | 9 ++++++--- lib/ui/login/login_screen.dart | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 9753f64..b00609b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,6 +6,7 @@ import 'package:flutter/services.dart'; import 'package:logger/logger.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/classes/consts.dart'; +import 'package:mohem_flutter_app/config/env.dart'; import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/generated/codegen_loader.g.dart'; import 'package:mohem_flutter_app/models/post_params_model.dart'; @@ -62,12 +63,14 @@ Future main() async { ChangeNotifierProvider( create: (_) => EITProviderModel(), ), - ChangeNotifierProvider( - create: (_) => ChatProviderModel(), - ), - ChangeNotifierProvider( - create: (_) => MarathonProvider(), - ), + if (env.chat) + ChangeNotifierProvider( + create: (_) => ChatProviderModel(), + ), + if (env.marathon) + ChangeNotifierProvider( + create: (_) => MarathonProvider(), + ), // ChangeNotifierProvider( // create: (_) => ChatCallProvider(), // ), diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart index eac55e5..2b8e034 100644 --- a/lib/ui/landing/widget/app_drawer.dart +++ b/lib/ui/landing/widget/app_drawer.dart @@ -5,6 +5,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/config/env.dart'; import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; @@ -29,12 +30,14 @@ class AppDrawer extends StatefulWidget { class _AppDrawerState extends State { List drawerMenuItemList = []; - late ChatProviderModel chatData; + ChatProviderModel? chatData; @override void initState() { super.initState(); - chatData = Provider.of(context, listen: false); + if (env.chat) { + chatData = Provider.of(context, listen: false); + } } @override @@ -176,7 +179,7 @@ class _AppDrawerState extends State { AppState().isAuthenticated = false; AppState().isLogged = false; AppState().setPostParamsInitConfig(); - chatData.disposeData(); + chatData?.disposeData(); // SharedPreferences prefs = await SharedPreferences.getInstance(); // await prefs.clear(); Navigator.pushNamedAndRemoveUntil(context, AppRoutes.login, (Route route) => false, arguments: null); diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart index 416784c..b700cff 100644 --- a/lib/ui/login/login_screen.dart +++ b/lib/ui/login/login_screen.dart @@ -171,7 +171,7 @@ class _LoginScreenState extends State { if (isAppOpenBySystem == null) { isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool; if (!kReleaseMode) { - username.text = "1100313582"; // Tamer User + username.text = "1100313582"; password.text = "moe123456"; // 1) Normal user :