Merge branch 'hussam' into 'development'

Hussam

See merge request Cloud_Solution/doctor_app_flutter!139

lib/util/helpers.dart

@@ -1,3 +1,4 @@
+import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart';
 import 'package:doctor_app_flutter/routes.dart';
 import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
@@ -9,6 +10,7 @@ import '../config/size_config.dart';
 import '../util/dr_app_toast_msg.dart';
 
 import 'package:connectivity/connectivity.dart';
+import 'dr_app_shared_pref.dart';
 
 DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
 
@@ -22,6 +24,8 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
 class Helpers {
   int cupertinoPickerIndex = 0;
 
+  get currentLanguage => null;
+
 /*
  *@author: Elham Rababah 
  *@Date:12/4/2020  
@@ -340,7 +344,9 @@ class Helpers {
   }
 
   logout() async {
+    String lang = await sharedPref.getString(APP_Language);
     await clearSharedPref();
+    sharedPref.setString(APP_Language, lang);
     Navigator.of(AppGlobal.CONTEX).pushReplacementNamed(LOGIN);
   }
 }

lib/widgets/shared/app_drawer_widget.dart

@@ -29,6 +29,7 @@ class AppDrawer extends StatefulWidget {
 class _AppDrawerState extends State<AppDrawer> {
   bool _isInit = true;
   DoctorProfileModel doctorProfile;
+  Helpers helpers = new Helpers();
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -105,9 +106,8 @@ class _AppDrawerState extends State<AppDrawer> {
                             color: Colors.white,
                           ),
                           onPressed: () async {
-                            await Helpers.clearSharedPref();
                             Navigator.pop(context);
-                            Navigator.of(context).pushNamed(LOGIN);
+                            await helpers.logout();
                           },
                         ),
                       ],