From 0d213a1eb4c38ac96353b7cbf82b4338d08ccdc4 Mon Sep 17 00:00:00 2001 From: m2049r Date: Mon, 28 Jan 2019 01:16:00 +0100 Subject: [PATCH] hide sweep amount in street mode (#526) --- .../fragment/send/SendConfirmWizardFragment.java | 13 +++++++++---- .../fragment/send/SendSuccessWizardFragment.java | 11 ++++++++++- app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-el/strings.xml | 2 ++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-et/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-hu/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values-nb/strings.xml | 2 ++ app/src/main/res/values-nl/strings.xml | 2 ++ app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values-ro/strings.xml | 2 ++ app/src/main/res/values-ru/strings.xml | 2 ++ app/src/main/res/values-sk/strings.xml | 2 ++ app/src/main/res/values-sv/strings.xml | 2 ++ app/src/main/res/values-ua/strings.xml | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 22 files changed, 59 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java index 63f7361..e7838ba 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java @@ -214,11 +214,16 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen if (pendingTransaction != null) { llConfirmSend.setVisibility(View.VISIBLE); bSend.setEnabled(true); - tvTxAmount.setText(Wallet.getDisplayAmount(pendingTransaction.getAmount())); tvTxFee.setText(Wallet.getDisplayAmount(pendingTransaction.getFee())); - //tvTxDust.setText(Wallet.getDisplayAmount(pendingTransaction.getDust())); - tvTxTotal.setText(Wallet.getDisplayAmount( - pendingTransaction.getFee() + pendingTransaction.getAmount())); + if (getActivityCallback().isStreetMode() + && (sendListener.getTxData().getAmount() == Wallet.SWEEP_ALL)) { + tvTxAmount.setText(getString(R.string.street_sweep_amount)); + tvTxTotal.setText(getString(R.string.street_sweep_amount)); + } else { + tvTxAmount.setText(Wallet.getDisplayAmount(pendingTransaction.getAmount())); + tvTxTotal.setText(Wallet.getDisplayAmount( + pendingTransaction.getFee() + pendingTransaction.getAmount())); + } } else { llConfirmSend.setVisibility(View.GONE); bSend.setEnabled(false); diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java index 0e09a0c..1c34e08 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java @@ -27,6 +27,7 @@ import android.widget.Toast; import com.m2049r.xmrwallet.R; import com.m2049r.xmrwallet.data.PendingTx; import com.m2049r.xmrwallet.data.TxData; +import com.m2049r.xmrwallet.model.Wallet; import com.m2049r.xmrwallet.util.Helper; import timber.log.Timber; @@ -54,6 +55,8 @@ public class SendSuccessWizardFragment extends SendWizardFragment { void enableDone(); SendFragment.Mode getMode(); + + SendFragment.Listener getActivityCallback(); } ImageButton bCopyTxId; @@ -120,7 +123,13 @@ public class SendSuccessWizardFragment extends SendWizardFragment { tvTxId.setText(committedTx.txId); bCopyTxId.setEnabled(true); bCopyTxId.setImageResource(R.drawable.ic_content_copy_black_24dp); - tvTxAmount.setText(getString(R.string.send_amount, Helper.getDisplayAmount(committedTx.amount))); + + if (sendListener.getActivityCallback().isStreetMode() + && (sendListener.getTxData().getAmount() == Wallet.SWEEP_ALL)) { + tvTxAmount.setText(getString(R.string.street_sweep_amount)); + } else { + tvTxAmount.setText(getString(R.string.send_amount, Helper.getDisplayAmount(committedTx.amount))); + } tvTxFee.setText(getString(R.string.send_fee, Helper.getDisplayAmount(committedTx.fee))); } sendListener.enableDone(); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 37684c2..40fd987 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -374,4 +374,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 344a6e1..0f7c309 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -373,4 +373,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b02ccce..77ef302 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -363,4 +363,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index ad7fe43..36aa87f 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -371,4 +371,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1a4524c..2f6ced8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -377,4 +377,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8d0a290..947e672 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -375,4 +375,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 895c00d..519ab87 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -376,4 +376,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5b3890a..8ba5f19 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -419,4 +419,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 54aa12f..fbdb010 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -373,4 +373,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 875a7ba..9ae7b4e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -373,4 +373,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4e47eec..ad4e4c3 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -365,4 +365,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index cc35b71..ac12b1d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -377,4 +377,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3740c27..44f6e6f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -373,4 +373,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8b83296..4a08897 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -377,4 +377,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 679d435..ec82a1c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -374,4 +374,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2f33499..20ad413 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -358,4 +358,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-ua/strings.xml b/app/src/main/res/values-ua/strings.xml index 7f5581c..1091be2 100644 --- a/app/src/main/res/values-ua/strings.xml +++ b/app/src/main/res/values-ua/strings.xml @@ -377,4 +377,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6df893c..c2c7427 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -371,4 +371,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 54862d6..a04597f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -373,4 +373,6 @@ BTC amount out of bounds Invalid or outdated Payment URL Too many requests + + EVERYTHING! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 755b8d3..99ae8c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -422,4 +422,6 @@ Too many requests XMR.TO Service Error + + EVERYTHING!