diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 7a916419..172e338a 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -2,10 +2,12 @@ import 'dart:convert'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:http/http.dart' as http; +import 'package:provider/provider.dart'; import '../../../locator.dart'; import '../../../routes.dart'; @@ -159,6 +161,7 @@ class BaseAppClient { logout() async { await sharedPref.remove(LOGIN_TOKEN_ID); await authenticatedUserObject.getUser(); + Provider.of(AppGlobal.context, listen: false).isLogin = false; Navigator.of(AppGlobal.context).pushReplacementNamed(HOME); } diff --git a/lib/pages/pharmacies/medicine_search_screen.dart b/lib/pages/pharmacies/medicine_search_screen.dart index df7b19fc..49f7f883 100644 --- a/lib/pages/pharmacies/medicine_search_screen.dart +++ b/lib/pages/pharmacies/medicine_search_screen.dart @@ -80,6 +80,7 @@ class MedicineSearch extends StatelessWidget { ], ), ), + if(model.pharmacy.isNotEmpty) Container( margin: EdgeInsets.only( left: SizeConfig.heightMultiplier * 2), diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 66be3e48..a523eaf3 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -66,7 +66,7 @@ class _AppDrawerState extends State { margin: EdgeInsets.all( SizeConfig.imageSizeMultiplier * 4), ), - user != null + (user != null && projectProvider.isLogin) ? Padding( padding: EdgeInsets.all(15), child: Column( @@ -143,7 +143,7 @@ class _AppDrawerState extends State { } }, ), - user != null + (user != null && projectProvider.isLogin) ? Column( mainAxisAlignment: MainAxisAlignment.start, children: [