KFTC for release

app/build.gradle

@@ -89,6 +89,17 @@ android {
             shrinkResources false
         }
 
+        kftc{
+            manifestPlaceholders.fileProvider ="com.gmeremit.online.gmeremittance_native.fileprovider"
+            buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"'
+            buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
+            debuggable false
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java

@@ -273,7 +273,7 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
                     if (sendMoneyEditText.getText().toString().length() > 0)
                         prepareToGetForex();
                     else
-                        showToastMessage("Please specify sending amount");
+                        showToastMessage(getString(R.string.sending_amount_error));
                 }
                 return true;
 
@@ -283,7 +283,7 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
                     if (recieveMoneyEditText.getText().toString().length() > 0)
                         prepareToGetForex();
                     else
-                        showToastMessage("Please specify receiving amount");
+                        showToastMessage(getString(R.string.receiving_amount_error));
                 }
                 return true;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java

@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitAccount;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.WebRequestModel;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
@@ -91,19 +92,19 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
                             this.selectedAccountNo = accNo;
                             this.isAccountValidationRequired = selectedBank.getIsAccountValidation().equalsIgnoreCase(Constants.TRUE_STRING);
                         } else
-                            errorMessage = "Please provide an account no.";
+                            errorMessage = getStringfromStringId(R.string.account_number_empty_error);
                     }
                     if (selectedBank.getBranchRequired().equalsIgnoreCase(Constants.TRUE_STRING)) {
                         if (selectedBranch != null)
                             this.selectedBranchData = selectedBranch;
                         else
-                            errorMessage = "Please select a branch.";
+                            errorMessage = getStringfromStringId(R.string.branch_empty_error);
                     }
                 } else
-                    errorMessage = "Please select a bank.";
+                    errorMessage = getStringfromStringId(R.string.bank_empty_error);
             }
         } else
-            errorMessage = "Please select a payment mode.";
+            errorMessage = getStringfromStringId(R.string.payment_mode_empty_error);
 
         if (errorMessage != null)
             clearPaymentData();
@@ -112,7 +113,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
 
     @Override
     public String getPaymentModeTitle() {
-        return "How would you like to pick your money in " + this.selectedRecipient.getCountry() + "?";
+        return getStringfromStringId(R.string.pick_money_text)+" "+ this.selectedRecipient.getCountry() + "?";
     }
 
     @Override
@@ -196,7 +197,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
 
     @Override
     public WebRequestModel getWebRequestDataForTermsAndCondition() {
-        return new WebRequestModel("Terms And Condition","https://online.gmeremit.com/Terms",null);
+        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text),"https://online.gmeremit.com/Terms",null);
     }
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java

