Payout agent added to transaction history

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

@@ -20,39 +20,49 @@ public class TransactionHistoryRVAdapter extends RecyclerView.Adapter<Transactio
     private List<TransactionHistoryItemModel> transactionHistoryItemModels;
 
     public TransactionHistoryRVAdapter(TransactionItemClickListener listener) {
-        this.listener=listener;
-        transactionHistoryItemModels=new ArrayList<>();
+        this.listener = listener;
+        transactionHistoryItemModels = new ArrayList<>();
 
     }
 
     @NonNull
     @Override
     public TransactionItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new TransactionItemViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.transaction_history_viewholder_v3,parent,false));
+        return new TransactionItemViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.transaction_history_viewholder_v3, parent, false));
     }
 
     @Override
     public void onBindViewHolder(@NonNull TransactionItemViewHolder holder, int position) {
-        TransactionHistoryItemModel transactionItem=transactionHistoryItemModels.get(holder.getAdapterPosition());
-        holder.setAmount(Utils.formatCurrency(transactionItem.getPayoutAmt())+" "+transactionItem.getPCurr());
+        TransactionHistoryItemModel transactionItem = transactionHistoryItemModels.get(holder.getAdapterPosition());
+        holder.setAmount(Utils.formatCurrency(transactionItem.getPayoutAmt()) + " " + transactionItem.getPCurr());
         holder.setDate(transactionItem.getSendDate());
         holder.setPaymentMode(transactionItem.getPayoutMode().toUpperCase());
+
+        boolean hasAgent = transactionItem.getPayoutAgent() != null&&transactionItem.getPayoutAgent().length()>0;
+
+        if (hasAgent)
+            holder.setPaymentAgent(transactionItem.getPayoutAgent().toUpperCase());
+        else
+            holder.setPaymentAgent("");
+
+        holder.showPayoutAgent(hasAgent);
+
         holder.setGMEControlNo(transactionItem.getControlNo());
         holder.setStatus(transactionItem.getPayStatus().toUpperCase());
         holder.setUserId(transactionItem.getUser().toUpperCase().toUpperCase());
 
-        if(transactionItem.getPayStatus().equalsIgnoreCase("PAID"))
+        if (transactionItem.getPayStatus().equalsIgnoreCase("PAID"))
             holder.setPayStatusBackground(R.drawable.rounded_bg_blue);
         else
             holder.setPayStatusBackground(R.drawable.rounded_bg_red);
-        holder.itemView.setOnClickListener(view->
-        {
-        if((transactionItem.getPayStatus().equalsIgnoreCase("PAID")||transactionItem.getPayStatus().equalsIgnoreCase("CANCEL"))&&listener!=null)
-            listener.navigateToViewTransactionScreen(transactionItem);
-        else if(listener!=null)
+        holder.itemView.setOnClickListener(view ->
         {
-            listener.navigateToChangeTransactionScreen(transactionItem);
-        }});
+            if ((transactionItem.getPayStatus().equalsIgnoreCase("PAID") || transactionItem.getPayStatus().equalsIgnoreCase("CANCEL")) && listener != null)
+                listener.navigateToViewTransactionScreen(transactionItem);
+            else if (listener != null) {
+                listener.navigateToChangeTransactionScreen(transactionItem);
+            }
+        });
 
     }
 
@@ -61,23 +71,19 @@ public class TransactionHistoryRVAdapter extends RecyclerView.Adapter<Transactio
         return transactionHistoryItemModels.size();
     }
 
