From e5ddce5c4f3aae6ea7f461666d00061b607a5d4a Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Thu, 4 Oct 2018 11:36:25 +0900
Subject: [PATCH] Wallet Statement fixes

---
 .../adapter/WalletStatementRVAdapter.java     | 35 +++++++++----------
 .../layout/activity_wallet_statement_v2.xml   |  2 +-
 .../res/layout/fragment_transaction_v2.xml    |  2 +-
 .../layout/wallet_statement_viewholder_v2.xml |  2 --
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/adapter/WalletStatementRVAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/adapter/WalletStatementRVAdapter.java
index c616e454..a0f2aac6 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/adapter/WalletStatementRVAdapter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/adapter/WalletStatementRVAdapter.java
@@ -20,32 +20,32 @@ public class WalletStatementRVAdapter extends RecyclerView.Adapter<WalletStateme
     private List<WalletStatementV2ItemModel> walletStatementV2ItemModels;
 
     public WalletStatementRVAdapter(WalletStatementClickListener listener) {
-        this.listener=listener;
-        walletStatementV2ItemModels =new ArrayList<>();
+        this.listener = listener;
+        walletStatementV2ItemModels = new ArrayList<>();
 
     }
 
     @NonNull
     @Override
     public WalletStatementItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new WalletStatementItemViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.wallet_statement_viewholder_v2,parent,false));
+        return new WalletStatementItemViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.wallet_statement_viewholder_v2, parent, false));
     }
 
     @Override
     public void onBindViewHolder(@NonNull WalletStatementItemViewHolder holder, int position) {
-        WalletStatementV2ItemModel walletStatement= walletStatementV2ItemModels.get(holder.getAdapterPosition());
+        WalletStatementV2ItemModel walletStatement = walletStatementV2ItemModels.get(holder.getAdapterPosition());
 
         holder.setAmount(walletStatement.getClosingAmount());
         holder.setParticular(walletStatement.getParticular());
         holder.setDate(walletStatement.getTransactionDate());
-        if(walletStatement.getWalletIn().equalsIgnoreCase("₩0")) {
-            holder.setWalletStatus("OUT : "+walletStatement.getWalletOut());
-            holder.setWalletStatusBackground(R.drawable.rounded_bg_red);
-        }
-        else
-        {
-            holder.setWalletStatus("IN : "+walletStatement.getWalletIn());
-            holder.setWalletStatusBackground(R.drawable.rounded_bg_blue);
+        if (!walletStatement.getParticular().equalsIgnoreCase("Balance Brought Forward")) {
+            if (walletStatement.getWalletIn().equalsIgnoreCase("₩0")) {
+                holder.setWalletStatus("OUT : " + walletStatement.getWalletOut());
+                holder.setWalletStatusBackground(R.drawable.rounded_bg_red);
+            } else {
+                holder.setWalletStatus("IN : " + walletStatement.getWalletIn());
+                holder.setWalletStatusBackground(R.drawable.rounded_bg_blue);
+            }
         }
 //        holder.itemView.setOnClickListener(view->{
 //        if(listener!=null)
@@ -59,17 +59,14 @@ public class WalletStatementRVAdapter extends RecyclerView.Adapter<WalletStateme
         return walletStatementV2ItemModels.size();
     }
 
-    public void setData(List<WalletStatementV2ItemModel> data)
-    {
-        if(data!=null&&data.size()>0)
-        {
-            this.walletStatementV2ItemModels =data;
+    public void setData(List<WalletStatementV2ItemModel> data) {
+        if (data != null && data.size() > 0) {
+            this.walletStatementV2ItemModels = data;
             notifyDataSetChanged();
         }
     }
 
-    public interface WalletStatementClickListener
-    {
+    public interface WalletStatementClickListener {
         void onStatementClicked(WalletStatementV2ItemModel itemModel);
     }
 }
diff --git a/app/src/main/res/layout/activity_wallet_statement_v2.xml b/app/src/main/res/layout/activity_wallet_statement_v2.xml
index fe4b6a55..779ad534 100644
--- a/app/src/main/res/layout/activity_wallet_statement_v2.xml
+++ b/app/src/main/res/layout/activity_wallet_statement_v2.xml
@@ -118,7 +118,7 @@
                 android:background="@null"
                 android:enabled="false"
                 android:gravity="center"
-                android:hint="No Wallet Statement found."
+                android:hint="No Wallet Statement Found"
                 android:imeActionLabel="Done"
                 android:imeOptions="actionDone"
                 android:inputType="text"
diff --git a/app/src/main/res/layout/fragment_transaction_v2.xml b/app/src/main/res/layout/fragment_transaction_v2.xml
index d4900291..26938567 100644
--- a/app/src/main/res/layout/fragment_transaction_v2.xml
+++ b/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="No Transaction Found"
         android:imeActionLabel="Done"
         android:imeOptions="actionDone"
         android:inputType="text"
diff --git a/app/src/main/res/layout/wallet_statement_viewholder_v2.xml b/app/src/main/res/layout/wallet_statement_viewholder_v2.xml
index b54f657a..6ae9c3e7 100644
--- a/app/src/main/res/layout/wallet_statement_viewholder_v2.xml
+++ b/app/src/main/res/layout/wallet_statement_viewholder_v2.xml
@@ -53,10 +53,8 @@
             android:layout_gravity="center_vertical"
 
             android:layout_marginLeft="8dp"
-            android:text="asdfsdf"
             android:paddingTop="4dp"
             android:paddingBottom="4dp"
-            android:background="@drawable/rounded_bg_blue"
             android:layout_marginStart="8dp"
             android:gravity="center"