diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/adapter/RecipientListingV3RvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/adapter/RecipientListingV3RvAdapter.java index 461657ae..089fc60c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/adapter/RecipientListingV3RvAdapter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/adapter/RecipientListingV3RvAdapter.java @@ -52,18 +52,19 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter 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) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/countryservice/ServiceTypeModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/countryservice/ServiceTypeModel.java index 26092f84..7a6babf4 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/countryservice/ServiceTypeModel.java +++ b/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); + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java index 97ef408b..9dc36eb8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java +++ b/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 countryListingDialog; GenericImageWithTextListingDialog nativeCountryListingDialog; - GenericTextListingDialog serviceMethodListingDialog; + GenericImageWithTextListingDialog serviceMethodListingDialog; GenericTextListingDialog bankListingDialog; RecipientBranchListingDialog branchListingDialog; GenericTextListingDialog 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 -> { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListRVViewholderV3.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListRVViewholderV3.java index 1b3c35d7..85d5137e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListRVViewholderV3.java +++ b/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; diff --git a/app/src/main/res/layout/recipient_list_item_v3.xml b/app/src/main/res/layout/recipient_list_item_v3.xml index 17c6b0d4..92df070d 100644 --- a/app/src/main/res/layout/recipient_list_item_v3.xml +++ b/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" /> + +