bug 710 & 711 fixed.

design_3.0_latest
Sikander Saleem 12 months ago
parent bd362cb0f6
commit 5ab0ba4c2c

@ -86,7 +86,7 @@ class AppDrawer extends StatelessWidget {
context: context, context: context,
builder: (_) => AAlertDialog(title: context.translation.signOut, content: context.translation.logoutAlert), builder: (_) => AAlertDialog(title: context.translation.signOut, content: context.translation.logoutAlert),
); );
if (result ?? false) { if (result) {
settingProvider.resetSettings(); settingProvider.resetSettings();
userProvider.reset(); userProvider.reset();
Navigator.of(context).pop(); Navigator.of(context).pop();

@ -18,6 +18,7 @@ import 'package:test_sa/new_views/pages/land_page/create_request-type_bottomshee
import 'package:test_sa/new_views/pages/land_page/mark_attendance_widget.dart'; import 'package:test_sa/new_views/pages/land_page/mark_attendance_widget.dart';
import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.dart'; import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.dart';
import 'package:test_sa/new_views/pages/land_page/non_hmg_employee_swipe_view.dart'; import 'package:test_sa/new_views/pages/land_page/non_hmg_employee_swipe_view.dart';
import 'package:test_sa/new_views/pages/login_page.dart';
import 'package:test_sa/new_views/pages/settings_page.dart'; import 'package:test_sa/new_views/pages/settings_page.dart';
import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; import 'package:test_sa/views/widgets/equipment/single_device_picker.dart';
@ -131,8 +132,7 @@ class _LandPageState extends State<LandPage> {
if (result) { if (result) {
Provider.of<SettingProvider>(context, listen: false).resetSettings(); Provider.of<SettingProvider>(context, listen: false).resetSettings();
Provider.of<UserProvider>(context, listen: false).reset(); Provider.of<UserProvider>(context, listen: false).reset();
Navigator.of(context).pop(); Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
Navigator.of(context).pop();
} }
return false; return false;
}, },

@ -9,6 +9,7 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_drawer.dart'; import 'package:test_sa/new_views/common_widgets/app_drawer.dart';
import 'package:test_sa/new_views/pages/login_page.dart';
import 'package:test_sa/new_views/swipe_module/circular_animated_widget.dart'; import 'package:test_sa/new_views/swipe_module/circular_animated_widget.dart';
import 'package:test_sa/new_views/swipe_module/swipe_history_view.dart'; import 'package:test_sa/new_views/swipe_module/swipe_history_view.dart';
import 'package:test_sa/new_views/swipe_module/utils/swipe_general_utils.dart'; import 'package:test_sa/new_views/swipe_module/utils/swipe_general_utils.dart';
@ -56,8 +57,7 @@ class _SwipeViewState extends State<SwipeView> {
if (result) { if (result) {
Provider.of<SettingProvider>(context, listen: false).resetSettings(); Provider.of<SettingProvider>(context, listen: false).resetSettings();
Provider.of<UserProvider>(context, listen: false).reset(); Provider.of<UserProvider>(context, listen: false).reset();
Navigator.of(context).pop(); Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
Navigator.of(context).pop();
} }
return false; return false;
}, },

@ -818,6 +818,7 @@ class ServiceRequestBottomSheet {
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
loading: false, loading: false,
onPressed: () { onPressed: () {
Navigator.pop(context);
Provider.of<ServiceRequestDetailProvider>(context, listen: false).sparePartHelperModel = SparePartHelperModel(); Provider.of<ServiceRequestDetailProvider>(context, listen: false).sparePartHelperModel = SparePartHelperModel();
Navigator.pushReplacement( Navigator.pushReplacement(
context, context,

Loading…
Cancel
Save