From 51876f788f09fab5d24ee03451f987840da7485c Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Tue, 5 Dec 2017 21:26:38 +0100
Subject: [PATCH] Bugfixes & UI tweaks (#149)
* cancel button + avoid crash if exchanging
* max check fix
---
.../com/m2049r/xmrwallet/SendAmountWizardFragment.java | 5 +++--
app/src/main/java/com/m2049r/xmrwallet/SendFragment.java | 4 ++--
.../main/java/com/m2049r/xmrwallet/WalletActivity.java | 4 ++++
.../com/m2049r/xmrwallet/widget/ExchangeTextView.java | 9 +++++++++
.../main/java/com/m2049r/xmrwallet/widget/Toolbar.java | 7 +++++++
app/src/main/res/values/strings.xml | 1 +
6 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendAmountWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendAmountWizardFragment.java
index f414041..a1a5175 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/SendAmountWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SendAmountWizardFragment.java
@@ -115,10 +115,11 @@ public class SendAmountWizardFragment extends SendWizardFragment {
Timber.d("onResumeFragment()");
Helper.hideKeyboard(getActivity());
final long funds = getTotalFunds();
- maxFunds = funds / 1000000000000L;
+ maxFunds = 1.0 * funds / 1000000000000L;
tvFunds.setText(getString(R.string.send_available,
Wallet.getDisplayAmount(funds)));
- if (evAmount.getAmount().isEmpty()) {
+ // getAmount is null if exchange is in progress
+ if ((evAmount.getAmount() != null) && evAmount.getAmount().isEmpty()) {
final BarcodeData data = sendListener.popBarcodeData();
if ((data != null) && (data.amount > 0)) {
evAmount.setAmount(Wallet.getDisplayAmount(data.amount));
diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
index 8c2f7a2..d8dd537 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
@@ -198,10 +198,10 @@ public class SendFragment extends Fragment
super.onResume();
Timber.d("onResume");
activityCallback.setSubtitle(getString(R.string.send_title));
- if (getConfirmFragment() != null) {
+ if (spendViewPager.getCurrentItem() == SpendPagerAdapter.POS_SUCCESS) {
activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
} else {
- activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+ activityCallback.setToolbarButton(Toolbar.BUTTON_CANCEL);
}
}
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index 21fa397..70ef6a9 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -202,6 +202,10 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
onDisposeRequest();
onBackPressed();
break;
+ case Toolbar.BUTTON_CANCEL:
+ onDisposeRequest();
+ WalletActivity.super.onBackPressed();
+ break;
case Toolbar.BUTTON_CLOSE:
finish();
break;
diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java b/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java
index 22908ac..1a6edbf 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java
@@ -58,6 +58,11 @@ public class ExchangeTextView extends LinearLayout
}
public boolean validate(double max) {
+ Timber.d("inProgress=%b", isExchangeInProgress());
+ if (isExchangeInProgress()) {
+ shakeExchangeField();
+ return false;
+ }
boolean ok = true;
if (xmrAmount != null) {
try {
@@ -86,6 +91,10 @@ public class ExchangeTextView extends LinearLayout
tvAmountA.startAnimation(Helper.getShakeAnimation(getContext()));
}
+ void shakeExchangeField() {
+ tvAmountB.startAnimation(Helper.getShakeAnimation(getContext()));
+ }
+
public void setAmount(String xmrAmount) {
if (xmrAmount != null) {
setCurrencyA(0);
diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java b/app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java
index f36d8dc..e06c081 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java
@@ -117,6 +117,7 @@ public class Toolbar extends android.support.v7.widget.Toolbar {
public final static int BUTTON_BACK = 1;
public final static int BUTTON_CLOSE = 2;
public final static int BUTTON_DONATE = 3;
+ public final static int BUTTON_CANCEL = 4;
int buttonType = BUTTON_DONATE;
@@ -140,6 +141,12 @@ public class Toolbar extends android.support.v7.widget.Toolbar {
bDonate.setText(R.string.label_donate);
bDonate.setVisibility(View.VISIBLE);
break;
+ case BUTTON_CANCEL:
+ Timber.d("BUTTON_CANCEL");
+ bDonate.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_close_white_24dp, 0, 0, 0);
+ bDonate.setText(R.string.label_cancel);
+ bDonate.setVisibility(View.VISIBLE);
+ break;
case BUTTON_NONE:
default:
Timber.d("BUTTON_NONE");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 89d11c0..823fe37 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
Wallets
Donate
Close
+ Cancel
Touch for detailed information
Success!