From 2c50402aa8b17a9ca9ee0c7d5f60248ecd3390b2 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 13 Dec 2020 17:25:44 +0300 Subject: [PATCH] language issue fixed --- lib/core/service/client/base_app_client.dart | 3 ++- lib/pages/DrawerPages/family/my-family.dart | 20 ++------------------ lib/widgets/drawer/app_drawer_widget.dart | 3 +++ 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index e7d69a31..89c0775c 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -45,7 +45,8 @@ class BaseAppClient { //Map profile = await sharedPref.getObj(DOCTOR_PROFILE); if (!isExternal) { String token = await sharedPref.getString(TOKEN); - var languageID = await sharedPref.getString(APP_LANGUAGE)?? 'ar'; + print(await sharedPref.getString(APP_LANGUAGE)); + var languageID = await sharedPref.getString(APP_LANGUAGE) ?? 'ar'; var user = await sharedPref.getObject(USER_PROFILE); if (body.containsKey('SetupID')) { body['SetupID'] = body.containsKey('SetupID') diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index 7fc0c546..791c33b3 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -666,24 +666,7 @@ class _MyFamily extends State with TickerProviderStateMixin { loginAfter(result, context) async { GifLoaderDialogUtils.hideDialog(context); - // var familyFile = await sharedPref.getObject(FAMILY_FILE); - // var mainUser = await sharedPref.getObject(MAIN_USER); - // result = CheckActivationCode.fromJson(result); - // this.sharedPref.clear(); - // this.sharedPref.setObject(FAMILY_FILE, familyFile); - // this.sharedPref.setObject(MAIN_USER, mainUser); - // result.list.isFamily = true; - // this.sharedPref.setObject(USER_PROFILE, result.list); - // this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); - // this.sharedPref.setString(TOKEN, result.authenticationTokenID); - // - // authenticatedUserObject.isLogin = true; - // appointmentRateViewModel.isLogin = true; - // projectViewModel.isLogin = true; - // //this.checkIfUserAgreedBefore(result), - // Navigator.of(context).pushNamed( - // HOME, - // ); + var currentLang = await sharedPref.getString(APP_LANGUAGE); result = list.CheckActivationCode.fromJson(result); var familyFile = await sharedPref.getObject(FAMILY_FILE); Provider.of(context, listen: false) @@ -695,6 +678,7 @@ class _MyFamily extends State with TickerProviderStateMixin { result.list.isFamily = true; } 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); diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 379c4cc8..5b8f4d5e 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -463,11 +463,14 @@ class _AppDrawerState extends State { Utils.hideProgressDialog(); result = CheckActivationCode.fromJson(result); var familyFile = await sharedPref.getObject(FAMILY_FILE); + var currentLang = await sharedPref.getString(APP_LANGUAGE); var mainUser = await sharedPref.getObject(MAIN_USER); this.sharedPref.clear(); if (mainUser["PatientID"] != result.list.patientID) { result.list.isFamily = true; } + this.sharedPref.setString(APP_LANGUAGE, currentLang); + this.sharedPref.setObject(MAIN_USER, mainUser); this.sharedPref.setObject(USER_PROFILE, result.list); this.sharedPref.setObject(FAMILY_FILE, familyFile);