wownero
/
wownerujo
Archived
4
0
Fork 0

disable animation in auto gen subaddresses

master
fuwa 6 years ago
parent 6cbf94246a
commit f5a9891d94

@ -197,6 +197,7 @@ public class ReceiveFragment extends Fragment {
} }
}); });
tvAddressLabel.setText("");
showProgress(); showProgress();
clearQR(); clearQR();
@ -252,10 +253,12 @@ public class ReceiveFragment extends Fragment {
etDummy.requestFocus(); etDummy.requestFocus();
} }
void generateNewSubaddress(boolean scale) { void generateNewSubaddress(boolean animate) {
enableSubaddressButton(false); if (animate) {
enableCopyAddress(false); enableSubaddressButton(false);
enableCopyAddress(false);
}
final Runnable resetSize = new Runnable() { final Runnable resetSize = new Runnable() {
public void run() { public void run() {
tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start(); tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
@ -270,19 +273,20 @@ public class ReceiveFragment extends Fragment {
storeWallet(); storeWallet();
generateQr(); generateQr();
enableCopyAddress(true); enableCopyAddress(true);
if (scale) { if (animate) {
tvAddress.animate().alpha(1).setDuration(125) tvAddress.animate().alpha(1).setDuration(125)
.scaleX(1.2f).scaleY(1.2f) .scaleX(1.2f).scaleY(1.2f)
.withEndAction(resetSize).start(); .withEndAction(resetSize).start();
} }
else {
tvAddress.animate().alpha(1).setDuration(125).start();
}
} }
}; };
tvAddress.animate().alpha(0).setDuration(250) if (animate) {
.withEndAction(newAddress).start(); tvAddress.animate().alpha(0).setDuration(250)
.withEndAction(newAddress).start();
} else {
new Thread(newAddress).run();
}
} }
@Override @Override
@ -305,11 +309,14 @@ public class ReceiveFragment extends Fragment {
private void show() { private void show() {
Timber.d("name=%s", wallet.getName()); Timber.d("name=%s", wallet.getName());
isLoaded = true; isLoaded = true;
listenerCallback.setTitle(wallet.getName()); listenerCallback.setTitle(wallet.getName());
listenerCallback.setSubtitle(wallet.getAccountLabel()); listenerCallback.setSubtitle(wallet.getAccountLabel());
tvAddress.setText(wallet.getAddress());
etPaymentId.setEnabled(true); // tvAddress.setText(wallet.getAddress());
bPaymentId.setEnabled(true); // etPaymentId.setEnabled(true);
// bPaymentId.setEnabled(true);
hideProgress(); hideProgress();
generateNewSubaddress(false); generateNewSubaddress(false);
} }