Patch 2.5.1 updated

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/adapter/RecipientListingV3RvAdapter.java

@@ -52,18 +52,19 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter<RecipientL
         if (recieverName == null || recieverName.length() < 1)
             recieverName = recipientInfo.getFirstName() + " " + recipientInfo.getMiddleName() + " " + recipientInfo.getLastName();
 
-        String detail1 = null, detail2 = null, detail3 = null, detail4 = null;
+        String detail1 = null, detail2 = null, detail3 = null, detail4 = null,detail5=null;
         if (recipientInfo.getPaymentMethod() != null)
             detail1 = recipientInfo.getPaymentMethod().getName();
 
         if (recipientInfo.getAgent() != null) {
             detail2 = recipientInfo.getAgent().getName();
-
+            detail4 = recipientInfo.getAgent().getAccountNo();
         }
 
         detail3 = recipientInfo.getAddress();
 
-        detail4 = recipientInfo.getMobile();
+
+        detail5 = recipientInfo.getMobile();
 
 
         holder.getReceiverNameTxtView().setText(recieverName.toUpperCase());
@@ -101,6 +102,15 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter<RecipientL
         }
 
 
+        if (detail5 != null && detail5.length() > 0) {
+            holder.getDetail5TxtView().setText(detail5.toUpperCase());
+            holder.getDetail5TxtView().setVisibility(View.VISIBLE);
+        } else {
+            holder.getDetail5TxtView().setText("");
+            holder.getDetail5TxtView().setVisibility(View.GONE);
+        }
+
+
         int flagId= CountryFlagMapper.getFlagFromCountryCode(recipientInfo.getCountryCode());
         if(flagId!=-1)
         {

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/countryservice/ServiceTypeModel.java

@@ -1,11 +1,13 @@
 package com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice;
 
+import com.gmeremit.online.gmeremittance_native.customwidgets.GenericImageWithTextListingDialog;
+import com.gmeremit.online.gmeremittance_native.exchange_rate.model.PaymentModeMapper;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
 
-public class ServiceTypeModel {
+public class ServiceTypeModel implements GenericImageWithTextListingDialog.ImageWithDataDTOInterface {
 
     @SerializedName("id")
     @Expose
@@ -59,4 +61,14 @@ public class ServiceTypeModel {
 //        return this.description +"("+text+")";
 
     }
+
+    @Override
+    public String getDisplayName() {
+        return this.description;
+    }
+
+    @Override
+    public int getResourceId() {
+        return PaymentModeMapper.getPaymentModeImageFromId(this.id);
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java

@@ -198,7 +198,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
     GenericImageWithTextListingDialog<CountryServiceModel> countryListingDialog;
     GenericImageWithTextListingDialog<NativeCountry> nativeCountryListingDialog;
-    GenericTextListingDialog<ServiceTypeModel> serviceMethodListingDialog;
+    GenericImageWithTextListingDialog<ServiceTypeModel> serviceMethodListingDialog;
     GenericTextListingDialog<PaymentBankModel> bankListingDialog;
     RecipientBranchListingDialog branchListingDialog;
     GenericTextListingDialog<PayoutProvincesModel> stateListingDialog;
@@ -1127,7 +1127,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
         public void onClick(View v) {
             hideKeyBoard();
             if (serviceMethodListingDialog == null)
-                serviceMethodListingDialog = new GenericTextListingDialog<>();
+                serviceMethodListingDialog = new GenericImageWithTextListingDialog<>();
             serviceMethodListingDialog.setData(presenter.getAvailableServiceMethodList());
             serviceMethodListingDialog.setListener(selectedPaymentMethod ->
             {

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListRVViewholderV3.java

@@ -27,6 +27,9 @@ public class RecipientListRVViewholderV3 extends RecyclerView.ViewHolder {
     @BindView(R.id.detail4TxtView)
     TextView detail4TxtView;
 
+    @BindView(R.id.detail5TxtView)
+    TextView detail5TxtView;
+
     @BindView(R.id.receiverNativeCountryFlagImageView)
     ImageView receiverNativeCountryFlagImageView;
 
@@ -60,6 +63,9 @@ public class RecipientListRVViewholderV3 extends RecyclerView.ViewHolder {
     public TextView getDetail4TxtView() {
         return detail4TxtView;
     }
+    public TextView getDetail5TxtView() {
+        return detail5TxtView;
+    }
 
     public ImageView getReceiverNativeCountryFlagImageView() {
         return receiverNativeCountryFlagImageView;

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

@@ -92,12 +92,28 @@
         android:gravity="left"
         android:textColor="@color/darkgray"
         android:textSize="@dimen/_11sdp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/detail5TxtView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/guideline"
         app:layout_constraintTop_toBottomOf="@+id/detail3TxtView"
         app:txtfontName="@string/regular"
         tools:text="Closing Balance" />
+        tools:text="Closing Balance" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/detail5TxtView"
+        android:layout_width="276dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="left"
+        android:textColor="@color/darkgray"
+        android:textSize="@dimen/_11sdp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintTop_toBottomOf="@+id/detail4TxtView"
+        app:txtfontName="@string/regular"
+        tools:text="Closing Balance " />
 
     <android.support.constraint.Guideline
         android:id="@+id/guideline"