Merge branch 'sultan-patientapp' into 'development'

Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!342

lib/pages/DrawerPages/family/my-family.dart

@@ -737,7 +737,6 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     }
     this.sharedPref.setString(APP_LANGUAGE, currentLang);
     this.sharedPref.setObject(MAIN_USER, mainUser);
-    this.sharedPref.setString(APP_LANGUAGE, currentLang);
     this.sharedPref.setObject(USER_PROFILE, result.list);
     this.sharedPref.setObject(FAMILY_FILE, familyFile);
     this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);

lib/widgets/drawer/app_drawer_widget.dart

@@ -504,7 +504,9 @@ class _AppDrawerState extends State<AppDrawer> {
     await authenticatedUserObject.getUser();
     _vitalSignService.heightCm = "";
     _vitalSignService.weightKg = "";
+    var appLanguage = await sharedPref.getString(APP_LANGUAGE);
     await sharedPref.clear();
+    await sharedPref.setString(APP_LANGUAGE, appLanguage);
     this.user = null;
     Navigator.of(context).pushNamed(HOME);
     // projectProvider.platformBridge().unRegisterHmgGeofences();