From 3df403b1ad14244402b42e48d8bdcdc7b5a215fe Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 16 Apr 2019 13:55:04 +0545 Subject: [PATCH] Before managing home fragment icon --- .../gmeremittance_native/GmeApplication.java | 3 ++- .../gmeremittance_native/base/PrefKeys.java | 1 + .../CountryFlagMapper.java | 1 + .../adapter/PaymentModeRvAdapter.java | 4 ++-- .../adapter/SendMoneyPayoutModeRvAdapter.java | 2 +- .../model/payoutmode/PayoutMode.java | 16 ++++++++++++++-- .../settings/view/SettingsView.java | 17 ++++++++++++----- .../gateway/SplashScreenGateway.java | 7 +++++++ .../SplashScreenInteractorInterface.java | 2 ++ .../presenter/SplashScreenPresenter.java | 1 + .../utils/https/HttpClientV2.java | 2 +- .../exchange_paymentmode_rv_viewholder.xml | 4 +++- app/src/main/res/layout/home_menu_item_v2.xml | 2 +- .../layout/send_paymentmode_rv_viewholder.xml | 2 ++ 14 files changed, 50 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java index 31bbc1d4..d742586b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java @@ -18,6 +18,7 @@ import java.util.Calendar; import io.fabric.sdk.android.Fabric; +import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LOCALE; @@ -196,7 +197,7 @@ public class GmeApplication extends MultiDexApplication { { if(gmeSharedPreferences==null) return "en"; - return gmeSharedPreferences.getString(USER_PREFERRED_LOCALE,"en"); + return gmeSharedPreferences.getString(USER_PREFERRED_COUNTRY_CODE,"en"); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java index b026b4f5..c6aab6d1 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java @@ -46,4 +46,5 @@ public class PrefKeys { public static String USER_LAST_INITIATED_PENNY_TEST_MESSAGE="USER_LAST_INITIATED_PENNY_TEST_MESSAGE"; public static String USER_PREFERRED_LOCALE ="USER_PREFERRED_LOCALE"; public static String USER_PREFERRED_LANGUAGE ="USER_PREFERRED_LANGUAGE"; + public static String USER_PREFERRED_COUNTRY_CODE ="USER_PREFERRED_COUNTRY_CODE"; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java index 48acef30..2d3a8cd4 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java @@ -218,6 +218,7 @@ public class CountryFlagMapper { case "ID": return R.drawable.flag_indonesia; case "RU": return R.drawable.flag_russia; case "GB": return R.drawable.flag_united_kingdom; + case "EN": return R.drawable.flag_united_kingdom; case "UZ": return R.drawable.flag_uzbekistn; case "US": return R.drawable.flag_united_states_of_america; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/adapter/PaymentModeRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/adapter/PaymentModeRvAdapter.java index e5658c35..731974ea 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/adapter/PaymentModeRvAdapter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/adapter/PaymentModeRvAdapter.java @@ -41,8 +41,8 @@ public class PaymentModeRvAdapter extends RecyclerView.Adapter bankList = null; - public PayoutMode(String id, String mode, String payoutPartner, List payCurrency, String bankrequired, List bankList) { + public PayoutMode(String id, String mode, String payoutPartner, List payCurrency, String bankrequired, List bankList, String modeDescription) { this.id = id; this.mode = mode; this.payoutPartner = payoutPartner; this.payCurrency = payCurrency; this.bankrequired = bankrequired; this.bankList = bankList; + this.modeDescription=modeDescription; } public String getId() { @@ -82,7 +86,15 @@ public class PayoutMode { this.bankList = bankList; } + public String getModeDescription() { + return modeDescription; + } + + public void setModeDescription(String modeDescription) { + this.modeDescription = modeDescription; + } + public PayoutMode cloneData() { - return new PayoutMode(this.id,this.mode,this.payoutPartner,this.payCurrency,this.bankrequired,this.bankList); + return new PayoutMode(this.id,this.mode,this.payoutPartner,this.payCurrency,this.bankrequired,this.bankList,this.modeDescription); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/SettingsView.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/SettingsView.java index 78f917f6..c1a3b467 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/SettingsView.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/SettingsView.java @@ -1,6 +1,7 @@ package com.gmeremit.online.gmeremittance_native.settings.view; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.View; @@ -18,6 +19,8 @@ import java.util.List; import butterknife.ButterKnife; import butterknife.OnClick; +import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; +import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LANGUAGE; import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LOCALE; /** @@ -65,23 +68,27 @@ public class SettingsView extends BaseActivity { @Override public void onLangugageSelected(LanguageModel languageModel) { languageSelectionDialog.dismiss(); - - changeLocale(languageModel.getLocaleCode()); + changeLocale(languageModel); } }); if (!languageSelectionDialog.isAdded()) languageSelectionDialog.show(getSupportFragmentManager(), "GenericTextListingDialog"); } - private void changeLocale(String localeCode) { - GmeApplication.getStorage().edit().putString(USER_PREFERRED_LOCALE, localeCode).apply(); + private void changeLocale(LanguageModel lang) { + SharedPreferences myPreferences= GmeApplication.getStorage(); + + myPreferences.edit().putString(USER_PREFERRED_LOCALE, lang.getLocaleCode()).apply(); + myPreferences.edit().putString(USER_PREFERRED_COUNTRY_CODE,lang.getCountryCode()).apply(); + myPreferences.edit().putString(USER_PREFERRED_LANGUAGE,lang.getCountryName()).apply(); + restartApp(); } private List getLanguagedata() { List models = new ArrayList<>(); - models.add(new LanguageModel("GB", "en", GmeApplication.getStringExtractor().getStringFromStringId(R.string.english_language_text),"English")); + models.add(new LanguageModel("EN", "en", GmeApplication.getStringExtractor().getStringFromStringId(R.string.english_language_text),"English")); models.add(new LanguageModel("KH", "km", GmeApplication.getStringExtractor().getStringFromStringId(R.string.cambodia_lanugage_text),"Cambodia")); // models.add(new LanguageModel("CN", "th", "China")); models.add(new LanguageModel("KR", "ko", GmeApplication.getStringExtractor().getStringFromStringId(R.string.korean_language_text),"Korea")); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/gateway/SplashScreenGateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/gateway/SplashScreenGateway.java index 4ced6aa4..1e1d03a0 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/gateway/SplashScreenGateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/gateway/SplashScreenGateway.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_LOGGED_IN_STATUS; +import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LANGUAGE; import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LOCALE; @@ -69,6 +70,12 @@ public class SplashScreenGateway extends PrivilegedGateway implements SplashScre myPreferences.edit().putString(USER_PREFERRED_LOCALE,localeCode).apply(); } + @Override + public void updatePreferredCountryToStorage(String countryCode) { + SharedPreferences myPreferences= GmeApplication.getStorage(); + myPreferences.edit().putString(USER_PREFERRED_COUNTRY_CODE,countryCode).apply(); + } + @Override public String getPreferredLocale() { return GmeApplication.getStorage().getString(USER_PREFERRED_LOCALE,null); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenInteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenInteractorInterface.java index 19f30d62..0f601d70 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenInteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenInteractorInterface.java @@ -16,6 +16,8 @@ public interface SplashScreenInteractorInterface extends BaseInteractorInterface void updatePreferredLocaleToStorage(String localeCode); + void updatePreferredCountryToStorage(String countryCode); + String getPreferredLocale(); void updatePreferredLanguageToStorage(String languageString); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java index 856c132a..2b171bd6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java @@ -58,6 +58,7 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen public void updatePreferredLanguage(LanguageModel selectedLanguage) { this.gateway.updatePreferredLocaleToStorage(selectedLanguage.getLocaleCode()); this.gateway.updatePreferredLanguageToStorage(selectedLanguage.getCountryName()); + this.gateway.updatePreferredCountryToStorage(selectedLanguage.getCountryCode()); } @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java index d5c4120d..c6144b50 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java @@ -53,7 +53,7 @@ public class HttpClientV2 { Interceptor authInterceptor = chain -> { Request newRequest = chain.request().newBuilder() .addHeader("GME-TOKEN", "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru") - .addHeader("lang",GmeApplication.getSelectedLanguage()) + .addHeader("lang",GmeApplication.getSelectedLanguage().toLowerCase()) .build(); return chain.proceed(newRequest); }; diff --git a/app/src/main/res/layout/exchange_paymentmode_rv_viewholder.xml b/app/src/main/res/layout/exchange_paymentmode_rv_viewholder.xml index c2136401..46aa7fc3 100644 --- a/app/src/main/res/layout/exchange_paymentmode_rv_viewholder.xml +++ b/app/src/main/res/layout/exchange_paymentmode_rv_viewholder.xml @@ -30,7 +30,9 @@ android:minLines="2" android:text="Home Delivery" android:textColor="@color/darkgray" - android:textSize="13sp" + android:textSize="15sp" + android:paddingStart="3dp" + android:paddingEnd="3dp" />