-added icons for UI changes

-Removed unused codes in xml after lint check

app/src/androidTest/java/com/swifttech/remit/android/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.swifttech.remit.android;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.gmeremit.online.gmeremittance_native", appContext.getPackageName());
-    }
-}

app/src/main/java/com/swifttech/remit/android/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java

@@ -72,8 +72,8 @@ public class BankWithIconListingDialog<T extends BankWithIconListingDialog.Image
         textListRv.setAdapter(genericTextListingRvAdapter);
         LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST);
         textListRv.addItemDecoration(lineDividerItemDecoration);
-        titleView.setText(titleText != null && titleText.length() > 0 ? titleText : "Select Data");
-        searchEditTextView.setHint(hintText != null && hintText.length() > 0 ? hintText : "Search Data");
+        titleView.setText(titleText != null && titleText.length() > 0 ? titleText : getActivity().getResources().getString(R.string.selectdata_text));
+        searchEditTextView.setHint(hintText != null && hintText.length() > 0 ? hintText :getActivity().getResources().getString(R.string.searchdata_text));
         noDataFoundView.setHint(noDataFoundText != null && noDataFoundText.length() > 0 ? noDataFoundText : "No Data Found");
         if (shouldDisableSearch)
             searchViewContainer.setVisibility(View.GONE);

app/src/main/java/com/swifttech/remit/android/common/customwidgets/common/GenericImageWithTextListingDialog.java

@@ -70,9 +70,9 @@ public class GenericImageWithTextListingDialog<T extends GenericImageWithTextLis
         textListRv.setAdapter(genericTextListingRvAdapter);
 //        LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(textListRv.getContext(), LineDividerItemDecoration.VERTICAL_LIST);
 //        textListRv.addItemDecoration(lineDividerItemDecoration);
-        titleView.setText(titleText != null && titleText.length() > 0 ? titleText : "Select Data");
-        searchEditTextView.setHint(hintText != null && hintText.length() > 0 ? hintText : "Search Data");
-        noDataFoundView.setHint(noDataFoundText != null && noDataFoundText.length() > 0 ? noDataFoundText : "No Data Found");
+        titleView.setText(titleText != null && titleText.length() > 0 ? titleText : getActivity().getResources().getString(R.string.selectdata_text));
+        searchEditTextView.setHint(hintText != null && hintText.length() > 0 ? hintText : getActivity().getResources().getString(R.string.searchdata_text));
+        noDataFoundView.setHint(noDataFoundText != null && noDataFoundText.length() > 0 ? noDataFoundText : getActivity().getResources().getString(R.string.nodatafound_text));
         if (shouldDisableSearch)
             searchViewContainer.setVisibility(View.GONE);
 

app/src/main/java/com/swifttech/remit/android/common/view/qrscanner/QRScannerFragment.java

@@ -278,7 +278,7 @@ public  abstract class QRScannerFragment extends BaseFragment  {
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
         builder.setTitle("Multitracker sample")
                 .setMessage("No camera permission")
-                .setPositiveButton("Ok", listener)
+                .setPositiveButton(getActivity().getResources().getString(R.string.ok_text), listener)
                 .show();
     }
 

app/src/main/java/com/swifttech/remit/android/features/balancerequest/presenter/BalanceRequestPresenter.java

@@ -7,6 +7,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.google.gson.reflect.TypeToken;
 import com.google.zxing.WriterException;
+import com.swifttech.remit.android.R;
 import com.swifttech.remit.android.base.BaseViewModel;
 import com.swifttech.remit.android.common.customwidgets.CustomAlertDialog;
 import com.swifttech.remit.android.features.balancerequest.model.BalanceRequestDTO;
@@ -105,7 +106,9 @@ public class BalanceRequestPresenter extends BaseViewModel implements BalanceReq
             generatedQrLiveData.setValue(Utils.createQr(data, 500, 500));
             view.showQRView();
         } catch (WriterException e) {
+            //TOdo get context here   unAbletoGenQR_text
                 view.showToastMessage("Unable to generate QR");
+
         }
 
     }

app/src/main/java/com/swifttech/remit/android/features/balancerequest/view/BalanceRequestActivity.java

@@ -35,7 +35,7 @@ public class BalanceRequestActivity extends BaseActivity implements BalanceReque
 
 
     private void initialize() {
-        toolbarTitle.setText("Request Balance");
+        toolbarTitle.setText(getResources().getString(R.string.requestBalance_text));
 
 
         BalanceRequestViewModelFactory balanceRequestViewModelFactory = new BalanceRequestViewModelFactory(this);

app/src/main/java/com/swifttech/remit/android/features/balancesend/view/BalanceSendActivity.java

@@ -38,7 +38,7 @@ public class BalanceSendActivity extends BaseActivity implements BalanceSendPres
     private void initialize() {
         fm=getSupportFragmentManager();
 
-        toolbarTitle.setText("Send Balance");
+        toolbarTitle.setText(getResources().getString(R.string.sendBalanceText));
         BalanceSendViewModelFactory balanceSendViewModelFactory = new BalanceSendViewModelFactory(this);
         viewModel = new ViewModelProvider(this, balanceSendViewModelFactory).get(BalanceSendPresenter.class);
         balanceSendQrView=new BalanceSendQRScanFragment();

app/src/main/java/com/swifttech/remit/android/features/cashpickuptowallet/view/CashPickupToWalletActivity.java

@@ -52,7 +52,7 @@ public class CashPickupToWalletActivity extends BaseActivity implements CashPick
     }
 
     private void init() {
-        toolbarTitle.setText("Redeem CashPickup");
+        toolbarTitle.setText(getResources().getString(R.string.reedemCashPickUp_text));
         viewModel = new ViewModelProvider(this, new CashPickupViewModelFactory(this)).get(CashPickupToWalletPresenter.class);
         setupViewPager();
 

app/src/main/java/com/swifttech/remit/android/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java

@@ -100,7 +100,7 @@ public class CashPickupTxnDetailFragment extends BaseFragment {
 
     private void onCashPickupTxnDetailReceived(CashPickupTxnDetailDTO receiptViewModel) {
 
-        tv_gme_control_no.setText("Control No: "+receiptViewModel.getControlNo());
+        tv_gme_control_no.setText(getActivity().getResources().getString(R.string.controlno_text)+receiptViewModel.getControlNo());
         transaction_date.setText(receiptViewModel.getTranDate());
         tv_receiver.setText(receiptViewModel.getReceiverName());
         tv_address.setText(receiptViewModel.getReceiverAddress());

app/src/main/java/com/swifttech/remit/android/features/changetxnpin/presenter/ChangePinV2Presenter.java

@@ -107,7 +107,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
                 return true;
             } else {
                 this.currentPin = null;
-                changePinLiveData.setCurrentPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
+                changePinLiveData.setCurrentPinInputLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.pinlengthmustbe_text)));
                 return false;
             }
 
@@ -121,7 +121,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
                 return true;
             } else {
                 this.newPin = null;
-                changePinLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
+                changePinLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.pinlengthmustbe_text)));
                 return false;
             }
 
@@ -129,7 +129,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
 
         public boolean doesConfirmPasswordMatchWithNewPassword() {
             boolean result = (confirmPin != null && confirmPin.equalsIgnoreCase(newPin));
-            changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(result, "Confirmed pin doesn't match with entered pin"));
+            changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(result, view.getContext().getResources().getString(R.string.cnfmpinnotmatched_text)));
             return result;
         }
 
@@ -142,7 +142,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
 
             } else {
                 this.confirmPin = null;
-                changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
+                changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.pinlengthmustbe_text)));
                 return false;
             }
 

app/src/main/java/com/swifttech/remit/android/features/changetxnpin/view/ChangeTxnPinActivity.java

@@ -124,7 +124,7 @@ public class ChangeTxnPinActivity extends BaseActivity implements ChangePinV2Pre
     private void performDefaultAction(Bundle savedInstanceState) {
         if(savedInstanceState==null)
         {
-            toolbarTitle.setText("Change Pin");
+            toolbarTitle.setText(getResources().getString(R.string.changepin_text));
             iv_cancel.setVisibility(View.INVISIBLE);
         }
     }

