From 622013d21764af440fed54b254493ef795ad8f1f Mon Sep 17 00:00:00 2001 From: fuwa Date: Fri, 26 Oct 2018 16:39:47 +0000 Subject: [PATCH] less animation in auto gen subaddresses --- .../wownero/wownerujo/ReceiveFragment.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java index c129366..40c1046 100644 --- a/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java @@ -173,7 +173,7 @@ public class ReceiveFragment extends Fragment { bSubaddress.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - generateNewSubaddress(); + generateNewSubaddress(true); } }); @@ -252,7 +252,7 @@ public class ReceiveFragment extends Fragment { etDummy.requestFocus(); } - void generateNewSubaddress() { + void generateNewSubaddress(boolean scale) { enableSubaddressButton(false); enableCopyAddress(false); @@ -270,9 +270,14 @@ public class ReceiveFragment extends Fragment { storeWallet(); generateQr(); enableCopyAddress(true); - tvAddress.animate().alpha(1).setDuration(125) - .scaleX(1.2f).scaleY(1.2f) - .withEndAction(resetSize).start(); + if (scale) { + tvAddress.animate().alpha(1).setDuration(125) + .scaleX(1.2f).scaleY(1.2f) + .withEndAction(resetSize).start(); + } + else { + tvAddress.animate().alpha(1).setDuration(125).start(); + } } }; @@ -306,8 +311,8 @@ public class ReceiveFragment extends Fragment { etPaymentId.setEnabled(true); bPaymentId.setEnabled(true); hideProgress(); - generateNewSubaddress(); -8 } + generateNewSubaddress(false); + } private void enableCopyAddress(boolean enable) { bCopyAddress.setClickable(enable);