From 817816cd345ee6e21f0dc633d0c74e9e533070a5 Mon Sep 17 00:00:00 2001
From: m2049r <miner2049er@women-at-work.org>
Date: Sun, 17 Jun 2018 13:21:59 +0200
Subject: [PATCH] Layout tweaks (#319)
* sweep layout tweak
* reduce label to fit
* change sweep message
---
.../send/SendAmountWizardFragment.java | 14 +++++-----
.../main/res/layout/fragment_send_amount.xml | 26 ++++++++++++++++---
app/src/main/res/values-de/strings.xml | 3 ++-
app/src/main/res/values-es/strings.xml | 1 +
app/src/main/res/values-fr/strings.xml | 1 +
app/src/main/res/values-it/strings.xml | 1 +
app/src/main/res/values-nb/strings.xml | 1 +
app/src/main/res/values-zh-rCN/strings.xml | 1 +
app/src/main/res/values-zh-rTW/strings.xml | 1 +
app/src/main/res/values/strings.xml | 2 ++
10 files changed, 38 insertions(+), 13 deletions(-)
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 4e75a113..8b903934 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 @@ public class SendAmountWizardFragment extends SendWizardFragment {
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 class SendAmountWizardFragment extends SendWizardFragment {
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 @@ public class SendAmountWizardFragment extends SendWizardFragment {
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 f2d3a3f0..f6cdfcaa 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 @@
</LinearLayout>
- <ImageView
- android:id="@+id/ivSweep"
+ <RelativeLayout
+ android:id="@+id/rlSweep"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:src="@drawable/ic_all_inclusive_24dp"
- android:visibility="gone"/>
+ android:visibility="gone">
+ <ImageView
+ android:id="@+id/ivSweep"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/tvSweep"
+ android:layout_alignParentTop="true"
+ android:padding="16dp"
+ android:src="@drawable/ic_all_inclusive_24dp" />
+
+ <TextView
+ android:id="@+id/tvSweep"
+ style="@style/MoneroLabel.Heading.Donation"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="16dp"
+ android:gravity="center"
+ android:text="@string/send_sweepall" />
+ </RelativeLayout>
</LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a58b5aa6..0884ad47 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -237,7 +237,7 @@
<string name="send_address_title">Adresse</string>
<string name="send_amount_title">Betrag</string>
<string name="send_settings_title">Optionen</string>
- <string name="send_confirm_title">Annehmen</string>
+ <string name="send_confirm_title">Gebühr</string>
<string name="send_success_title">Fertig</string>
<string name="send_amount_label">Betrag</string>
@@ -317,4 +317,5 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>
<string name="tx_account">Account #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 48fb2b5e..c31deb10 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -302,4 +302,5 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>
<string name="tx_account">Account #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9afd92e4..9f25fcc8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -320,4 +320,5 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Nouveau Compte #%1$d ajouté</string>
<string name="tx_account">Compte #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d425a67b..c6a05c87 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -318,4 +318,5 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>
<string name="tx_account">Account #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index e3e0ceeb..a3473974 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -316,4 +316,5 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>
<string name="tx_account">Account #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6b9864f5..97638f37 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 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>
<string name="tx_account">Account #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2a9ef365..f8834eb0 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 @@
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>
<string name="tx_account">Account #</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a2939fd..f30e0715 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,6 +258,8 @@
<string name="send_create_tx_error_title">Create Transaction Error</string>
+ <string name="send_sweepall">Send all confirmed funds in this account!</string>
+
<string name="accounts_balance">%1$s XMR</string>
<string name="accounts_new">Added new account #%1$d</string>