app/src/main/java/com/swifttech/remit/android/features/customersupport/presenter/CustomerSupportPresenter.java

@@ -133,6 +133,7 @@ public class CustomerSupportPresenter implements CustomerSupportContract.IPresen
     public void onFeedbackError(Throwable t) {
         isfView.showProgress(false);
         if (t instanceof IOException)
+            //Todo context require error_text
             isfView.showGeneralDialog("Error", "Connection Lost", ERROR);
         else
             isfView.showGeneralDialog("Error", t.getMessage(), ERROR);
@@ -144,6 +145,7 @@ public class CustomerSupportPresenter implements CustomerSupportContract.IPresen
     @Override
     public void onGeneralEnquirySuccess() {
         igeView.showProgress(false);
+        //TODO require context here  general_enquiry_thank_you
         igeView.showDialog("Thank you for contacting us.", "We will assess your requirements and be in touch withCountdownTimer you shortly.");
         igeView.clearFields();
     }
@@ -164,6 +166,7 @@ public class CustomerSupportPresenter implements CustomerSupportContract.IPresen
     public void onGeneralEnquiryError(Throwable t) {
         igeView.showProgress(false);
         if (t instanceof IOException)
+            //Todo context require error_text
             igeView.showGeneralDialog("Error", "Connection Lost", ERROR);
         else {
             igeView.showGeneralDialog("Error", t.getMessage(), ERROR);
@@ -176,6 +179,7 @@ public class CustomerSupportPresenter implements CustomerSupportContract.IPresen
     @Override
     public void onTransactionAmendmentSuccess() {
         itaView.showProgress(false);
+        //TODO require context here  general_enquiry_thank_you
         itaView.showDialog("Thank you for contacting us.", "We will assess your requirements and be in touch withCountdownTimer you shortly.");
         itaView.clearFields();
     }
@@ -196,6 +200,7 @@ public class CustomerSupportPresenter implements CustomerSupportContract.IPresen
     public void onTransactionAmendmentError(Throwable t) {
         itaView.showProgress(false);
         if (t instanceof IOException)
+            //Todo context require error_text
             itaView.showGeneralDialog("Error", "Connection Lost", ERROR);
         else
             itaView.showGeneralDialog("Error", t.getMessage(), ERROR);

app/src/main/java/com/swifttech/remit/android/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java

@@ -360,7 +360,7 @@ public class ExistingCustomerDetailFragment extends BaseFragment implements Exis
             idTypeSelectSubject.onNext(selectedIDType);
 
         });
-        idTypeSelectionDialog.setHintAndTitle("Search ID Type", "Select ID Type", getString(R.string.no_result_found_text));
+        idTypeSelectionDialog.setHintAndTitle(getActivity().getResources().getString(R.string.search_id_type_text), getActivity().getResources().getString(R.string.id_type_placeholder_text), getString(R.string.no_result_found_text));
         if (!idTypeSelectionDialog.isAdded())
             idTypeSelectionDialog.show(getActivity().getSupportFragmentManager(), "IDTYPECHOOSER");
     }
@@ -402,7 +402,7 @@ public class ExistingCustomerDetailFragment extends BaseFragment implements Exis
             sourceOfFundSelectSubject.onNext(sourceOfFund);
         });
 
-        sourceOfFundSelectionDialog.setHintAndTitle("Search Source of Fund ", "Select Source of Fund", getString(R.string.no_result_found_text));
+        sourceOfFundSelectionDialog.setHintAndTitle(getActivity().getResources().getString(R.string.search_source_of_fund), "Select Source of Fund", getString(R.string.no_result_found_text));
         if (!sourceOfFundSelectionDialog.isAdded())
             sourceOfFundSelectionDialog.show(getActivity().getSupportFragmentManager(), "SOURCEOFFUNDTYPECHOOSER");
     }

app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java

@@ -363,7 +363,7 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present
             idTypeSelectSubject.onNext(selectedIDType);
 
         });
-        idTypeSelectionDialog.setHintAndTitle("Search ID Type", "Select ID Type", getString(R.string.no_result_found_text));
+        idTypeSelectionDialog.setHintAndTitle(getActivity().getResources().getString(R.string.search_id_type_text), getActivity().getResources().getString(R.string.id_type_placeholder_text), getString(R.string.no_result_found_text));
         if (!idTypeSelectionDialog.isAdded())
             idTypeSelectionDialog.show(getActivity().getSupportFragmentManager(), "IDTYPECHOOSER");
     }
@@ -408,7 +408,7 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present
             sourceOfFundSelectSubject.onNext(sourceOfFund);
         });
 
-        sourceOfFundSelectionDialog.setHintAndTitle("Search Source of Fund ", "Select Source of Fund", getString(R.string.no_result_found_text));
+        sourceOfFundSelectionDialog.setHintAndTitle(getActivity().getResources().getString(R.string.search_source_of_fund), "Select Source of Fund", getString(R.string.no_result_found_text));
         if (!sourceOfFundSelectionDialog.isAdded())
             sourceOfFundSelectionDialog.show(getActivity().getSupportFragmentManager(), "SOURCEOFFUNDTYPECHOOSER");
     }

app/src/main/java/com/swifttech/remit/android/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3Presenter.java

@@ -94,7 +94,7 @@ public abstract class RecipientAddEditBaseV3Presenter extends BasePresenter impl
     public List<ServiceTypeModel> getAvailableServiceMethodList() {
         if (this.validator.getSelectedCountryServiceData() != null)
             return this.validator.getSelectedCountryServiceData().getServiceAvailable();
-        view.showToastMessage("No payment mode available for country : " + validator.getRecipientDetail().getCountry());
+        view.showToastMessage(view.getContext().getResources().getString(R.string.no_payment_mode_available_text)+ validator.getRecipientDetail().getCountry());
         return null;
     }
 

app/src/main/java/com/swifttech/remit/android/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2Presenter.java

@@ -376,7 +376,7 @@ public class ExistingCustomerRegisterV2Presenter extends BaseViewModel implement
 
         public boolean validatePin(CharSequence pin) {
             if (pin == null || pin.length() != 6) {
-                existingRegisterSubmitViewLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
+                existingRegisterSubmitViewLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.pinlengthmustbe_text)));
                 this.pin = null;
                 return false;
             } else {
@@ -388,7 +388,7 @@ public class ExistingCustomerRegisterV2Presenter extends BaseViewModel implement
 
         public boolean validateConfirmPin(CharSequence pin) {
             if (pin == null || pin.length() !=6) {
-                existingRegisterSubmitViewLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
+                existingRegisterSubmitViewLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.pinlengthmustbe_text)));
                 this.confirmPin = null;
                 return false;
             } else {

app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java

@@ -212,7 +212,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
         receiverNameTextView.setText(String.format("%s : %s", getString(R.string.to_text), name));
 
         payoutAmountTextView.setText(recieptData.getPAmount());
-        gmeControlNumberTextView.setText(String.format("Fast Remit Control No. %s", recieptData.getControlNo()));
+        gmeControlNumberTextView.setText(String.format("JME Control No. %s", recieptData.getControlNo()));
         transactionDateTextView.setText(recieptData.getTrnDate());
         receiverTextView.setText(name);
         addressTextView.setText(recieptData.getRAddress());

app/src/main/java/com/swifttech/remit/android/features/termsandcondition/view/TermsAndConditionAcitivity.java

@@ -152,7 +152,7 @@ public class  TermsAndConditionAcitivity extends BaseActivity implements WebBrow
     public void onPageSelected(int position) {
             if(position==0)
             {
-                toolbar_title.setText("Terms And Conditions");
+                toolbar_title.setText(getResources().getString(R.string.terms_and_conditions_text));
             }
     }
 

app/src/main/java/com/swifttech/remit/android/features/userprofile/view/ProfileActivity.java

@@ -78,12 +78,12 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente
 
     public void setWalletNo(String walletNumber, String bankName) {
         if (walletNumber== null || walletNumber.length()<=0){
-            walletNumber="N/A";
+            walletNumber=getResources().getString(R.string.na_text);
         }
 //        if(bankName!=null&&bankName.length()>0)
 //            bankName=" - "+bankName;
         String gmeWalletNo=getString(R.string.gme_wallet_no_text);
-        tvWalletNumber.setText(Html.fromHtml(gmeWalletNo + "<b><font color='#ed1c24'> " + walletNumber + "</font></b>"));
+        tvWalletNumber.setText(Html.fromHtml(gmeWalletNo + "<b><font color='#2A2A82'> " + walletNumber + "</font></b>"));
     }
 
 
@@ -103,7 +103,7 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente
                     tvBalance.setText(balance);
                 }
             else
