From 36790cb1c5becf8db977eeb2e3142471cabe7885 Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Fri, 26 Oct 2018 16:54:42 +0900
Subject: [PATCH] Transaction Report fixes

---
 .idea/caches/build_file_checksums.ser           | Bin 535 -> 535 bytes
 .../adapter/TransactionHistoryRVAdapter.java    |  16 +++++++++++-----
 .../view/TransactionFragmentV2.java             |  10 ++++++++--
 .../view/TransactionHistoryActivityV2.java      |  10 +++++++++-
 .../res/layout/activity_change_password_v2.xml  |  10 +++++-----
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b64b5bda8a6378d12888def693b2640f592533ff..cbdc5c6c9d35d1914d69b17944d8cd3203ef77a2 100644
GIT binary patch
delta 15
XcmbQvGM#0@43_m#0T(vTsb&NKFsueu

delta 15
XcmbQvGM#0@43>4*M07UJsb&NKFKh+y

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java
index bda0a1d1..a612c538 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java
@@ -46,10 +46,14 @@ public class TransactionHistoryRVAdapter extends RecyclerView.Adapter<Transactio
             holder.setPayStatusBackground(R.drawable.rounded_bg_blue);
         else
             holder.setPayStatusBackground(R.drawable.rounded_bg_red);
-        holder.itemView.setOnClickListener(view->{
-        if(transactionItem.getPayStatus().equalsIgnoreCase("UNPAID")&&listener!=null)
-            listener.onTransactionClicked(transactionItem);
-        });
+        holder.itemView.setOnClickListener(view->
+        {
+        if((transactionItem.getPayStatus().equalsIgnoreCase("PAID")||transactionItem.getPayStatus().equalsIgnoreCase("CANCEL"))&&listener!=null)
+            listener.navigateToViewTransactionScreen(transactionItem);
+        else if(listener!=null)
+        {
+            listener.navigateToChangeTransactionScreen(transactionItem);
+        }});
 
     }
 
@@ -69,6 +73,8 @@ public class TransactionHistoryRVAdapter extends RecyclerView.Adapter<Transactio
 
     public interface TransactionItemClickListener
     {
-        void onTransactionClicked(TransactionHistoryItemModel itemModel);
+        void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel);
+
+        void navigateToViewTransactionScreen(TransactionHistoryItemModel itemModel);
     }
 }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java
index 9d359716..0109deef 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java
@@ -126,9 +126,15 @@ public class TransactionFragmentV2 extends BaseFragment implements View.OnClickL
 
 
     @Override
-    public void onTransactionClicked(TransactionHistoryItemModel itemModel) {
+    public void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel) {
         if (this.listener != null)
-            listener.onTransactionClicked(itemModel);
+            listener.navigateToChangeTransactionScreen(itemModel);
+    }
+
+    @Override
+    public void navigateToViewTransactionScreen(TransactionHistoryItemModel itemModel) {
+        if (this.listener != null)
+            listener.navigateToViewTransactionScreen(itemModel);
     }
 
     public void setType(TransactionHistoryActivityV2.TransactionHistoryViewType type) {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
index bfc50f6b..fe644e52 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
@@ -225,13 +225,21 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
 
     @Override
-    public void onTransactionClicked(TransactionHistoryItemModel itemModel) {
+    public void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel) {
         Intent startReceiptActivity = new Intent(this, SendMoneyV2TransactionCompleteActivity.class);
         startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, itemModel.getTranId());
         startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_CONTROL_NO_BUNDLE_KEY, itemModel.getControlNo());
         startActivity(startReceiptActivity);
     }
 
+    @Override
+    public void navigateToViewTransactionScreen(TransactionHistoryItemModel itemModel) {
+        Intent startReceiptActivity = new Intent(this, SendMoneyV2TransactionCompleteActivity.class);
+        startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, itemModel.getTranId());
+        startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, true);
+        startActivity(startReceiptActivity);
+    }
+
     @Override
     public TransactionHistoryV2PresenterInterface getPresenter() {
         return this.presenter;
diff --git a/app/src/main/res/layout/activity_change_password_v2.xml b/app/src/main/res/layout/activity_change_password_v2.xml
index 14adae73..cfe3ad63 100644
--- a/app/src/main/res/layout/activity_change_password_v2.xml
+++ b/app/src/main/res/layout/activity_change_password_v2.xml
@@ -31,7 +31,7 @@
                 android:layout_marginTop="20dp"
                 android:background="#fff"
                 android:paddingTop="1dp"
-                android:paddingBottom="1dp"
+                android:paddingBottom="10dp"
 
                 android:id="@+id/currentpassWrapper"
                 android:layout_width="match_parent"
@@ -48,7 +48,7 @@
 
             </android.support.design.widget.TextInputLayout>
             <android.support.design.widget.TextInputLayout
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="10dp"
                 android:background="#fff"
                 android:id="@+id/newpasswordWrapper"
                 android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                 android:hint="New Password"
                 app:hintEnabled="true"
                 android:paddingTop="1dp"
-                android:paddingBottom="1dp"
+                android:paddingBottom="10dp"
                 android:textColorHint="@color/darkgray">
                 <EditText
                     android:id="@+id/newpassword"
@@ -71,9 +71,9 @@
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="10dp"
                 android:background="#fff"
-                android:paddingBottom="1dp"
+                android:paddingBottom="10dp"
                 android:id="@+id/confirmpassWrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"