diff --git a/lib/core/viewModels/authentication_view_model.dart b/lib/core/viewModels/authentication_view_model.dart index 158e428..4d94ec4 100644 --- a/lib/core/viewModels/authentication_view_model.dart +++ b/lib/core/viewModels/authentication_view_model.dart @@ -81,6 +81,10 @@ class AuthenticationViewModel with ChangeNotifier { } logout() async { + isLoading = false; + isError = false; + isLogin = false; await sharedPref.clear(); + notifyListeners(); } } diff --git a/lib/locator.dart b/lib/locator.dart index d1b2ba3..66afadd 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -3,6 +3,7 @@ import 'package:get_it/get_it.dart'; import 'core/service/authentication_service.dart'; import 'core/service/hospital_service.dart'; import 'core/service/orders_service.dart'; +import 'core/viewModels/authentication_view_model.dart'; import 'core/viewModels/hospital_view_model.dart'; import 'core/viewModels/orders_view_model.dart'; @@ -17,6 +18,6 @@ void setupLocator() { /// View Model locator.registerFactory(() => HospitalViewModel()); - // locator.registerFactory(() => AuthenticationViewModel()); + locator.registerFactory(() => AuthenticationViewModel()); locator.registerFactory(() => OrdersViewModel()); } diff --git a/lib/pages/setting/setting.dart b/lib/pages/setting/setting.dart index 63c8830..ccfcf07 100644 --- a/lib/pages/setting/setting.dart +++ b/lib/pages/setting/setting.dart @@ -1,11 +1,12 @@ import 'package:driverapp/core/viewModels/authentication_view_model.dart'; -import 'package:driverapp/pages/authentication/login_page.dart'; import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../root_page.dart'; + class SettingPage extends StatelessWidget { final String driverName; //_authenticationViewModel.user.userName final int driverID; @@ -79,11 +80,9 @@ class SettingPage extends StatelessWidget { InkWell( onTap: () async { await _authenticationViewModel.logout(); - Navigator.push( + Navigator.pushReplacement( context, - MaterialPageRoute( - builder: (context) => LoginPage() - ), + MaterialPageRoute(builder: (context) => RootPage()), ); }, child: Column(