-                tvBalance.setText("N/A");
+                tvBalance.setText(getResources().getString(R.string.na_text));
         }
     }
 

app/src/main/java/com/swifttech/remit/android/features/webbrowser/WebBrowserFragmentV2.java

@@ -360,7 +360,7 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment {
         }
 
         private void showPermissionNeededDialog() {
-            showPopUpMessage("Please grant the required permissions", CustomAlertDialog.AlertType.ALERT, alertType -> {
+            showPopUpMessage(getActivity().getResources().getString(R.string.grant_permission_text), CustomAlertDialog.AlertType.ALERT, alertType -> {
                 checkPermissionAndProceed();
             });
         }

app/src/main/java/com/swifttech/remit/android/features/webbrowser/WebBrowserV2Activity.java

@@ -482,7 +482,7 @@ public abstract class  WebBrowserV2Activity extends BaseActivity implements View
         }
 
         private void showPermissionNeededDialog() {
-            showPopUpMessage("Please grant the required permissions", CustomAlertDialog.AlertType.ALERT, alertType -> {
+            showPopUpMessage(getResources().getString(R.string.grant_permission_text), CustomAlertDialog.AlertType.ALERT, alertType -> {
                 checkPermissionAndProceed();
             });
         }

app/src/main/res/drawable/icv_fb.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="75dp"
+    android:height="75dp"
+    android:viewportWidth="75"
+    android:viewportHeight="75">
+  <path
+      android:pathData="M37.5,0L37.5,0A37.5,37.5 0,0 1,75 37.5L75,37.5A37.5,37.5 0,0 1,37.5 75L37.5,75A37.5,37.5 0,0 1,0 37.5L0,37.5A37.5,37.5 0,0 1,37.5 0z"/>
+  <path
+      android:pathData="M37.5,0L37.5,0A37.5,37.5 0,0 1,75 37.5L75,37.5A37.5,37.5 0,0 1,37.5 75L37.5,75A37.5,37.5 0,0 1,0 37.5L0,37.5A37.5,37.5 0,0 1,37.5 0z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M43.1104,26.8533H46.2829V21.487C44.7468,21.3273 43.2034,21.2484 41.6591,21.2508C37.0691,21.2508 33.9304,24.052 33.9304,29.182V33.6033H28.7498V39.6108H33.9304V55.0007H40.1404V39.6108H45.3041L46.0803,33.6033H40.1404V29.7726C40.1404,28.0008 40.6129,26.8533 43.1104,26.8533Z"
+      android:fillColor="#3453A4"/>
+</vector>

app/src/main/res/drawable/icv_help.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="62dp"
+    android:height="62dp"
+    android:viewportWidth="62"
+    android:viewportHeight="62">
+  <path
+      android:pathData="M31,62C48.1208,62 62,48.1208 62,31C62,13.8792 48.1208,0 31,0C13.8792,0 0,13.8792 0,31C0,48.1208 13.8792,62 31,62Z"
+      android:fillColor="#DC1431"/>
+  <group>
+    <clip-path
+        android:pathData="M31,62C48.1208,62 62,48.1208 62,31C62,13.8792 48.1208,0 31,0C13.8792,0 0,13.8792 0,31C0,48.1208 13.8792,62 31,62Z"/>
+    <path
+        android:pathData="M12.7483,38.0746C12.2908,38.9046 11.4075,39.4669 10.3928,39.4669C8.9142,39.4669 7.7046,38.2674 7.7046,36.7786V30.0501C7.7046,29.1527 8.1447,28.3585 8.8207,27.8702C9.3449,21.2372 14.9098,16 21.6754,16C28.441,16 34.006,21.2372 34.5302,27.8703C35.206,28.3586 35.6462,29.1527 35.6462,30.0503V31.9153V36.7788C35.6462,37.6582 35.2238,38.4389 34.571,38.9294V40.0848C34.571,44.4743 30.9998,48.0454 26.6104,48.0454H21.8985C21.0078,48.0454 20.2856,47.3233 20.2856,46.4324C20.2856,45.5417 21.0078,44.8195 21.8985,44.8195H26.6104C29.2211,44.8195 31.345,42.6955 31.345,40.0848V38.9294C31.0406,38.7007 30.7866,38.4088 30.6018,38.0732C30.273,38.9682 29.9022,39.789 29.4236,40.5639C29.1245,41.0481 28.5454,41.9617 27.9014,42.3218C27.5179,42.5362 27.0804,42.6688 26.6105,42.6688H21.8986C20.5556,42.6688 19.3778,43.3727 18.7118,44.431C15.9577,43.3961 13.8691,41.0276 12.7957,38.2022L12.7848,38.1728C12.7725,38.1401 12.7603,38.1075 12.7483,38.0746ZM31.2976,27.9369C30.8147,23.0534 26.6838,19.2259 21.6754,19.2259C16.6671,19.2259 12.5362,23.0534 12.053,27.937C12.37,28.1864 12.6297,28.505 12.8086,28.8707L12.8146,28.8548C14.2999,24.9949 17.6429,22.1353 21.6754,22.1353C25.6226,22.1353 29.0201,24.8999 30.542,28.8706C30.7209,28.5049 30.9806,28.1863 31.2976,27.9369ZM26.6103,50.1959C29.9683,50.1959 32.9487,48.5501 34.7887,46.023C39.3102,48.6498 42.3508,53.545 42.3509,59.1507V60.0992C42.3509,61.403 41.2939,62.46 39.9901,62.46H3.3608C2.057,62.46 1,61.403 1,60.0992V59.1507C1,51.8941 6.0948,45.8285 12.902,44.3331C13.9515,45.4279 15.1436,46.3117 16.4566,46.964C17.0765,47.2721 17.7119,47.5229 18.3598,47.7162C18.8846,49.1626 20.2707,50.1959 21.8984,50.1959H26.6103Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M53.711,14H37.8449C36.8275,14 36,14.8433 36,15.8799V24.223C36,25.2597 36.8277,26.103 37.8449,26.103H39.238V29.4149C39.238,29.6438 39.3691,29.8517 39.5735,29.947C39.6499,29.9825 39.7313,30 39.8121,30C39.9475,30 40.0813,29.9513 40.1875,29.8575L44.4515,26.1029H53.7108C54.7282,26.1029 55.5555,25.2595 55.5555,24.2229V15.8799C55.5558,14.8433 54.7282,14 53.711,14ZM42.4168,19.7027L41.5696,20.5444L41.7696,21.733C41.7841,21.8188 41.7495,21.9053 41.6803,21.9565C41.6414,21.9854 41.5951,22.0001 41.5485,22.0001C41.513,22.0001 41.4771,21.9914 41.4443,21.9739L40.3969,21.4128L39.3497,21.9739C39.2741,22.0143 39.1824,22.0076 39.1134,21.9565C39.0443,21.9054 39.0098,21.8188 39.0243,21.733L39.2243,20.5444L38.3769,19.7027C38.316,19.6419 38.2937,19.5511 38.3201,19.4685C38.3463,19.3858 38.4167,19.3255 38.5012,19.313L39.6721,19.1396L40.1958,18.0583C40.2337,17.9802 40.3116,17.9308 40.3969,17.9308C40.4823,17.9308 40.5603,17.9802 40.5979,18.0583L41.1217,19.1396L42.2924,19.313C42.3771,19.3255 42.447,19.3858 42.4737,19.4685C42.4999,19.5511 42.4779,19.6421 42.4168,19.7027ZM47.7979,19.7027L46.9506,20.5444L47.1507,21.733C47.165,21.8188 47.1305,21.9053 47.0615,21.9565C47.0225,21.9854 46.9764,22.0001 46.9297,22.0001C46.894,22.0001 46.8584,21.9914 46.8251,21.9739L45.7779,21.4128L44.7307,21.9739C44.655,22.0143 44.5636,22.0076 44.4945,21.9565C44.4253,21.9054 44.3908,21.8188 44.4052,21.733L44.6052,20.5444L43.758,19.7027C43.6971,19.6419 43.6749,19.5511 43.7013,19.4685C43.7275,19.3858 43.7975,19.3255 43.8823,19.313L45.0532,19.1396L45.5769,18.0583C45.6147,17.9802 45.6927,17.9308 45.7779,17.9308C45.8633,17.9308 45.9411,17.9802 45.9789,18.0583L46.5027,19.1396L47.6735,19.313C47.7583,19.3255 47.8281,19.3858 47.8546,19.4685C47.8811,19.5511 47.8589,19.6421 47.7979,19.7027ZM53.1789,19.7027L52.3315,20.5444L52.5313,21.733C52.5459,21.8188 52.5115,21.9053 52.4423,21.9565C52.4033,21.9854 52.3571,22.0001 52.3104,22.0001C52.2747,22.0001 52.2391,21.9914 52.206,21.9739L51.1586,21.4128L50.1113,21.9739C50.0359,22.0143 49.9443,22.0076 49.8753,21.9565C49.8061,21.9054 49.7717,21.8188 49.7859,21.733L49.9861,20.5444L49.1387,19.7027C49.0779,19.6419 49.0557,19.5511 49.082,19.4685C49.1082,19.3858 49.1786,19.3255 49.2631,19.313L50.4341,19.1396L50.9578,18.0583C50.9954,17.9802 51.0735,17.9308 51.1586,17.9308C51.2439,17.9308 51.3222,17.9802 51.3599,18.0583L51.8837,19.1396L53.0545,19.313C53.139,19.3255 53.2089,19.3858 53.2356,19.4685C53.262,19.5511 53.24,19.6421 53.1789,19.7027Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>

app/src/main/res/drawable/icv_kyc_non_verified_userstatus.xml

@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="201dp"
+    android:height="216dp"
+    android:viewportWidth="201"
+    android:viewportHeight="216">
+  <path
+      android:pathData="M132.54,63.544H121.797C120.31,60.074 117.335,57.429 113.533,56.603C112.046,52.14 106.922,49 100.807,49C94.692,49 89.733,52.14 88.081,56.603C84.279,57.429 81.304,60.074 79.817,63.544H67.751C62.297,63.544 58,68.007 58,73.296V158.249C58,163.703 62.463,168 67.751,168H132.375C137.829,168 142.126,163.537 142.126,158.249V73.296C142.292,67.842 137.829,63.544 132.54,63.544ZM91.056,62.883C92.874,62.883 94.361,61.396 94.361,59.578C94.361,57.76 97.006,55.611 100.972,55.611C104.774,55.611 107.583,57.76 107.583,59.578C107.583,61.396 109.071,62.883 110.889,62.883C113.864,62.883 116.343,65.363 116.343,68.338V71.643H85.436V68.338C85.436,65.363 87.915,62.883 91.056,62.883ZM135.681,158.249C135.681,160.067 134.193,161.389 132.54,161.389H67.751C65.933,161.389 64.611,159.901 64.611,158.249V73.296C64.611,71.478 66.099,70.156 67.751,70.156H78.825V74.949C78.825,76.767 80.313,78.254 82.131,78.254H119.483C121.301,78.254 122.789,76.767 122.789,74.949V70.156H132.375C134.193,70.156 135.515,71.643 135.515,73.296V158.249H135.681Z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M124.606,91.641H75.684C73.866,91.641 72.379,93.129 72.379,94.947C72.379,96.765 73.866,98.253 75.684,98.253H124.606C126.425,98.253 127.912,96.765 127.912,94.947C127.912,93.129 126.425,91.641 124.606,91.641Z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M124.607,114.781H104.939C103.121,114.781 101.634,116.269 101.634,118.087C101.634,119.905 103.121,121.392 104.939,121.392H124.607C126.425,121.392 127.913,119.905 127.913,118.087C127.913,116.269 126.425,114.781 124.607,114.781Z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M92.543,108.335L81.469,119.409L77.998,115.938C76.676,114.616 74.693,114.616 73.37,115.938C72.048,117.26 72.048,119.244 73.37,120.566L79.32,126.516C79.981,127.177 80.808,127.508 81.634,127.508C82.461,127.508 83.287,127.177 83.948,126.516L97.336,113.128C98.658,111.806 98.658,109.823 97.336,108.501C96.013,107.013 93.865,107.013 92.543,108.335Z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M124.607,137.424H104.939C103.121,137.424 101.634,138.912 101.634,140.73C101.634,142.548 103.121,144.035 104.939,144.035H124.607C126.425,144.035 127.913,142.548 127.913,140.73C127.913,138.912 126.425,137.424 124.607,137.424Z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M92.543,130.977L81.469,142.051L77.998,138.58C76.676,137.258 74.693,137.258 73.37,138.58C72.048,139.902 72.048,141.886 73.37,143.208L79.32,149.158C79.981,149.819 80.808,150.15 81.634,150.15C82.461,150.15 83.287,149.819 83.948,149.158L97.336,135.77C98.658,134.448 98.658,132.465 97.336,131.143C96.013,129.655 93.865,129.655 92.543,130.977Z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M137,160.5C137,161.881 138.119,163 139.5,163H141C145.418,163 149,159.418 149,155V79C149,74.582 145.418,71 141,71H139.5C138.119,71 137,72.119 137,73.5V73.5C137,74.881 138.119,76 139.5,76H141C142.657,76 144,77.343 144,79V155C144,156.657 142.657,158 141,158H139.5C138.119,158 137,159.119 137,160.5V160.5Z"
+      android:fillColor="#DC1431"
+      android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable/icv_recipient_image.xml

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="126dp"
+    android:height="126dp"
+    android:viewportWidth="126"
+    android:viewportHeight="126">
+  <path
+      android:pathData="M63,63m-61.5,0a61.5,61.5 0,1 1,123 0a61.5,61.5 0,1 1,-123 0"
+      android:strokeWidth="3"
+      android:fillColor="#00000000"
+      android:strokeColor="#8c96a0"/>
+  <path
+      android:pathData="M59.412,61.412C62.782,61.412 66.013,60.073 68.396,57.69C70.779,55.307 72.118,52.076 72.118,48.706C72.118,45.336 70.779,42.104 68.396,39.722C66.013,37.339 62.782,36 59.412,36C56.042,36 52.81,37.339 50.428,39.722C48.045,42.104 46.706,45.336 46.706,48.706C46.706,52.076 48.045,55.307 50.428,57.69C52.81,60.073 56.042,61.412 59.412,61.412Z"
+      android:fillColor="#8c96a0"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M84.823,90C84.823,83.261 82.146,76.797 77.38,72.032C72.615,67.266 66.151,64.589 59.412,64.589C52.672,64.589 46.208,67.266 41.443,72.032C36.677,76.797 34,83.261 34,90"
+      android:fillColor="#8c96a0"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M80,43H86H92M86,37V49"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#8c96a0"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/icv_support_phone.xml

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60dp"
+    android:height="60dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M30,0L30,0A30,30 0,0 1,60 30L60,30A30,30 0,0 1,30 60L30,60A30,30 0,0 1,0 30L0,30A30,30 0,0 1,30 0z"/>
+  <path
+      android:pathData="M30,0L30,0A30,30 0,0 1,60 30L60,30A30,30 0,0 1,30 60L30,60A30,30 0,0 1,0 30L0,30A30,30 0,0 1,30 0z"
+      android:fillColor="#DC1431"/>
+  <path
+      android:pathData="M36.2137,43.9798C34.8141,43.9267 33.482,43.5642 32.2078,42.994C30.1952,42.0903 28.4095,40.829 26.7396,39.4035C24.5001,37.4946 22.4345,35.4118 20.6342,33.0777C19.4228,31.5072 18.3466,29.8496 17.6516,27.9698C17.2558,26.897 17,25.7904 17,24.6402C17,22.0597 18.7423,19.7739 21.2327,19.078C21.6285,18.9669 22.0242,18.8847 22.4393,18.8799C23.0185,18.8702 23.4335,19.1215 23.7376,19.5999C24.0947,20.1605 24.3023,20.7839 24.5388,21.3976C24.92,22.3883 25.282,23.3886 25.6488,24.3889C25.7309,24.6161 25.784,24.8529 25.8081,25.0896C25.8708,25.6985 25.6199,26.1528 25.089,26.4476C24.6884,26.665 24.283,26.8825 23.8679,27.0661C23.366,27.2884 23.1488,27.675 23.1246,28.1969C23.0957,28.7623 23.2163,29.2987 23.4818,29.7965C25.2724,33.1889 27.8834,35.7598 31.2763,37.5333C31.8603,37.8377 32.4781,37.9489 33.1393,37.7797C33.4579,37.6976 33.6799,37.5188 33.8295,37.2288C34.0418,36.8084 34.2494,36.3832 34.4714,35.9627C34.8382,35.2572 35.345,35.0252 36.122,35.204C36.8266,35.3683 37.4879,35.6535 38.1635,35.8999C38.984,36.1995 39.7948,36.5185 40.6057,36.8326C40.9049,36.9486 41.1848,37.1032 41.4455,37.2917C42.0053,37.6976 42.2177,38.263 42.0825,38.9202C41.8847,39.8674 41.5516,40.7662 40.987,41.5636C40.0893,42.8345 38.8489,43.5642 37.3431,43.8735C36.9714,43.946 36.5998,44.0426 36.2137,43.9798Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M31.1849,17C33.6753,17.0918 35.9341,17.8892 38.0046,19.2761C38.8733,19.856 39.6648,20.5325 40.3212,21.3202C41.1803,22.3544 41.9284,23.4804 42.4689,24.7271C42.8454,25.5873 43.135,26.4765 43.3087,27.3947C43.4438,28.1147 43.5259,28.8396 43.5211,29.5693C43.5211,29.7867 43.2798,30.0139 43.0626,30.0284C42.4931,30.0719 42.3145,29.8399 42.2807,29.2213C42.2131,27.9697 41.967,26.7568 41.5181,25.5873C40.8087,23.7558 39.66,22.2336 38.1783,20.953C36.8366,19.798 35.3115,18.9958 33.5981,18.5609C32.8066,18.3579 31.9958,18.2419 31.1753,18.2033C30.9822,18.1936 30.7892,18.1743 30.6009,18.155C30.4561,18.1405 30.35,18.0631 30.2872,17.9278C30.1183,17.5606 30.4561,17.0048 30.8567,17C30.9629,17 31.0691,17 31.1849,17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M31.1169,20.2334C32.9654,20.3349 34.6981,20.9293 36.257,22.0601C38.1634,23.4373 39.3555,25.2882 39.9974,27.5208C40.176,28.1442 40.2484,28.7965 40.287,29.4441C40.3208,29.9998 39.9878,30.2753 39.4762,30.1351C39.2638,30.0771 39.119,29.8742 39.0901,29.6084C39.0177,28.8932 38.926,28.178 38.7233,27.4821C38.3178,26.0952 37.5939,24.9112 36.5659,23.9012C35.6344,22.9782 34.5629,22.2872 33.3129,21.8716C32.5021,21.6058 31.6623,21.4898 30.8129,21.4512C30.5378,21.4367 30.3157,21.3449 30.1951,21.0742C30.0262,20.6876 30.2964,20.272 30.7405,20.2382C30.8418,20.2286 30.948,20.2334 31.1169,20.2334Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M37.0241,29.4824C37.0386,29.985 36.9469,30.1734 36.6139,30.2701C36.1747,30.4006 35.861,30.1444 35.8031,29.6177C35.6969,28.6415 35.4218,27.7234 34.8668,26.9018C34.1283,25.8097 33.081,25.1766 31.8213,24.8722C31.4545,24.7852 31.0829,24.7369 30.7064,24.6837C30.2528,24.6209 30.0742,24.4421 30.0983,24.0458C30.1225,23.6689 30.3493,23.4804 30.7933,23.4901C33.332,23.5384 35.6052,25.1718 36.5367,27.4382C36.8166,28.0955 36.9759,28.772 37.0241,29.4824Z"
+      android:fillColor="#ffffff"/>
+</vector>

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

@@ -26,7 +26,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="@dimen/_15sdp"
             android:scaleType="centerCrop"
-            android:src="@drawable/ic_recipient_image" />
+            app:srcCompat="@drawable/icv_recipient_image" />
 
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/userName"

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

@@ -39,7 +39,7 @@
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="@dimen/_15sdp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_recipient_image" />
+                    app:srcCompat="@drawable/icv_recipient_image" />
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:id="@+id/userName"

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

@@ -137,7 +137,7 @@
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:contentDescription="@string/app_name"
-                        android:src="@drawable/ic_fb" />
+                        app:srcCompat="@drawable/icv_fb" />
 
                     <ImageView
                         android:visibility="gone"

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

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".features.addautodebitV2.view.AddPrimaryAccounAsAutoDebitActivity">
+    >
     <include layout="@layout/layout_sendmoney_toolbar" />
     <com.swifttech.remit.android.common.customwidgets.SwipeDisabledViewPager
         android:id="@+id/addAutoDebitAccountViewPager"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 

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

@@ -2,7 +2,6 @@
 
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_gray"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/background_gray"
-    tools:context=".features.userprofile.view.EditProfileDetailActivity">
+    >
     <include layout="@layout/layout_sendmoney_toolbar"/>
    <ScrollView
        android:layout_width="match_parent"
@@ -18,7 +16,7 @@
            <com.swifttech.remit.android.common.customwidgets.GmeTextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:text="Change Password"
+               android:text="@string/change_password_text"
                android:textSize="18sp"
                android:textColor="@color/darkgray"
                android:padding="10dp"
@@ -33,7 +31,7 @@
                <com.swifttech.remit.android.common.customwidgets.GmeTextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:text="Current Password"
+                   android:text="@string/current_password_text"
                    android:textSize="14sp"
                    android:padding="10dp"
                    android:textColor="@color/darkgray"/>
@@ -59,7 +57,7 @@
                <com.swifttech.remit.android.common.customwidgets.GmeTextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:text="New Password"
+                   android:text="@string/new_password_text"
                    android:textSize="14sp"
                    android:padding="10dp"
                    android:textColor="@color/darkgray"/>
@@ -84,7 +82,7 @@
                <com.swifttech.remit.android.common.customwidgets.GmeTextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:text="Confirm Password"
+                   android:text="@string/confirm_password_text"
                    android:textSize="14sp"
                    android:padding="10dp"
                    android:textColor="@color/darkgray"/>
@@ -102,7 +100,7 @@
            <com.swifttech.remit.android.common.customwidgets.GmeButton
                style="@style/MButton"
                android:id="@+id/btn_submit"
-               android:text="Save"
+               android:text="@string/save_text"
 
                android:background="@drawable/ic_rounded_background_red_coloured"
                android:textColor="@color/white"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/background_gray"
-    tools:context="com.swifttech.remit.android.socials.view.CommentEditActivity">
+    >
     <include layout="@layout/layout_social_toolbar"/>
     <RelativeLayout
         android:id="@+id/codeWrapper"
@@ -38,7 +36,7 @@
         android:layout_width="200dp"
         android:layout_height="50dp"
         android:layout_gravity="center"
-        android:text="Update"
+        android:text="@string/update_text"
         android:background="@drawable/ic_rounded_background_red_coloured"
         android:textColor="@color/white"
         android:textSize="16sp"
@@ -53,7 +51,7 @@
         android:padding="10dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Cancel"/>
+        android:text="@string/cancel_text"/>
 
 
 </LinearLayout>

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

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.swifttech.remit.android.socials.view.CommentsActivity">
+    >
 
     <LinearLayout
         android:id="@+id/commentMainLayout"
@@ -38,7 +36,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:padding="10dp"
-                    android:text="Load More"
+                    android:text="@string/load_more_text"
                     android:visibility="gone"
                     android:textColor="@color/cs_red" />
                 <ProgressBar

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
-    tools:context=".features.domesticremit.send.view.DomesticRemitActivity">
+    >
 
     <LinearLayout
         android:id="@+id/containerRootView"

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

@@ -64,7 +64,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/ic_search_icon"
-                        android:contentDescription="Search Icon" />
+                        android:contentDescription="@string/searchIcon_text" />
 
                     <com.swifttech.remit.android.common.customwidgets.GmeEditText
                         android:id="@+id/searchEditText"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/background_gray"
-    tools:context=".features.userprofile.view.EditProfileDetailActivity">
+    >
     <include layout="@layout/layout_sendmoney_toolbar"/>
     <com.swifttech.remit.android.common.customwidgets.GmeTextView
         android:id="@+id/tv_general_account"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:clickable="true"
     android:id="@+id/rootView"

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

@@ -2,7 +2,6 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="We are always there to help you."
+                android:text="@string/support_description_text"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>
@@ -62,7 +62,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/et_support_bg"
-                android:hint="Subject"
+                android:hint="@string/subject_text"
                 android:inputType="text"
                 android:textSize="12sp" />
 
@@ -84,7 +84,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="34dp"
                 android:background="@drawable/ic_rounded_background_red_coloured"
-                android:text="Submit"
+                android:text="@string/submit_text"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
@@ -95,7 +95,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="Cancel" />
+                android:text="@string/cancel_text" />
 
         </LinearLayout>
     </ScrollView>

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/background_gray"
-    tools:context="com.swifttech.remit.android.gme_branches.view.GmeBranchesActivity">
+  >
     <include layout="@layout/layout_social_toolbar"/>
     <LinearLayout
         android:id="@+id/searchLayout"
@@ -20,7 +18,7 @@
             android:layout_weight="1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="Search"
+            android:hint="@string/search_text"
             android:paddingLeft="20dp"
             android:paddingTop="4dp"
             android:paddingBottom="4dp"

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

@@ -47,7 +47,7 @@
                     android:layout_height="@dimen/_45sdp"
                     android:layout_centerVertical="true"
                     android:padding="10dp"
-                    android:src="@drawable/ic_help"
+                    app:srcCompat="@drawable/icv_help"
                     android:layout_alignParentEnd="true" />
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView

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

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#fff"
 
-    tools:context=".features.accountmanage.view.inboundaccountmanage.InboundAccountAddActivity">
+    >
 
    <com.swifttech.remit.android.common.customwidgets.SwipeDisabledViewPager
         android:id="@+id/fragmentContainer"

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

@@ -70,7 +70,7 @@
                     android:layout_gravity="center"
                     android:layout_margin="10dp"
                     android:visibility="visible"
-                    android:text="Load More"
+                    android:text="@string/load_more_text"
                     android:textColor="@color/cs_red" />
             </LinearLayout>
 

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

@@ -47,7 +47,7 @@
                 android:layout_marginBottom="4dp"
                 android:layout_marginTop="-25dp"
                 android:background="@drawable/ic_rounded_background_red_coloured"
-                android:text="Invite"
+                android:text="@string/title_invite"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="18sp" />

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

@@ -53,7 +53,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:background="@android:color/transparent"
-                    android:hint="Enter Full Name"
+                    android:hint="@string/full_name_placeholder_text"
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textColor="@color/cs_red"
@@ -75,7 +75,7 @@
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Mobile No."
+                    android:text="@string/mobile_number_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp" />
 
@@ -85,7 +85,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:background="@android:color/transparent"
-                    android:hint="+82 1234567890"
+                    android:hint="+81 1234567890"
                     android:singleLine="true"
                     android:inputType="number|text"
                     android:textColor="@color/cs_red"
@@ -107,7 +107,7 @@
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Email Address"
+                    android:text="@string/email_address_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp" />
 
@@ -133,7 +133,7 @@
                 android:layout_marginBottom="4dp"
                 android:layout_marginTop="22dp"
                 android:background="@drawable/ic_rounded_background_red_coloured"
-                android:text="Invite"
+                android:text="@string/title_invite"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="18sp" />

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

@@ -5,7 +5,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/white"
     android:fitsSystemWindows="true">
 

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@android:color/white"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

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

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.swifttech.remit.android.sendmoney.view.TransferSuccessfulActivity">
+    >
 
 
 </LinearLayout>

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white"
-    tools:context="com.swifttech.remit.android.socials.view.NewSocialPostActivity">
+    >
     <include layout="@layout/layout_social_toolbar"/>
     <RelativeLayout
         android:background="@color/white"

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

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

@@ -2,7 +2,6 @@
 
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_gray"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:background="#fff"

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

@@ -1,6 +1,5 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:background="@color/background_gray"
     android:layout_height="match_parent">

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

@@ -52,8 +52,8 @@
                     android:id="@+id/iv_edit_profile"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:visibility="invisible"
-                    android:visibility="gone"
+                    app:srcCompat="@drawable/icv_vd_edit_white"
+                    android:visibility="invisible"
                     android:layout_alignParentRight="true"
                     android:padding="14dp"/>
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
@@ -109,7 +109,7 @@
                     android:id="@+id/verify_image"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_kyc_non_verified_userstatus"
+                    app:srcCompat="@drawable/icv_kyc_non_verified_userstatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
@@ -162,7 +162,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0"
-                    android:textColor="@color/colorAccent"
+                    android:textColor="@color/m_blue_text_link"
                     android:textSize="24sp"
                     app:layout_constraintBaseline_toBaselineOf="@+id/tv_currency"
                     app:layout_constraintStart_toStartOf="@+id/tv_bank_name" />
@@ -240,7 +240,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0"
-                    android:textColor="@color/colorAccent"
+                    android:textColor="@color/m_blue_text_link"
                     android:textSize="24sp"
                     android:layout_marginBottom="13dp"
                     app:layout_constraintTop_toBottomOf="@+id/tv_yearly_remaining_label"

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

@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/background_gray"
     android:orientation="vertical"
     tools:context=".features.sendmoney.view.SendMoneyV2Activity">

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

@@ -43,7 +43,7 @@
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="@dimen/_22sdp"
                         android:scaleType="centerCrop"
-                        android:src="@drawable/ic_recipient_image" />
+                        app:srcCompat="@drawable/icv_recipient_image" />
 
                     <com.swifttech.remit.android.common.customwidgets.GmeTextView
                         android:id="@+id/userName"
@@ -92,7 +92,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/ic_search_icon"
-                        android:contentDescription="Search Icon" />
+                        android:contentDescription="@string/searchIcon_text" />
 
                     <com.swifttech.remit.android.common.customwidgets.GmeEditText
                         android:id="@+id/searchEditText"

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

@@ -369,7 +369,7 @@
                     android:id="@+id/emailWrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Email (Optional)"
+                    android:hint="@string/email_text_optional"
                     android:textColorHint="@color/darkgray">
 
                     <com.swifttech.remit.android.common.customwidgets.GmeEditText

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/background_gray"
     android:orientation="vertical"
-    tools:context="com.swifttech.remit.android.recipient.view.RecipientsListActivity">
+    >
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -42,7 +42,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="20dp"
                 android:scaleType="centerCrop"
-                android:src="@drawable/ic_recipient_image" />
+                app:srcCompat="@drawable/icv_recipient_image" />
 
             <com.swifttech.remit.android.common.customwidgets.GmeTextView
                 android:id="@+id/userName"
@@ -53,7 +53,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_toRightOf="@id/iv_passport_id"
                 android:padding="2dp"
-                android:text="New Recipient"
+                android:text="@string/new_recipient"
                 android:textColor="@color/darkgray"
                 android:textSize="17sp" />
         </LinearLayout>
@@ -92,7 +92,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_margin="10dp"
-                    android:text="Load More"
+                    android:text="@string/load_more_text"
                     android:textColor="@color/cs_red" />
 
             </LinearLayout>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.swifttech.remit.android.common.customwidgets.CustomSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swiperefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_gray"

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

@@ -37,7 +37,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="4dp"
-                    android:text="Reward Points"
+                    android:text="@string/reward_points_text"
                     android:textColor="@color/white"
                     android:textSize="14sp" />
 
@@ -59,7 +59,7 @@
             android:layout_gravity="center"
             android:layout_marginBottom="4dp"
             android:gravity="center"
-            android:text="Note: The reward points is valid for a year only."
+            android:text="@string/reward_note_text"
             android:textColor="@color/white"
             android:textSize="11sp" />
     </RelativeLayout>

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

@@ -49,7 +49,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="18dp"
                 android:background="@drawable/ic_rounded_background_coloured_reward"
-                android:text="Submit"
+                android:text="@string/submit_text"
                 android:textAllCaps="false"
                 android:textColor="@color/white" />
 
@@ -60,7 +60,7 @@
                 android:layout_marginBottom="26dp"
                 android:layout_marginTop="45dp"
                 android:gravity="center"
-                android:text="You can also visit nearest GME branch to redeem your reward directly."
+                android:text="You can also visit nearest JME branch to redeem your reward directly."
                 android:textColor="@color/cs_red" />
 
             <LinearLayout

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

@@ -86,7 +86,7 @@
                 android:paddingStart="21dp"
                 android:paddingTop="16dp"
                 android:layout_marginTop="14dp"
-                android:text="Change Pin"
+                android:text="@string/changepin_text"
                 android:textColor="@color/darkgray"
                 android:textSize="14sp" />
 

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

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.swifttech.remit.android.socials.view.SocialActivity">
+    >
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white"
-    tools:context="com.swifttech.remit.android.socials.view.LikeViewActivity">
+    >
     <include layout="@layout/layout_social_toolbar"/>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/likesRecyclerView"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_gray"
-    tools:context="com.swifttech.remit.android.socials.view.SocialPrivateWallActivity">
+    >
     <LinearLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"
@@ -39,7 +39,7 @@
                 app:txtfontName="@string/regular"
                 android:maxLines="1"
                 android:maxLength="15"
-                android:text="Send Money"/>
+                android:text="@string/send_money_text"/>
         </RelativeLayout>
         <RelativeLayout
             android:id="@+id/menu_second"
@@ -115,7 +115,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/topbar_textsize"
                 android:gravity="center"
-                android:text="More"/>
+                android:text="@string/more_text"/>
         </RelativeLayout>
 
     </LinearLayout>
@@ -151,7 +151,7 @@
                         android:textColor="@color/dark_gray"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="GME Community"/>
+                        android:text="JME Community"/>
                     <TextView
                         android:id="@+id/mystory"
                         android:layout_marginTop="10dp"
@@ -181,7 +181,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:padding="10dp"
-                        android:text="Load More"
+                        android:text="@string/load_more_text"
                         android:visibility="gone"
                         android:textColor="@color/cs_red" />
                     <ProgressBar

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

@@ -39,7 +39,7 @@
             android:layout_width="200dp"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_blue_button_with_white_border"
-            android:text="Login"
+            android:text="@string/login_text"
             android:textAllCaps="false"
             android:textColor="@color/white" />
 
@@ -50,7 +50,7 @@
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
             android:background="@drawable/ic_red_button_with_white_border"
-            android:text="New User"
+            android:text="@string/new_user_text"
             android:textAllCaps="false"
             android:textColor="@color/white" />
 

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

@@ -51,7 +51,7 @@
             android:paddingEnd="@dimen/_10sdp"
             android:paddingBottom="@dimen/_16sdp"
             android:scaleType="center"
-            android:srcCompat="@drawable/icv_back"
+            app:srcCompat="@drawable/icv_back"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -16,7 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:contentDescription="@string/app_name"
             android:padding="10dp"
-            android:srcCompat="@drawable/icv_back"
+            app:srcCompat="@drawable/icv_back"
             android:tint="@color/white" />
 
         <LinearLayout
@@ -40,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="We are always there to help you."
+                android:text="@string/support_description_text"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>
@@ -61,7 +62,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/et_support_bg"
-                android:hint="Subject"
+                android:hint="@string/subject_text"
                 android:inputType="text"
                 android:textSize="12sp" />
 
@@ -84,7 +85,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="34dp"
                 android:background="@drawable/ic_rounded_background_red_coloured"
-                android:text="Submit"
+                android:text="@string/submit_text"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
@@ -95,7 +96,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="Cancel" />
+                android:text="@string/cancel_text" />
 
         </LinearLayout>
 

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -16,7 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:contentDescription="@string/app_name"
             android:padding="10dp"
-            android:srcCompat="@drawable/icv_back"
+            app:srcCompat="@drawable/icv_back"
             android:tint="@color/white" />
 
         <LinearLayout
@@ -40,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="We are always there to help you."
+                android:text="@string/support_description_text"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -17,7 +18,7 @@
             android:layout_height="?attr/actionBarSize"
             android:contentDescription="@string/app_name"
             android:padding="10dp"
-            android:srcCompat="@drawable/icv_back"
+            app:srcCompat="@drawable/icv_back"
             android:tint="@color/white" />
 
         <LinearLayout

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/m_layout_bg_color"
-    tools:context=".features.addautodebitV2.view.AddPrimaryAccounAsAutoDebitActivity">
+    >
     <include layout="@layout/toolbar_generic_with_cs" />
     <com.swifttech.remit.android.common.customwidgets.SwipeDisabledViewPager
         android:id="@+id/addAutoDebitAccountViewPager"

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -16,7 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:contentDescription="@string/app_name"
             android:padding="10dp"
-            android:srcCompat="@drawable/icv_back"
+            app:srcCompat="@drawable/icv_back"
             android:tint="@color/white" />
 
         <LinearLayout
@@ -40,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="We are always there to help you."
+                android:text="@string/support_description_text"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>
@@ -71,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:background="@drawable/et_support_bg"
-                android:hint="GME Control No."
+                android:hint="JME Control No."
                 android:inputType="text|number"
                 android:textSize="12sp" />
 
@@ -94,7 +95,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="47dp"
                 android:background="@drawable/ic_rounded_background_red_coloured"
-                android:text="Submit"
+                android:text="@string/submit_text"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
@@ -105,7 +106,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:text="Cancel" />
+                android:text="@string/cancel_text" />
 
         </LinearLayout>
     </ScrollView>

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

@@ -64,7 +64,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/ic_search_icon"
-                        android:contentDescription="Search Icon" />
+                        android:contentDescription="@string/searchIcon_text" />
 
                     <com.swifttech.remit.android.common.customwidgets.GmeEditText
                         android:id="@+id/searchEditText"

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

@@ -1,99 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/rootView"
-    >
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-
-    <com.swifttech.remit.android.common.customwidgets.GmeTextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/_15sdp"
-        android:layout_marginTop="@dimen/_15sdp"
-        android:gravity="center"
-        android:text="@string/enter_login_password_text"
-        android:textColor="@color/black"
-        android:textSize="@dimen/_15ssp" />
-
-
-    <ImageView
-        android:id="@+id/passwordPromptImageView"
-        android:layout_marginTop="@dimen/_8sdp"
-        android:layout_marginBottom="@dimen/_8sdp"
-        android:layout_width="@dimen/_50sdp"
-        android:layout_height="@dimen/_50sdp"
-        android:scaleType="centerCrop"
-        android:layout_gravity="center"
-        />
-
-    <com.swifttech.remit.android.common.customwidgets.GmeTextView
-        android:id="@+id/orTextView"
-        android:layout_width="match_parent"
-        android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/_8sdp"
-        android:layout_marginBottom="@dimen/_16sdp"
-        android:layout_marginStart="@dimen/_12sdp"
-        android:layout_marginEnd="@dimen/_12sdp"
-        android:gravity="center"
-        android:text="@string/fingerprint_user_text"
-        android:textColor="@color/darkgray"
-        android:textSize="@dimen/_11sdp" />
-
-
-    <com.swifttech.remit.android.features.security.securitykeypad.SecurityKeyboardView
-        android:id="@+id/securityKeyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="@dimen/_4sdp"
-        android:layout_marginStart="@dimen/_4sdp" />
-
-    <com.swifttech.remit.android.common.customwidgets.GmeErrorTextView
-        android:id="@+id/passwordErrorTxt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/_11sdp"
-        android:layout_marginRight="@dimen/_11sdp"
-        android:paddingBottom="@dimen/_1sdp"
-        android:paddingTop="@dimen/_1sdp" />
-
-    <com.swifttech.remit.android.common.customwidgets.GmeTextView
-        android:id="@+id/resend_request"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginStart="@dimen/_6sdp"
-        android:layout_marginTop="@dimen/_8sdp"
-        android:layout_marginEnd="@dimen/_8sdp"
-        android:padding="@dimen/_8sdp"
-        android:gravity="center"
-        android:text="@string/resend_request_text"
-        android:textColor="@color/colorPrimary"
-        android:textSize="@dimen/_11ssp"
-        android:visibility="invisible" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-        <FrameLayout
-            android:id="@+id/keypadContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom">
-
-        </FrameLayout>
-
-</LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/keypadBallon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</RelativeLayout>

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".features.userprofile.view.UserGeneralDetailActivity">
+    >
     <include layout="@layout/layout_sendmoney_toolbar"/>
     <com.swifttech.remit.android.common.customwidgets.GmeTextView
         android:id="@+id/tv_general_account"
@@ -29,7 +28,7 @@
             android:padding="12dp"
             android:textSize="14sp"
             android:textColor="@color/darkgray"
-            android:text="Primary Bank Name"/>
+            android:text="@string/primary_bank_text"/>
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/tv_primary_bank"
             android:layout_alignParentRight="true"
@@ -53,7 +52,7 @@
             android:padding="12dp"
             android:textSize="14sp"
             android:textColor="@color/darkgray"
-            android:text="Primary Account Number"/>
+            android:text="@string/primary_account_number_text"/>
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/tv_account_no"
             android:layout_alignParentRight="true"
@@ -128,7 +127,7 @@
             android:padding="12dp"
             android:textSize="14sp"
             android:textColor="@color/darkgray"
-            android:text="Expiry Date"/>
+            android:text="@string/expiry_date_title"/>
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/tv_expirydate"
             android:layout_alignParentRight="true"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/background_gray"
-    tools:context=".features.userprofile.view.UserGeneralDetailActivity">
+    >
     <include layout="@layout/layout_sendmoney_toolbar"/>
   <ScrollView
       android:layout_width="match_parent"
@@ -241,7 +239,7 @@
                   android:gravity="left"
                   android:layout_marginLeft="16dp"
                   android:layout_gravity="center"
-                  android:text="Passport"
+                  android:text="@string/passport_text"
                   android:layout_toRightOf="@id/view4"
                   android:textColor="@color/darkgray"
                   android:layout_centerVertical="true"

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

@@ -1,6 +1,5 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              tools:context=".features.userprofile.view.UserGeneralDetailActivity">
+              >
 
     <include layout="@layout/layout_sendmoney_toolbar"/>
 
@@ -41,7 +40,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="12dp"
-                    android:text="First Name"
+                    android:text="@string/first_name_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -96,7 +95,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_middle_name_label"
                     android:padding="12dp"
-                    android:text="Last Name"
+                    android:text="@string/last_name_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -163,7 +162,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_nick_name_label"
                     android:padding="12dp"
-                    android:text="Gender"
+                    android:text="@string/gender_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -219,7 +218,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_verification_type_label"
                     android:padding="12dp"
-                    android:text="Mobile No."
+                    android:text="@string/mobile_number_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -246,7 +245,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_verification_no_label"
                     android:padding="12dp"
-                    android:text="Email Address"
+                    android:text="@string/email_address_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -275,7 +274,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_expirydate_label"
                     android:padding="12dp"
-                    android:text="Native Country"
+                    android:text="@string/native_country_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -303,7 +302,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_native_label"
                     android:padding="12dp"
-                    android:text="Country"
+                    android:text="country_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 
@@ -373,7 +372,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_city_label"
                     android:padding="12dp"
-                    android:text="Occupation"
+                    android:text="@string/occupation_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp"/>
 

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

@@ -1,6 +1,5 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

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

@@ -19,7 +19,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:padding="10dp"
-                android:srcCompat="@drawable/icv_back" />
+                app:srcCompat="@drawable/icv_back" />
 
             <com.swifttech.remit.android.common.customwidgets.GmeTextView
                 android:id="@+id/toolbar_title"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -24,7 +23,7 @@
             android:layout_height="match_parent"
             android:padding="10dp"
             android:layout_marginEnd="8dp"
-            android:srcCompat="@drawable/icv_back" />
+            app:srcCompat="@drawable/icv_back" />
 
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/toolbar_title"

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

@@ -2,7 +2,6 @@
 
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_gray"

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

@@ -35,7 +35,7 @@
         android:paddingBottom="5dp"
         android:paddingTop="5dp"
         android:singleLine="false"
-        android:text="Transaction Date"
+        android:text="@string/transaction_date_text"
         android:textColor="@color/darkgray"
         android:textSize="14sp" />
 
@@ -45,7 +45,7 @@
         android:layout_height="wrap_content"
         android:paddingBottom="5dp"
         android:paddingTop="5dp"
-        android:text="Transaction Date"
+        android:text="@string/transaction_date_text"
         android:textColor="@color/darkgray"
         android:textSize="14sp" />
 

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="1dp"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/_8sdp"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:background="@color/white"
     android:layout_height="wrap_content">

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:paddingLeft="6dp"
@@ -75,6 +74,6 @@
         android:visibility="gone"
         android:layout_marginLeft="4dp"
         android:textColor="@color/colorAccent"
-        android:text="More..."/>
+        android:text="@string/more_text"/>
 
 </RelativeLayout>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

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

@@ -13,7 +13,7 @@
             android:id="@+id/etCustomerMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="Enter Message to Customer Service"
+            android:hint="@string/enter_message_to_customer_service"
             android:background="@null"
             style="@style/AlertDialog.AppCompat.Light"
             android:lines="5" />

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

@@ -24,7 +24,7 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="Select Country"
+            android:text="@string/select_country_text"
             android:textColor="@color/darkgray"
             android:textSize="18sp"
             android:gravity="center"
@@ -54,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_search_icon"
-            android:contentDescription="Search Icon"
+            android:contentDescription="@string/searchIcon_text"
             />
         <com.swifttech.remit.android.common.customwidgets.GmeEditText
             android:id="@+id/searchEditText"
@@ -67,7 +67,7 @@
             android:maxLength="20"
             android:background="@null"
             android:gravity="center_vertical"
-            android:hint="Search here..."
+            android:hint="@string/search_text"
             android:imeActionLabel="Done"
             android:imeOptions="actionDone"
             android:inputType="text"

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

@@ -23,7 +23,7 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="Select Country"
+            android:text="@string/select_country_text"
             android:textColor="@color/darkgray"
             android:textSize="18sp"
             android:gravity="center"
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_search_icon"
-            android:contentDescription="Search Icon"
+            android:contentDescription="@string/searchIcon_text"
             />
         <com.swifttech.remit.android.common.customwidgets.GmeEditText
             android:id="@+id/searchEditText"
@@ -66,7 +66,7 @@
             android:maxLength="20"
             android:background="@null"
             android:gravity="center_vertical"
-            android:hint="Search here..."
+            android:hint="@string/search_text"
             android:imeActionLabel="Done"
             android:imeOptions="actionDone"
             android:inputType="text"

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

@@ -23,7 +23,7 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="Select Country"
+            android:text="@string/select_country_text"
             android:textColor="@color/darkgray"
             android:textSize="18sp"
             android:gravity="center"
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_search_icon"
-            android:contentDescription="Search Icon"
+            android:contentDescription="@string/searchIcon_text"
             />
         <com.swifttech.remit.android.common.customwidgets.GmeEditText
             android:id="@+id/searchEditText"
@@ -66,7 +66,7 @@
             android:maxLength="20"
             android:background="@null"
             android:gravity="center_vertical"
-            android:hint="Search here..."
+            android:hint="@string/search_text"
             android:imeActionLabel="Done"
             android:imeOptions="actionDone"
             android:inputType="text"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"

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

@@ -23,7 +23,7 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="Select Country"
+            android:text="@string/select_country_text"
             android:textColor="@color/darkgray"
             android:textSize="18sp"
             android:gravity="center"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"

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

@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_search_icon"
-            android:contentDescription="Search Icon"
+            android:contentDescription="@string/searchIcon_text"
             />
         <com.swifttech.remit.android.common.customwidgets.GmeEditText
             android:id="@+id/searchEditText"
@@ -66,7 +66,7 @@
             android:maxLength="20"
             android:background="@null"
             android:gravity="center_vertical"
-            android:hint="Search here..."
+            android:hint="@string/search_text"
             android:imeActionLabel="Done"
             android:imeOptions="actionDone"
             android:inputType="text"