-    public void setData(List<TransactionHistoryItemModel> data)
-    {
-        if(data!=null&&data.size()>0)
-        {
-            this.transactionHistoryItemModels=data;
+    public void setData(List<TransactionHistoryItemModel> data) {
+        if (data != null && data.size() > 0) {
+            this.transactionHistoryItemModels = data;
             notifyDataSetChanged();
         }
     }
 
-    public void resetData()
-    {
-        this.transactionHistoryItemModels=null;
+    public void resetData() {
+        this.transactionHistoryItemModels = null;
         notifyDataSetChanged();
     }
 
-    public interface TransactionItemClickListener
-    {
+    public interface TransactionItemClickListener {
         void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel);
 
         void navigateToViewTransactionScreen(TransactionHistoryItemModel itemModel);

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryItemModel.java

@@ -32,6 +32,9 @@ public class TransactionHistoryItemModel {
     @SerializedName("PayoutMode")
     @Expose
     private String payoutMode;
+    @SerializedName("PayoutAgent")
+    @Expose
+    private String payoutAgent;
     @SerializedName("SendDate")
     @Expose
     private String sendDate;
@@ -39,7 +42,7 @@ public class TransactionHistoryItemModel {
     @Expose
     private String paidDate;
 
-    public TransactionHistoryItemModel(String user, String tranId, String controlNo, String payoutAmt, String pCurr, String collAmt, String collCurr, String payStatus, String payoutMode, String sendDate, String paidDate) {
+    public TransactionHistoryItemModel(String user, String tranId, String controlNo, String payoutAmt, String pCurr, String collAmt, String collCurr, String payStatus, String payoutMode, String sendDate, String paidDate,String payoutAgent) {
         this.user = user;
         this.tranId = tranId;
         this.controlNo = controlNo;
@@ -51,6 +54,7 @@ public class TransactionHistoryItemModel {
         this.payoutMode = payoutMode;
         this.sendDate = sendDate;
         this.paidDate = paidDate;
+        this.payoutAgent=payoutAgent;
     }
 
     public String getUser() {
@@ -140,4 +144,12 @@ public class TransactionHistoryItemModel {
     public void setPaidDate(String paidDate) {
         this.paidDate = paidDate;
     }
+
+    public String getPayoutAgent() {
+        return payoutAgent;
+    }
+
+    public void setPayoutAgent(String payoutAgent) {
+        this.payoutAgent = payoutAgent;
+    }
 }

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

@@ -24,6 +24,8 @@ public class TransactionItemViewHolder extends RecyclerView.ViewHolder{
     GmeTextView tv_payment_mode;
     @BindView(R.id.tv_status)
     TextView tvStatus;
+    @BindView(R.id.tv_bank_name)
+    TextView tv_payment_agent;
 
     public TransactionItemViewHolder(View itemView) {
         super(itemView);
@@ -51,6 +53,11 @@ public class TransactionItemViewHolder extends RecyclerView.ViewHolder{
         tv_payment_mode.setText(payment);
     }
 
+    public void setPaymentAgent(String paymentAgent)
+    {
+        tv_payment_agent.setText(paymentAgent);
+    }
+
     public void setUserId(String userId)
     {
         tv_user_id.setText(userId);
@@ -66,4 +73,14 @@ public class TransactionItemViewHolder extends RecyclerView.ViewHolder{
         tvStatus.setBackgroundResource(resourceId);
     }
 
+    public void showPayoutAgent(boolean hasAgent) {
+        if(hasAgent)
+        {
+            tv_payment_agent.setVisibility(View.VISIBLE);
+        }
+        else
+        {
+            tv_payment_agent.setVisibility(View.GONE);
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 <?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:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_marginLeft="@dimen/_8sdp"
@@ -21,7 +22,7 @@
             android:layout_weight=".5"
             android:layout_height="match_parent"
             android:gravity="start"
-            android:text="19/11/2019"
+            tools:text="19/11/2019"
             app:txtfontName="@string/regular"
             android:textColor="@color/darkgray"
             android:textSize="@dimen/_10ssp" />
@@ -32,7 +33,7 @@
             android:layout_height="match_parent"
             android:gravity="end"
             app:txtfontName="@string/regular"
-            android:text="123342312312543323"
+            tools:text="123342312312543323"
             android:textColor="@color/darkgray"
             android:textSize="@dimen/_10ssp" />
     </LinearLayout>
@@ -48,7 +49,7 @@
             android:layout_weight="1"
             android:layout_height="wrap_content"
             android:gravity="start"
-            android:text="Preyea Ranjan Regmi"
+            tools:text="Preyea Ranjan Regmi"
             android:textColor="@color/darkgray"
             android:textSize="@dimen/_13ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
@@ -58,7 +59,7 @@
             android:layout_height="match_parent"
             android:gravity="end"
             app:txtfontName="@string/semibold"
-            android:text="5,00000 NPR"
+            tools:text="5,00000 NPR"
             android:textColor="@color/colorPrimary"
             android:textSize="@dimen/_13ssp" />
     </LinearLayout>
@@ -73,7 +74,7 @@
             android:layout_weight="1"
             android:layout_height="match_parent"
             android:gravity="start"
-            android:text="BANK DEPOSIT"
+            tools:text="BANK DEPOSIT"
             app:txtfontName="@string/semibold"
             android:textColor="@color/darkgray"
             android:textSize="@dimen/_10ssp" />
@@ -82,7 +83,7 @@
             android:id="@+id/tv_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Unpaid"
+            tools:text="Unpaid"
             android:textColor="@color/white"
             android:textSize="@dimen/_10ssp"/>
     </LinearLayout>
@@ -94,7 +95,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
-        android:text="GLOBAL IME BANK"
+        tools:text="GLOBAL IME BANK"
         android:textColor="@color/darkgray"
         android:textSize="@dimen/_10ssp" />