Coupon list fragment fixes

app/src/main/java/com/gmeremit/online/gmeremittance_native/couponV2/adapter/CouponListAdapter.java

@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.couponV2.view.CouponListRvViewholder;
 import com.gmeremit.online.gmeremittance_native.couponV2.view.NoCouponRvViewHolder;
 import com.gmeremit.online.gmeremittance_native.customwidgets.SelectedRedBorderWithTickDecoration;
@@ -18,7 +19,7 @@ public class CouponListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private final CouponOnClickListener listener;
 
-    private List<Object> data;
+    private ArrayList<CouponDTO> data;
     private int selectedItemIndex;
     private static final int SELECT_NO_COUPON_VIEW = 12;
     private static final int COUPON_VIEW = 13;
@@ -42,9 +43,9 @@ public class CouponListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof CouponListRvViewholder) {
-            ((CouponListRvViewholder) holder).setCouponName("Coupon Name");
-            ((CouponListRvViewholder) holder).setCounponType("Discount");
-            ((CouponListRvViewholder) holder).setCouponDate("Feb 20th, 2020");
+            ((CouponListRvViewholder) holder).setCouponName(data.get(position).getCouponName());
+            ((CouponListRvViewholder) holder).setCounponType(data.get(position).getCouponType());
+            ((CouponListRvViewholder) holder).setCouponDate(data.get(position).getBuyDate()+" ~ "+data.get(position).getExpireDate());
 
             holder.itemView.setOnClickListener(view -> {
                 int currentSelectedITem = holder.getAdapterPosition();
@@ -76,7 +77,7 @@ public class CouponListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
     }
 
-    public void updateDataList(List<Object> data) {
+    public void updateDataList(ArrayList<CouponDTO> data) {
         if (data != null && data.size() > 0) {
             this.data.clear();
             this.data.addAll(data);

app/src/main/java/com/gmeremit/online/gmeremittance_native/couponV2/model/CouponDTO.java

@@ -0,0 +1,84 @@
+package com.gmeremit.online.gmeremittance_native.couponV2.model;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class CouponDTO {
+    @SerializedName("discountType")
+    @Expose
+    private String discountType;
+    @SerializedName("schemeId")
+    @Expose
+    private String schemeId;
+    @SerializedName("expireDate")
+    @Expose
+    private String expireDate;
+    @SerializedName("buyDate")
+    @Expose
+    private String buyDate;
+    @SerializedName("couponName")
+    @Expose
+    private String couponName;
+    @SerializedName("couponType")
+    @Expose
+    private String couponType;
+    @SerializedName("discountValue")
+    @Expose
+    private String discountValue;
+
+    public String getDiscountType() {
+        return discountType;
+    }
+
+    public void setDiscountType(String discountType) {
+        this.discountType = discountType;
+    }
+
+    public String getSchemeId() {
+        return schemeId;
+    }
+
+    public void setSchemeId(String schemeId) {
+        this.schemeId = schemeId;
+    }
+
+    public String getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(String expireDate) {
+        this.expireDate = expireDate;
+    }
+
+    public String getBuyDate() {
+        return buyDate;
+    }
+
+    public void setBuyDate(String buyDate) {
+        this.buyDate = buyDate;
+    }
+
+    public String getCouponName() {
+        return couponName;
+    }
+
+    public void setCouponName(String couponName) {
+        this.couponName = couponName;
+    }
+
+    public String getCouponType() {
+        return couponType;
+    }
+
+    public void setCouponType(String couponType) {
+        this.couponType = couponType;
+    }
+
+    public String getDiscountValue() {
+        return discountValue;
+    }
+
+    public void setDiscountValue(String discountValue) {
+        this.discountValue = discountValue;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/couponV2/view/CouponListBottomSheetDialog.java

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.couponV2.adapter.CouponListAdapter;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.customwidgets.SelectedRedBorderWithTickDecoration;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -32,7 +33,7 @@ public class CouponListBottomSheetDialog extends BottomSheetDialogFragment imple
 
 
     private CouponListAdapter.CouponOnClickListener listener;
-    private List<Object> couponList;
+    private ArrayList<CouponDTO> couponList;
 
     @BindView(R.id.couponListRv)
     RecyclerView couponListRv;
@@ -45,7 +46,7 @@ public class CouponListBottomSheetDialog extends BottomSheetDialogFragment imple
 
     private CouponListAdapter couponListAdapter;
 
-    public static CouponListBottomSheetDialog showCouponList(List<Object> couponList, CouponListAdapter.CouponOnClickListener listener) {
+    public static CouponListBottomSheetDialog showCouponList(ArrayList<CouponDTO> couponList, CouponListAdapter.CouponOnClickListener listener) {
         CouponListBottomSheetDialog confirmRechargePaymentBottomSheetDialog = new CouponListBottomSheetDialog();
         confirmRechargePaymentBottomSheetDialog.setCouponList(couponList);
         confirmRechargePaymentBottomSheetDialog.setListener(listener);
@@ -66,7 +67,7 @@ public class CouponListBottomSheetDialog extends BottomSheetDialogFragment imple
 
     }
 
-    private void setCouponList(List<Object> couponList) {
+    private void setCouponList(ArrayList<CouponDTO> couponList) {
         this.couponList = couponList;
     }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/couponV2/view/CouponListingFragment.java

@@ -13,7 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.couponV2.adapter.CouponListAdapter;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.customwidgets.SelectedRedBorderWithTickDecoration;
+import com.gmeremit.online.gmeremittance_native.rewardV2.view.RewardParentActionListener;
 
 
 import java.util.ArrayList;
@@ -56,6 +58,7 @@ public class CouponListingFragment extends BaseFragment implements CouponListAda
 
     private void initialize() {
         setupRv();
+        ((RewardParentActionListener) getActivity()).getPresenter().getCouponListLiveDataSubscription().observe(getViewLifecycleOwner(),this::updateCouponList);
     }
 
     private void setupRv() {
@@ -63,36 +66,11 @@ public class CouponListingFragment extends BaseFragment implements CouponListAda
         couponListRv.addItemDecoration(new SelectedRedBorderWithTickDecoration(couponListRv.getContext()));
         couponListRv.setLayoutManager(new LinearLayoutManager(couponListRv.getContext()));
         couponListRv.setAdapter(couponListAdapter);
-        List<Object> objectList = new ArrayList<>();
-        objectList.add(null);
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        couponListAdapter.updateDataList(objectList);
+
     }
 
 
-    public void updateCouponList(List<Object> couponList)
+    public void updateCouponList(ArrayList<CouponDTO> couponList)
     {
         couponListAdapter.setCurrentSelectableItem(0);
         couponListAdapter.updateDataList(couponList);

app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java

@@ -2,11 +2,15 @@ package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlistin
 
 import android.util.Log;
 
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
 import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.couponV2.presenter.CouponV2InteractorInterface;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoModelV2;
@@ -47,6 +51,7 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
     RewardListingV2InteractorInterface.RewardListingV2GatewayInterface gateway;
     CompositeDisposable compositeDisposable;
     private final BehaviorSubject<RewardListingScreenModel> rewardRelatedDataSubject;
+    private final MutableLiveData<ArrayList<CouponDTO>> couponListLiveData;
 
 
     public RewardListingV2Presenter(RewardListingV2ContractInterface view, RewardListingV2GatewayInterface gateway, CouponV2InteractorInterface.CouponV2GatewayInterface couponV2Gateway) {
@@ -55,13 +60,14 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
         compositeDisposable = new CompositeDisposable();
         this.rewardRelatedDataSubject = BehaviorSubject.create();
         this.couponGateway = couponV2Gateway;
+        this.couponListLiveData = new MutableLiveData<>();
 
     }
 
     @Override
     public void fetchRelatedData() {
         compositeDisposable.add(
-                Observable.zip(getAllProductListFromNetwork(), getAllOrderedProductListFromNetwork(), RewardListingScreenModel::new)
+                Observable.zip(getAllProductListFromNetwork(), getAllOrderedProductListFromNetwork(), getAllCouponListFromServer(), RewardListingScreenModel::new)
                         .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .observeOn(AndroidSchedulers.mainThread())
                         .doFinally(() -> view.showProgressBar(false, ""))
@@ -102,6 +108,11 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
         return rewardRelatedDataSubject.flatMap(rewardRelatedData -> Observable.just(rewardRelatedData.getRewardOrderedProductItemModels()));
     }
 
+    @Override
+    public LiveData<ArrayList<CouponDTO>> getCouponListLiveDataSubscription() {
+        return couponListLiveData;
+    }
+
     @Override
     public String getCurrentRewardPoint() {
         return gateway.getCustomerRewardPoint();
@@ -132,13 +143,13 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
                 });
     }
 
-    private Observable<ArrayList<RewardOrderedProductItemModel>> getAllCouponListFromServer() {
-        Type productType = new TypeToken<GenericResponseDataModel<ArrayList<RewardOrderedProductItemModel>>>() {
+    private Observable<ArrayList<CouponDTO>> getAllCouponListFromServer() {
+        Type productType = new TypeToken<GenericResponseDataModel<ArrayList<CouponDTO>>>() {
         }.getType();
-        return this.couponGateway.getCouponList(this.gateway.getAuth(),this.gateway.getUserID())
+        return this.couponGateway.getCouponList(this.gateway.getAuth(), this.gateway.getUserIDNumber())
                 .subscribeOn(Schedulers.io())
                 .flatMap(response -> {
-                    GenericResponseDataModel<ArrayList<RewardOrderedProductItemModel>> data = HttpClientV2.getDeserializer().fromJson(response.string(), productType);
+                    GenericResponseDataModel<ArrayList<CouponDTO>> data = HttpClientV2.getDeserializer().fromJson(response.string(), productType);
                     if (data.getData() == null)
                         data.setData(new ArrayList<>());
                     return Observable.just(data.getData());
@@ -161,20 +172,30 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
     public static class RewardListingScreenModel {
         ArrayList<RewardProductItemModel> rewardProductItemModels;
         ArrayList<RewardOrderedProductItemModel> rewardOrderedProductItemModels;
+        ArrayList<CouponDTO> couponDTOArrayList;
 
-        public RewardListingScreenModel(ArrayList<RewardProductItemModel> rewardProductItemModels, ArrayList<RewardOrderedProductItemModel> rewardOrderedProductItemModels) {
+        public RewardListingScreenModel(ArrayList<RewardProductItemModel> rewardProductItemModels, ArrayList<RewardOrderedProductItemModel> rewardOrderedProductItemModels, ArrayList<CouponDTO> couponList) {
             this.rewardProductItemModels = rewardProductItemModels;
             this.rewardOrderedProductItemModels = rewardOrderedProductItemModels;
+            this.couponDTOArrayList = couponList;
         }
 
         public ArrayList<RewardProductItemModel> getRewardProductItemModels() {
             return rewardProductItemModels;
         }
 
+
         public ArrayList<RewardOrderedProductItemModel> getRewardOrderedProductItemModels() {
             return rewardOrderedProductItemModels;
         }
 
+        public ArrayList<CouponDTO> getCouponDTOArrayList() {
+            return couponDTOArrayList;
+        }
+
+        public void setCouponDTOArrayList(ArrayList<CouponDTO> couponDTOArrayList) {
+            this.couponDTOArrayList = couponDTOArrayList;
+        }
     }
 
     public class RewardRelatedDataObserver extends DisposableObserver<RewardListingScreenModel> {
@@ -183,6 +204,11 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
         public void onNext(RewardListingScreenModel rewardListingScreenModel) {
             view.stopSwipeToRefreshIcon();
             rewardRelatedDataSubject.onNext(rewardListingScreenModel);
+            ArrayList<CouponDTO> couponDTOArrayList = new ArrayList<>();
+            couponDTOArrayList.add(null);
+            if (rewardListingScreenModel.getCouponDTOArrayList() != null && rewardListingScreenModel.getCouponDTOArrayList().size() > 0)
+                couponDTOArrayList.addAll(rewardListingScreenModel.getCouponDTOArrayList());
+            couponListLiveData.setValue(couponDTOArrayList);
             view.lazyInstatiateView();
         }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2PresenterInterface.java

@@ -1,7 +1,10 @@
 package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting;
 
+import androidx.lifecycle.LiveData;
+
 import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardlisting.RewardOrderedProductItemModel;
 import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardlisting.RewardProductItemModel;
 
@@ -20,6 +23,8 @@ public interface RewardListingV2PresenterInterface extends BasePresenterInterfac
      Observable<ArrayList<RewardProductItemModel>> subscribeToRewardFetchingEvent();
      Observable<ArrayList<RewardOrderedProductItemModel>> subscribeToOrderListFetchingEvent();
 
+     LiveData<ArrayList<CouponDTO>> getCouponListLiveDataSubscription();
+
      String getCurrentRewardPoint();
 
      interface RewardListingV2ContractInterface extends BaseContractInterface

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

@@ -10,6 +10,9 @@ import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.AutoDebitAccount;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.WebRequestModel;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
+import com.gmeremit.online.gmeremittance_native.couponV2.presenter.CouponV2InteractorInterface;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationApiResponse;
 import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationModel;
@@ -32,8 +35,12 @@ import com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.Transa
 import com.gmeremit.online.gmeremittance_native.utils.Constants;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;
 import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel;
 import com.gmeremit.online.gmeremittance_native.utils.security.SecurityUtils;
+import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,6 +56,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
     private final AutoDebitAccount selectedPaymentType;
     private final SendMoneyV2ContractInterface view;
     private final SendMoneyV2GatewayInterface gateway;
+    private final CouponV2InteractorInterface.CouponV2GatewayInterface couponGateway;
 
 
     //Exrate data
@@ -67,13 +75,15 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
 
 
     private long countDownRemainingValue;
+    private ArrayList<CouponDTO> couponList;
 
 
-    public SendMoneyV2Presenter(SendMoneyV2ContractInterface view, SendMoneyV2GatewayInterface gateway, SendMoneyRequiredDataV3 sendMoneyRequiredData) {
+    public SendMoneyV2Presenter(SendMoneyV2ContractInterface view, SendMoneyV2GatewayInterface gateway, SendMoneyRequiredDataV3 sendMoneyRequiredData, CouponV2InteractorInterface.CouponV2GatewayInterface couponV2Gateway) {
         this.view = view;
         this.selectedRecipient = sendMoneyRequiredData.getRecipientInfoModel();
         this.selectedPaymentType = sendMoneyRequiredData.getSelectedAutoDebitAccount();
         this.gateway = gateway;
+        this.couponGateway = couponV2Gateway;
         this.compositeObservable = new CompositeDisposable();
         countDownRemainingValue = -1;
         amountDetailRelatedDataModelLiveData = null;
@@ -231,6 +241,23 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
         return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount);
     }
 
+    @Override
+    public void getCouponRelatedData() {
+        compositeObservable.add(
+                this.couponGateway.getCouponList(this.couponGateway.getAuth(), this.couponGateway.getUserIDNumber())
+                        .doOnSubscribe(subs -> view.showProgressBar(true, ""))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .doFinally(() -> view.showProgressBar(false, ""))
+                        .subscribeWith(new CouponListObserver())
+        );
+    }
+
+    @Override
+    public ArrayList<CouponDTO> getCouponList() {
+        return this.couponList;
+    }
+
 
     private void performSendMoneyTransaction(String password, boolean isBiometricUsed) {
 
@@ -454,4 +481,45 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
 
         }
     }
+
+    public class CouponListObserver extends GenericApiObserverResponseV2<ArrayList<CouponDTO>> {
+
+        @Override
+        protected Type getDataType() {
+            return TypeToken.getParameterized(ArrayList.class, CouponDTO.class).getType();
+        }
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<ArrayList<CouponDTO>> t) {
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+                ArrayList<CouponDTO> couponData = new ArrayList<>();
+                couponData.add(null);
+                if (t.getData() != null && t.getData().size() > 0)
+                    couponData.addAll(t.getData());
+
+                couponList = couponData;
+            } else {
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+
+            }
+        }
+
+        @Override
+        public void onFailed(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+
+        }
+
+        @Override
+        protected void unauthorizedAccess(String message) {
+            gateway.clearAllUserData();
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.logout());
+
+        }
+    }
 }

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

@@ -7,6 +7,7 @@ import androidx.lifecycle.LiveData;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.WebRequestModel;
 import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationApiResponse;
 import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationModel;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.AmountDetailRelatedDataModel;
@@ -20,6 +21,8 @@ import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.verification.V
 import com.gmeremit.online.gmeremittance_native.transactionpasspromt.PasswordPromptListener;
 import com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionBiometricPromptDialog;
 
+import java.util.ArrayList;
+
 import io.reactivex.Observable;
 
 
@@ -60,6 +63,10 @@ public interface SendMoneyV2PresenterInterface extends BasePresenterInterface {
 
     String getTransactionAmount();
 
+    void getCouponRelatedData();
+
+     ArrayList<CouponDTO> getCouponList();
+
 
     interface SendMoneyV2ContractInterface extends BaseContractInterface
     {

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

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
+import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.gateway.SendMoneyV2Gateway;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyRequiredDataV3;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter;
@@ -166,7 +167,7 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
     @Override
     public SendMoneyV2PresenterInterface getPresenter() {
         if (this.presenter == null)
-            this.presenter = new SendMoneyV2Presenter(this,new SendMoneyV2Gateway(), sendMoneyRequiredData);
+            this.presenter = new SendMoneyV2Presenter(this,new SendMoneyV2Gateway(), sendMoneyRequiredData,new CouponV2Gateway());
         return this.presenter;
     }
 

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

@@ -27,6 +27,7 @@ import com.gmeremit.online.gmeremittance_native.GmeApplication;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.couponV2.adapter.CouponListAdapter;
+import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
 import com.gmeremit.online.gmeremittance_native.couponV2.view.CouponListBottomSheetDialog;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CurrencyFormatterTextWatcher;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
@@ -264,6 +265,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
 
         });
 
+        ((SendMoneyActionListener) getActivity()).getPresenter().getCouponRelatedData();
+
     }
 
 
@@ -426,7 +429,6 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     }
 
 
-
     private void showCoupon(String discountValue, String discountType, String schemeId, String discountPercent, String couponName, String appliedAmount) {
 
         if (couponName == null)
@@ -475,33 +477,9 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     }
 
     @OnClick(R.id.couponViewContainer)
-    public void showCouponList()
-    {
-        List<Object> objectList = new ArrayList<>();
-        objectList.add(null);
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
-        objectList.add(new Object());
+    public void showCouponList() {
+        ArrayList<CouponDTO> objectList = ((SendMoneyActionListener) getActivity()).getPresenter().getCouponList();
+
         CouponListBottomSheetDialog.showCouponList(objectList, new CouponListAdapter.CouponOnClickListener() {
             @Override
             public void onCouponClicked(Object object) {

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

@@ -30,9 +30,8 @@
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_header"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:gravity="center"
                 android:paddingTop="@dimen/_15sdp"
                 android:paddingBottom="@dimen/_15sdp"

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

@@ -53,10 +53,9 @@
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
             android:id="@+id/noDataFoundTextView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:layout_gravity="center"
-            android:layout_marginTop="@dimen/_110sdp"
+            android:layout_marginTop="@dimen/_80sdp"
             android:background="@null"
             android:enabled="false"
             android:gravity="center"
@@ -67,7 +66,7 @@
             android:paddingTop="20dp"
             android:textColor="@android:color/black"
             android:textSize="14sp"
-            android:visibility="invisible" />
+            android:visibility="visible" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/couponListRv"