From 76886c80a230adb4f36e620a594a0e581d6d9f92 Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Fri, 7 Sep 2018 15:27:46 +0900
Subject: [PATCH] Animation fixes

---
 .../PayoutModeSendMoneyFragment.java          | 41 +++++++++++++++----
 .../fragment_payout_mode_send_money_v2.xml    |  2 +-
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
index 8f5d9e38..1ef8294e 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
@@ -170,9 +170,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
     @Override
     public void onPayoutModeSelected(PayoutMode selectedPayoutMode) {
         this.selectedPayoutMode = selectedPayoutMode;
-        clearBankData();
-        clearBranchData();
-        clearAccounData();
+
         showBankSelectView(this.selectedPayoutMode.getBankrequired().equalsIgnoreCase(Constants.TRUE_STRING));
 
 
@@ -263,10 +261,17 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         v.startAnimation(a);
     }
 
+    /**
+     * Orchestrates transaltion animation for corresponding view
+     * clearData is performed according to the animation
+     * @param action
+     */
     private void showBankSelectView(boolean action) {
-        branchListContainer.setVisibility(View.GONE);
-        accountViewContainer.setVisibility(View.GONE);
+
         if (action) {
+            clearBankData();
+            clearBranchData();
+            clearAccounData();
             if(bankDetailContainer.getVisibility()==View.GONE)
                     expand(bankDetailContainer,()->{
                         bankDetailContainer.setVisibility(View.VISIBLE);
@@ -278,6 +283,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
                         }
                     });
 
+
         } else {
 
             if (bankListContainer.getVisibility() == View.VISIBLE) {
@@ -285,19 +291,36 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
                     @Override
                     public void onAnimationEnd(View view) {
                         super.onAnimationEnd(view);
+
+                        if(bankDetailContainer.getVisibility()==View.VISIBLE)
+                            collapse(bankDetailContainer,()->{bankDetailContainer.setVisibility(View.GONE);
+                                clearBankData();
+                                clearBranchData();
+                                clearAccounData();
+                            });
+                        else
+                        {
+                            clearBankData();
+                            clearBranchData();
+                            clearAccounData();
+                        }
                         bankListContainer.setVisibility(View.INVISIBLE);
                         bankListContainer.setTranslationY(bankListContainer.getHeight());
                         ViewCompat.animate(bankListContainer).setListener(null);
-
-                        if(bankDetailContainer.getVisibility()==View.VISIBLE)
-                            collapse(bankDetailContainer,()->bankDetailContainer.setVisibility(View.GONE));
-
                     }
                 });
 
             }
+            else
+            {
+                clearBankData();
+                clearBranchData();
+                clearAccounData();
+            }
 
         }
+        branchListContainer.setVisibility(View.GONE);
+        accountViewContainer.setVisibility(View.GONE);
     }
 
     private void showBranchSelectView(boolean action) {
diff --git a/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml b/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
index cf160f7d..c5ebd96c 100644
--- a/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
@@ -152,7 +152,7 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/payoutModeContinueButton"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="20dp"
         android:layout_width="200dp"
         android:layout_height="50dp"
         android:layout_marginBottom="15dp"