Before managing home fragment icon

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");
 
     }
 

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";
 }

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;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/adapter/PaymentModeRvAdapter.java

@@ -41,8 +41,8 @@ public class PaymentModeRvAdapter extends RecyclerView.Adapter<PaymentModeViewHo
             }
         });
         holder.setImage(PaymentModeMapper.getPaymentModeImageFromId(data.get(holder.getAdapterPosition()).getId()));
-        holder.setTitle(data.get(holder.getAdapterPosition()).getText());
-        holder.setDesc(data.get(holder.getAdapterPosition()).getDescription());
+        holder.setTitle(data.get(holder.getAdapterPosition()).getDescription());
+//        holder.setDesc(data.get(holder.getAdapterPosition()).getDescription());
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/adapter/SendMoneyPayoutModeRvAdapter.java

@@ -41,7 +41,7 @@ public class SendMoneyPayoutModeRvAdapter extends RecyclerView.Adapter<SendMoney
             }
         });
         holder.setImage(PaymentModeMapper.getPaymentModeImageFromId(payoutModeList.get(holder.getAdapterPosition()).getId()));
-        holder.setTitle(payoutModeList.get(holder.getAdapterPosition()).getMode());
+        holder.setTitle(payoutModeList.get(holder.getAdapterPosition()).getModeDescription());
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/PayoutMode.java

@@ -12,6 +12,9 @@ public class PayoutMode {
     @SerializedName("Mode")
     @Expose
     private String mode;
+    @SerializedName("ModeDescription")
+    @Expose
+    private String modeDescription;
     @SerializedName("PayoutPartner")
     @Expose
     private String payoutPartner;
@@ -25,13 +28,14 @@ public class PayoutMode {
     @Expose
     private List<BankList> bankList = null;
 
-    public PayoutMode(String id, String mode, String payoutPartner, List<String> payCurrency, String bankrequired, List<BankList> bankList) {
+    public PayoutMode(String id, String mode, String payoutPartner, List<String> payCurrency, String bankrequired, List<BankList> 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);
     }
 }

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<LanguageModel> getLanguagedata() {
         List<LanguageModel> 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"));

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);

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);

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

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);
         };

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"
                 />
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/paymentModeDescTxt"

app/src/main/res/layout/home_menu_item_v2.xml

@@ -37,7 +37,7 @@
             android:paddingEnd="5dp"
             android:gravity="center"
             app:txtfontName="@string/semibold"
-            android:textSize="12sp"
+            android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/image"
             app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/send_paymentmode_rv_viewholder.xml

@@ -28,6 +28,8 @@
             android:gravity="center"
             android:singleLine="false"
             android:maxLines="2"
+            android:paddingStart="3dp"
+            android:paddingEnd="3dp"
             android:text="Home Delivery"
             android:textColor="@color/darkgray"
             android:textSize="15sp"