@@ -95,7 +95,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
     }
 
     private void performDefaultAction(Bundle savedInstanceState) {
-        toolbarTitle.setText("Receipt");
+        toolbarTitle.setText(R.string.receipt_title_text);
         if (savedInstanceState == null) {
             try {
                 transactionId = getIntent().getStringExtra(SEND_MONEY_TID_BUNDLE_KEY);

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -236,11 +236,11 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
 
     private void getForex() {
         if (shouldCaulatedByRecipient && !validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString())) {
-            showToastMessage("Please specify either of the amount.");
+            showToastMessage(getString(R.string.sending_amount_error));
             return;
         }
         if (!shouldCaulatedByRecipient && !validateAmountIsNotEmpty(sendMoneyEditText.getText().toString())) {
-            showToastMessage("Please specify either of the amount.");
+            showToastMessage(getString(R.string.receiving_amount_error));
             return;
         }
         compositeDisposable.add(
@@ -337,14 +337,6 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                 if (actionId == EditorInfo.IME_ACTION_DONE) {
                     hideKeyBoard();
                     getForex();
-
-//                    shouldCaulatedByRecipient = false;
-//                    if (validateAmountIsNotEmpty(sendMoneyEditText.getText().toString())){
-//                        hideKeyBoard();
-//                        getForex();
-//                    }
-//                    else
-//                        showToastMessage("Please specify sending amount.");
                 }
                 return true;
 
@@ -352,14 +344,6 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                 if (actionId == EditorInfo.IME_ACTION_DONE) {
                     hideKeyBoard();
                     getForex();
-//
-//                    shouldCaulatedByRecipient = true;
-//                    if (validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString())) {
-//                        hideKeyBoard();
-//                        getForex();
-//                    }
-//                    else
-//                        showToastMessage("Please specify recieving amount.");
                 }
                 return true;
 
@@ -384,8 +368,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                     selectedExRateId = data.getExrateId();
                     selectedTransferAmount=data.getsAmt();
 
-                    String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (Transfer Fee Included)";
-                    String exRateDisplay = "   " + selectedExRate + " (Current Exchange Rate)";
+                    String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " ("+getString(R.string.transfer_fee_included_text)+")";
+                    String exRateDisplay = "   " + selectedExRate + " ("+getString(R.string.current_exchange_rate_text)+")";
 
                     showTransferfeeAndExRate(true, transferDisplay, exRateDisplay);
                     showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount);
@@ -409,8 +393,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                         selectedExRateId = data.getExrateId();
                         selectedTransferAmount=data.getsAmt();
 
-                        String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (Transfer Fee Included)";
-                        String exRateDisplay = "   " + selectedExRate + " (Current Exchange Rate)";
+                        String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " ("+getString(R.string.transfer_fee_included_text)+")";
+                        String exRateDisplay = "   " + selectedExRate + " ("+getString(R.string.current_exchange_rate_text)+")";
 
                         showTransferfeeAndExRate(true, transferDisplay, exRateDisplay);
                         showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount);
@@ -463,7 +447,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                 if (amountDetailRelatedData == null || amountDetailRelatedData.getDefaultSelectedCurrency() == null) {
                     showSelectedCurrency("", "---");
                     new Handler().postDelayed(() -> {
-                        showPopUpMessage("No payout currency defined, please contact support.", CustomAlertDialog.AlertType.ALERT, null);
+                        showPopUpMessage(getString(R.string.no_payout_currency_defined_error), CustomAlertDialog.AlertType.ALERT, null);
                     }, 350);
                     continueBtn.setOnClickListener(null);
                 } else {
@@ -476,7 +460,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                 if (amountDetailRelatedData == null || amountDetailRelatedData.getDefaultSelectedCurrency() == null) {
                     showSelectedCurrency("", "---");
                     new Handler().postDelayed(() -> {
-                        showPopUpMessage("No payout currency defined, please contact support.", CustomAlertDialog.AlertType.ALERT, null);
+                        showPopUpMessage(getString(R.string.no_payout_currency_defined_error), CustomAlertDialog.AlertType.ALERT, null);
                     }, 350);
                     continueBtn.setOnClickListener(null);
                 } else {
@@ -499,19 +483,6 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     }
 
     private boolean validateAll() {
-//        if (validateAmountIsNotEmpty(sendMoneyEditText.getText().toString())) {
-//            if (validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString()))
-//                return true;
-//
-//            else {
-//                showToastMessage("Please specify recieving amount.");
-//                return false;
-//            }
-//
-//        } else {
-//            showToastMessage("Please specify sending amount.");
-//            return false;
-//        }
         return validateAmountIsNotEmpty(sendMoneyEditText.getText().toString())&&validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString());
     }
 
@@ -520,9 +491,9 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     private void updateButtonToCalculate(boolean action) {
         shouldCalculateExRate = action;
         if (action)
-            continueBtn.setText("Calculate");
+            continueBtn.setText(getString(R.string.calculate_text));
         else
-            continueBtn.setText("Continue");
+            continueBtn.setText(getString(R.string.continue_text));
     }
 
     private void updateSendAmount(String amount) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java

@@ -34,7 +34,6 @@ public class TransactionHistoryRVAdapter extends RecyclerView.Adapter<Transactio
     @Override
     public void onBindViewHolder(@NonNull TransactionItemViewHolder holder, int position) {
         TransactionHistoryItemModel transactionItem=transactionHistoryItemModels.get(holder.getAdapterPosition());
-
         holder.setAmount(Utils.formatCurrency(transactionItem.getPayoutAmt())+" "+transactionItem.getPCurr());
         holder.setDate(transactionItem.getSendDate());
         holder.setPaymentMode(transactionItem.getPayoutMode());

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java

@@ -94,7 +94,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
     private void initialize() {
         this.presenter = new TransactionHistoryV2Presenter(this);
-        toolbarTitle.setText("Transaction Report");
+        toolbarTitle.setText(getString(R.string.transaction_report_title_text));
         setupViewPager();
         setUpTabLayout();
         searchTextChangeListener = new SearchEdittextTextChangeListener();
@@ -197,38 +197,6 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
     }
 
-
-//    private void promptCalendarPicker() {
-//        SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance(
-//                new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
-//                    @Override
-//                    public void onDateRangeSet(SmoothDateRangePickerFragment view,
-//                                               int yearStart, int monthStart,
-//                                               int dayStart, int yearEnd,
-//                                               int monthEnd, int dayEnd) {
-//
-//                        String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart);
-//                        String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd);
-//
-//
-//
-//
-//                        fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
-//                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
-//
-//                       presenter.getTransactionHistory(startDate,endDate);
-//
-//
-//                    if(dateContainer.getVisibility()!=View.VISIBLE)
-//                        dateContainer.setVisibility(View.VISIBLE);
-//                    }
-//                });
-//
-//
-//
-//        if(!smoothDateRangePickerFragment.isAdded())
-//        smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker");
-//    }
     private void promptCalendarPicker() {
         new SpinnerDateRangePickerDialogBuilder()
                 .context(TransactionHistoryActivityV2.this)
@@ -239,7 +207,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
                 .setCurrentDateAsMaxDate()
                 .minDate(2017,9,10)
                 .dialogTheme(R.style.DatePickerTheme)
-                .setTitle("Filter by date")
+                .setTitle(getString(R.string.filter_by_date_text))
                 .callback(new DateRangePickerDialog.OnRangeDateSetListener() {
                     private String startDate="";
                     private String endDate="";
@@ -257,7 +225,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
                     @Override
                     public void onInvalidRangeSelected() {
-                        showToastMessage("Invalid date range selected");
+                        showToastMessage(getString(R.string.invalid_date_range_selected));
                     }
 
                     @Override
@@ -270,35 +238,6 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
                 .build()
                 .show();
 
-//        SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance(
-//                new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
-//                    @Override
-//                    public void onDateRangeSet(SmoothDateRangePickerFragment view,
-//                                               int yearStart, int monthStart,
-//                                               int dayStart, int yearEnd,
-//                                               int monthEnd, int dayEnd) {
-//
-//                        String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart);
-//                        String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd);
-//
-//
-//
-//
-//                        fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
-//                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
-//
-//                       presenter.getTransactionHistory(startDate,endDate);
-//
-//
-//                    if(dateContainer.getVisibility()!=View.VISIBLE)
-//                        dateContainer.setVisibility(View.VISIBLE);
-//                    }
-//                });
-//
-//
-//
-//        if(!smoothDateRangePickerFragment.isAdded())
-//        smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker");
     }
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java

@@ -114,7 +114,7 @@ public class WalletStatementV2Activity extends BaseActivity implements WalletSta
                 .minDate(2017,9,10)
                 .dialogTheme(R.style.DatePickerTheme)
                 .showTitle(true)
-                .setTitle("Filter by date")
+                .setTitle(getString(R.string.filter_by_date_text))
                 .callback(new DateRangePickerDialog.OnRangeDateSetListener() {
                     private String startDate="";
                     private String endDate="";
@@ -134,7 +134,7 @@ public class WalletStatementV2Activity extends BaseActivity implements WalletSta
 
                     @Override
                     public void onInvalidRangeSelected() {
-                        showToastMessage("Invalid date range selected");
+                        showToastMessage(getString(R.string.invalid_date_range_selected));
                     }
 
                     @Override

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

@@ -6,8 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/background_gray"
     android:orientation="vertical"
-    tools:context="com.gmeremit.online.gmeremittance_native.sendmoney.view.TransferSuccessfulActivity">
-
+   >
     <include layout="@layout/layout_sendmoney_toolbar" />
 
     <ScrollView
@@ -51,7 +50,7 @@
                     android:layout_below="@id/logo"
                     android:layout_centerHorizontal="true"
                     android:padding="6dp"
-                    android:text="Transfer Successful"
+                    android:text="@string/transfer_success_text"
                     android:textColor="@color/white"
                     android:textSize="19sp"
                     app:txtfontName="@string/semibold" />
@@ -64,7 +63,7 @@
                     android:layout_below="@id/transfer_label"
                     android:layout_centerHorizontal="true"
                     android:padding="2dp"
-                    android:text="@string/transferedto"
+                    android:text="@string/transfer_success_info_text"
                     android:textColor="@color/white"
                     android:textSize="15sp" />
 
@@ -93,7 +92,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerHorizontal="true"
                         android:padding="2dp"
-                        android:text="Total Payout Amount: "
+                        android:text="@string/total_payout_amount_text"
                         android:textColor="@color/white"
                         android:textSize="15sp" />
 
@@ -131,7 +130,7 @@
                     android:gravity="center"
                     android:paddingLeft="2dp"
                     android:paddingTop="4dp"
-                    android:text="@string/secret_info"
+                    android:text="@string/gme_control_security_text"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
 
@@ -156,7 +155,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
-                    android:text="Transaction Date"
+                    android:text="@string/transaction_date_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp" />
 
@@ -188,7 +187,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:text="Receiver"
+            android:text="@string/receiver_text"
             android:textColor="@color/darkgray"
             android:textSize="14sp" />
 
@@ -218,7 +217,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/nameContainer"
                     android:padding="10dp"
-                    android:text="Address"
+                    android:text="@string/address_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp" />
 
@@ -247,7 +246,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/address_label"
                     android:padding="10dp"
-                    android:text="Mobile No."
+                    android:text="@string/mobile_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp" />
 
@@ -294,7 +293,7 @@
                             android:layout_height="wrap_content"
                             android:padding="10dp"
                             android:gravity="left"
-                            android:text="Payout Agent/Bank"
+                            android:text="@string/payout_agent_text"
                             android:textColor="@color/darkgray"
                             android:textSize="14sp" />
 
@@ -338,7 +337,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="10dp"
-                        android:text="Total Sent Amount"
+                        android:text="@string/total_sent_amount_text"
                         android:textColor="@color/darkgray"
                         android:textSize="14sp" />
 
@@ -372,7 +371,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="10dp"
-                        android:text="Service Fee"
+                        android:text="@string/service_fee_text"
                         android:textColor="@color/darkgray"
                         android:textSize="14sp" />
 
@@ -404,7 +403,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="10dp"
-                        android:text="Ex Rate"
+                        android:text="@string/ex_rate_text"
                         android:textColor="@color/darkgray"
                         android:textSize="14sp" />
 
@@ -461,7 +460,7 @@
                 android:layout_marginBottom="30dp"
                 android:layout_marginTop="20dp"
                 android:background="@drawable/ic_rounded_background_coloured"
-                android:text="Done"
+                android:text="@string/done_text"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
@@ -489,7 +488,7 @@
                         android:layout_marginBottom="30dp"
                         android:layout_marginTop="20dp"
                         android:background="@drawable/ic_rounded_background_coloured"
-                        android:text="Request to Cancel"
+                        android:text="@string/request_to_cancel_text"
                         android:textAllCaps="false"
                         android:textColor="@color/white"
                         android:textSize="18sp" />
@@ -509,7 +508,7 @@
                         android:layout_marginBottom="30dp"
                         android:layout_marginTop="20dp"
                         android:background="@drawable/ic_rounded_background_coloured"
-                        android:text="Request to Change"
+                        android:text="@string/request_to_change_text"
                         android:textAllCaps="false"
                         android:textColor="@color/white"
                         android:textSize="18sp" />

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

@@ -53,7 +53,7 @@
                         android:layout_weight="1"
                         android:background="@null"
                         android:gravity="center_vertical"
-                        android:hint="Search with Control No"
+                        android:hint="@string/search_with_controlno_text"
                         android:imeActionLabel="Done"
                         android:imeOptions="actionDone"
                         android:inputType="text"

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

@@ -10,7 +10,7 @@
         android:gravity="center"
         android:layout_marginTop="8dp"
         android:padding="10dp"
-        android:text="Enter your login Password"
+        android:text="@string/enter_login_password_text"
         android:textColor="@color/black"
         android:textSize="20sp" />
 
@@ -42,7 +42,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:padding="10dp"
-            android:text="Cancel"
+            android:text="@string/cancel_text"
             android:textColor="@color/black"
             android:textSize="20sp" />
 
@@ -53,7 +53,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:padding="10dp"
-            android:text="Confirm"
+            android:text="@string/confirm_text"
             android:textColor="@color/cs_red"
             android:textSize="20sp" />
 

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

@@ -45,7 +45,7 @@
                     android:paddingStart="3dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="You Send"
+                    android:text="@string/you_send_text"
                     android:textColor="@color/darkgray"
                     android:textSize="16sp"
                     android:paddingLeft="3dp" />
@@ -165,7 +165,7 @@
                     android:layout_height="wrap_content"
                     android:paddingTop="3dp"
                     android:paddingStart="3dp"
-                    android:text="Recepient Gets"
+                    android:text="@string/receipient_gets_text"
                     android:textColor="@color/darkgray"
                     android:textSize="16sp"
                     android:paddingLeft="3dp" />
@@ -235,7 +235,7 @@
             android:layout_height="50dp"
             android:layout_gravity="center"
             android:background="@drawable/ic_rounded_background_coloured"
-            android:text="Calculate"
+            android:text="@string/calculate_text"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="18sp" />

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

@@ -66,7 +66,7 @@
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="Select Bank"
+                android:hint="@string/select_bank_text"
                 android:textColorHint="@color/darkgray">
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@@ -103,7 +103,7 @@
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="Select Branch"
+                android:hint="@string/select_branch_text"
                 android:textColorHint="@color/darkgray">
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@@ -135,7 +135,7 @@
             android:id="@+id/accountWrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="Account No"
+            android:hint="@string/account_number_text"
             android:textColorHint="@color/darkgray">
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@@ -159,7 +159,7 @@
         android:layout_marginBottom="15dp"
         android:layout_gravity="center"
         android:background="@drawable/ic_rounded_background_coloured"
-        android:text="Continue"
+        android:text="@string/continue_text"
         android:textAllCaps="false"
         android:textColor="@color/white"
         android:textSize="18sp" />

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

@@ -23,7 +23,7 @@
         android:background="@null"
         android:enabled="false"
         android:gravity="center"
-        android:hint="No Transaction Found"
+        android:hint="@string/no_transaction_found_text"
         android:imeActionLabel="Done"
         android:imeOptions="actionDone"
         android:inputType="text"

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

@@ -30,7 +30,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:text="Reciever Details"
+                android:text="@string/reciever_details_text"
                 android:textColor="@color/colorPrimary"
                 android:textSize="17sp" />
             <LinearLayout
@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Full Name: "
+                android:text="@string/full_name_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -70,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Address: "
+                android:text="@string/address_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -96,15 +96,15 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Country: "
+                android:text="@string/country_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_country"
-
                 android:layout_width="0dp"
-                android:layout_weight="1"                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text="Nepal"
                 android:textColor="@color/black"
@@ -122,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Mobile: "
+                android:text="@string/mobile_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -132,7 +132,6 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:text="+9779908018028"
                 android:textColor="@color/black"
                 android:textSize="13sp"
                 app:txtfontName="@string/semibold" />
@@ -153,7 +152,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:text="Transaction Details"
+                android:text="@string/transaction_detail_text"
                 android:textColor="@color/colorPrimary"
                 android:textSize="17sp" />
             <LinearLayout
@@ -166,7 +165,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Payout Country: "
+                android:text="@string/payout_country_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -192,7 +191,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Payout Mode: "
+                android:text="@string/payout_mode_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -219,7 +218,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Paying Amount: "
+                android:text="@string/paying_amount_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -246,7 +245,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Exchange Rate: "
+                android:text="@string/exchange_rate_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -273,7 +272,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingTop="10dp"
-                android:text="Service Charge: "
+                android:text="@string/service_charge_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -302,7 +301,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="top"
-                android:text="Payout Agent/Bank: "
+                android:text="@string/payout_agent_text"
                 android:textColor="@color/dark_gray"
                 android:textSize="13sp" />
 
@@ -361,7 +360,7 @@
             android:gravity="center"
             android:maxLines="2"
             android:layout_height="wrap_content"
-            android:text="I have read and agreed to"
+            android:text="@string/i_have_read_to_text"
             android:textColor="@color/dark_gray"
             android:textSize="13sp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
@@ -372,7 +371,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="GME Remittance User Agreement."
+            android:text="@string/gme_user_aggreement_text"
             android:textColor="@color/colorPrimary"
             android:textSize="13sp" />
 
@@ -386,7 +385,7 @@
             android:layout_marginBottom="20dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/ic_rounded_background_coloured"
-            android:text="Agree &amp; Send"
+            android:text="@string/agree_and_send_text"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="18sp" />

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

@@ -33,6 +33,6 @@
         android:padding="10dp"
         android:gravity="center"
         android:textColor="@color/colorAccent"
-        android:text="Cancel" />
+        android:text="@string/cancel" />
 </RelativeLayout>
 

app/src/main/res/values/strings.xml

@@ -38,8 +38,6 @@
     <!-- No Internet Title and Content -->
     <string name="no_internet_title">Whoops!</string>
     <string name="no_internet_message">No Internet connection found. \nCheck your connection</string>
-    <string name="transferedto">You have successfully transferred your money to</string>
-    <string name="secret_info">Please keep this GME control no. very secure.\nShare with concerned party only</string>
     <string name="invite_description">Refer to friend and get 7000KRW per refer when \nthey send money for the first time</string>
 
     <string name="non_verified_info">Your verification is still in progress.</string>
@@ -122,12 +120,60 @@
     <string name="select_district_error">Please select a district</string>
     <string name="todays_rate_title_text">Today\'s Rate</string>
     <string name="you_send_text">You Send</string>
-    <string name="receipient_gets_text">Recepient Gets</string>
+    <string name="receipient_gets_text">Recipient Gets</string>
     <string name="select_payment_mode_text">Select Payment Mode</string>
     <string name="calculate_text">Calculate</string>
     <string name="no_currency_selected_error">Please select a currency</string>
     <string name="transfer_fee_included_text">Transfer Fee Included</string>
     <string name="current_exchange_rate_text">Current Exchange Rate</string>
+    <string name="pick_money_text">How would you like to pick your money in</string>
+    <string name="select_branch_text">Select Branch</string>
+    <string name="account_number_text">Account No</string>
+    <string name="select_bank_text">Select Bank</string>
+    <string name="account_number_empty_error">Please provide an account no</string>
+    <string name="branch_empty_error">Please select a branch</string>
+    <string name="bank_empty_error">Please select a bank</string>
+    <string name="payment_mode_empty_error">Please select a payment mode</string>
+    <string name="terms_and_condition_title_text">Terms And Condition</string>
+    <string name="continue_text">Continue</string>
+    <string name="sending_amount_error">Please specify sending amount</string>
+    <string name="receiving_amount_error">Please specify receiving amount</string>
+    <string name="no_payout_currency_defined_error">No payout currency defined, please contact support.</string>
+    <string name="reciever_details_text">Reciever Details</string>
+    <string name="full_name_text">Full Name</string>
+    <string name="country_text" >Country</string>
+    <string name="mobile_text">Mobile</string>
+    <string name="transaction_detail_text">Transaction Details</string>
+    <string name="payout_country_text">Payout Country:</string>
+    <string name="payout_mode_text">Payout Mode:</string>
+    <string name="paying_amount_text">Paying Amount:</string>
+    <string name="exchange_rate_text">Exchange Rate:</string>
+    <string name="service_charge_text">Service Charge:</string>
+    <string name="payout_agent_text">Payout Agent/Bank:</string>
+    <string name="i_have_read_to_text">I have read and agreed to</string>
+    <string name="gme_user_aggreement_text">GME Remittance User Agreement.</string>
+    <string name="agree_and_send_text"><![CDATA[Agree & Send]]></string>
+    <string name="enter_login_password_text">Enter your login Password</string>
+    <string name="cancel_text">Cancel</string>
+    <string name="confirm_text">Confirm</string>
+    <string name="receipt_title_text">Receipt</string>
+    <string name="transfer_success_text">Transfer Successful</string>
+    <string name="transfer_success_info_text">You have successfully transferred your money to</string>
+    <string name="total_payout_amount_text">Total Payout Amount:</string>
+    <string name="gme_control_security_text">Please keep this GME control no. very secure.\nShare with concerned party only</string>
+    <string name="transaction_date_text">Transaction Date</string>
+    <string name="receiver_text">Receiver</string>
+    <string name="total_sent_amount_text">Total Sent Amount</string>
+    <string name="ex_rate_text">Ex Rate</string>
+    <string name="service_fee_text">Service Fee</string>
+    <string name="done_text">Done</string>
+    <string name="request_to_cancel_text">Request to Cancel</string>
+    <string name="request_to_change_text">Request to Change</string>
+    <string name="transaction_report_title_text">Transaction Report</string>
+    <string name="filter_by_date_text">Filter by date</string>
+    <string name="invalid_date_range_selected">Invalid date range selected</string>
+    <string name="search_with_controlno_text">Search with Control No</string>
+    <string name="no_transaction_found_text">No Transaction Found</string>
 
 
 </resources>