diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
index 4e75a113e1..8b903934db 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
@@ -60,9 +60,8 @@ interface Listener {
private TextView tvFunds;
private ExchangeTextView evAmount;
- private NumberPadView numberPad;
private View llAmount;
- private View ivSweep;
+ private View rlSweep;
private ImageButton ibSweep;
@Override
@@ -78,12 +77,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
tvFunds = (TextView) view.findViewById(R.id.tvFunds);
evAmount = (ExchangeTextView) view.findViewById(R.id.evAmount);
- numberPad = (NumberPadView) view.findViewById(R.id.numberPad);
- numberPad.setListener(evAmount);
+ ((NumberPadView) view.findViewById(R.id.numberPad)).setListener(evAmount);
+ rlSweep = view.findViewById(R.id.rlSweep);
llAmount = view.findViewById(R.id.llAmount);
- ivSweep = view.findViewById(R.id.ivSweep);
- ivSweep.setOnClickListener(new View.OnClickListener() {
+ view.findViewById(R.id.ivSweep).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
sweepAll(false);
@@ -110,11 +108,11 @@ private void sweepAll(boolean spendAllMode) {
if (spendAllMode) {
ibSweep.setVisibility(View.INVISIBLE);
llAmount.setVisibility(View.GONE);
- ivSweep.setVisibility(View.VISIBLE);
+ rlSweep.setVisibility(View.VISIBLE);
} else {
ibSweep.setVisibility(View.VISIBLE);
llAmount.setVisibility(View.VISIBLE);
- ivSweep.setVisibility(View.GONE);
+ rlSweep.setVisibility(View.GONE);
}
this.spendAllMode = spendAllMode;
}
diff --git a/app/src/main/res/layout/fragment_send_amount.xml b/app/src/main/res/layout/fragment_send_amount.xml
index f2d3a3f037..f6cdfcaacc 100644
--- a/app/src/main/res/layout/fragment_send_amount.xml
+++ b/app/src/main/res/layout/fragment_send_amount.xml
@@ -57,11 +57,29 @@
-
+ android:visibility="gone">
+
+
+
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a58b5aa6b2..0884ad47dd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -237,7 +237,7 @@
Adresse
Betrag
Optionen
- Annehmen
+ Gebühr
Fertig
Betrag
@@ -317,4 +317,5 @@
%1$s XMR
Added new account #%1$d
Account #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 48fb2b5e2d..c31deb1012 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -302,4 +302,5 @@
%1$s XMR
Added new account #%1$d
Account #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9afd92e461..9f25fcc8c2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -320,4 +320,5 @@
%1$s XMR
Nouveau Compte #%1$d ajouté
Compte #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d425a67bd4..c6a05c874e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -318,4 +318,5 @@
%1$s XMR
Added new account #%1$d
Account #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index e3e0ceeb1f..a34739742c 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -316,4 +316,5 @@
%1$s XMR
Added new account #%1$d
Account #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6b9864f59c..97638f3745 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -314,4 +314,5 @@
%1$s XMR
Added new account #%1$d
Account #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2a9ef36509..f8834eb077 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -315,4 +315,5 @@
%1$s XMR
Added new account #%1$d
Account #
+ Send all confirmed funds in this account!
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a2939fd2a..f30e07156e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,6 +258,8 @@
Create Transaction Error
+ Send all confirmed funds in this account!
+
%1$s XMR
Added new account #%1$d