From 2ef7f8571ca1037c2d182abe5a94b11b668f0448 Mon Sep 17 00:00:00 2001
From: m2049r <miner2049er@women-at-work.org>
Date: Mon, 26 Nov 2018 23:08:32 +0100
Subject: [PATCH] adjust & tweak tx details layout (#489)

---
 app/src/main/res/layout/fragment_tx_info.xml | 75 +++++++++++---------
 app/src/main/res/values-de/strings.xml       |  1 -
 app/src/main/res/values-el/strings.xml       |  1 -
 app/src/main/res/values-es/strings.xml       |  1 -
 app/src/main/res/values-et/strings.xml       |  1 -
 app/src/main/res/values-fr/strings.xml       |  1 -
 app/src/main/res/values-hu/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-nl/strings.xml       |  1 -
 app/src/main/res/values-pt-rBR/strings.xml   |  1 -
 app/src/main/res/values-pt/strings.xml       |  1 -
 app/src/main/res/values-ro/strings.xml       |  1 -
 app/src/main/res/values-ru/strings.xml       |  1 -
 app/src/main/res/values-sk/strings.xml       |  1 -
 app/src/main/res/values-sv/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          |  1 -
 19 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/app/src/main/res/layout/fragment_tx_info.xml b/app/src/main/res/layout/fragment_tx_info.xml
index 2af09208..db07c2a6 100644
--- a/app/src/main/res/layout/fragment_tx_info.xml
+++ b/app/src/main/res/layout/fragment_tx_info.xml
@@ -115,6 +115,7 @@
                             style="@style/MoneroLabel.Small"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="top"
                             android:gravity="end"
                             android:padding="8dp"
                             android:text="@string/tx_destination_btc" />
@@ -175,43 +176,51 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_account" />
 
-                <TextView
-                    android:id="@+id/tvAccount"
-                    style="@style/MoneroText"
-                    android:gravity="start"
-                    android:padding="8dp"
-                    android:selectAllOnFocus="true"
-                    android:textIsSelectable="true" />
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tvAccount"
+                        style="@style/MoneroText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:gravity="start"
+                        android:paddingStart="8dp"
+                        android:paddingTop="8dp"
+                        android:paddingEnd="8dp"
+                        android:selectAllOnFocus="true"
+                        android:textIsSelectable="true"
+                        tools:text="(0,1)" />
+
+                    <TextView
+                        android:id="@+id/tvAddress"
+                        style="@style/MoneroText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/tvAccount"
+                        android:gravity="start"
+                        android:paddingStart="8dp"
+                        android:paddingEnd="8dp"
+                        android:paddingBottom="8dp"
+                        android:selectAllOnFocus="true"
+                        android:textIsSelectable="true"
+                        tools:text="4BKjy1uVRTPiz4pHyaXXawb82XpzLiowSDd8rEQJGqvN6AD6kWosLQ6VJXW9sghopxXgQSh1RTd54JdvvCRsXiF41xvfeW5" />
+                </RelativeLayout>
             </TableRow>
 
             <TableRow>
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="end"
-                    android:padding="8dp"
-                    android:text="@string/tx_address" />
-
-                <TextView
-                    android:id="@+id/tvAddress"
-                    style="@style/MoneroText"
-                    android:gravity="start"
-                    android:padding="8dp"
-                    android:selectAllOnFocus="true"
-                    android:textIsSelectable="true" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8sp"
                     android:text="@string/tx_notes" />
@@ -250,7 +259,7 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_destination" />
@@ -268,7 +277,7 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_paymentId" />
@@ -286,7 +295,7 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_id" />
@@ -304,7 +313,7 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_key" />
@@ -322,7 +331,7 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_blockheight" />
@@ -340,7 +349,7 @@
 
                 <TextView
                     style="@style/MoneroLabel.Small"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:gravity="end"
                     android:padding="8dp"
                     android:text="@string/tx_transfers" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 95e745a2..6769a033 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -293,7 +293,6 @@
     <string name="accounts_drawer_new">Konto erstellen</string>
     <string name="accounts_new">Neues Konto #%1$d hinzugefügt</string>
     <string name="tx_account">Konto #</string>
-    <string name="tx_address">Adresse</string>
 
     <string name="send_sweepall">Versende ALLE(!) verfügbaren Gelder aus diesem Konto</string>
     <string name="tx_subaddress">Subadresse #%1$d</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e88cb80c..db112ce5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -293,7 +293,6 @@
     <string name="accounts_drawer_new">Create Account</string>
     <string name="accounts_new">Added new account #%1$d</string>
     <string name="tx_account">Account #</string>
-    <string name="tx_address">Διεύθυνση</string>
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
     <string name="generate_address_label_sub">Public Subaddress #%1$d</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2dd85274..a146bc5b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -280,7 +280,6 @@
     <string name="accounts_drawer_new">Crear Cuenta</string>
     <string name="accounts_new">Nueva cuenta agregada #%1$d</string>
     <string name="tx_account"># de cuenta</string>
-    <string name="tx_address">Dirección</string>
 
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 4e6d31e1..a6a21668 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -298,7 +298,6 @@
     <string name="accounts_drawer_new">Loo konto</string>
     <string name="accounts_new">Uus konto lisatud #%1$d</string>
     <string name="tx_account">Konto #</string>
-    <string name="tx_address">Aadress</string>
 
     <string name="send_sweepall">Saada kõik selle konto kinnitatud vahendid!</string>
     <string name="tx_subaddress">Alamaadress #%1$d</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bab0022f..f70a9870 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -295,7 +295,6 @@
     <string name="accounts_drawer_new">Créer un Compte</string>
     <string name="accounts_new">Nouveau Compte #%1$d ajouté</string>
     <string name="tx_account">Compte #</string>
-    <string name="tx_address">Adresse</string>
 
     <string name="send_sweepall">Envoyer tous les fonds confirmés sur ce compte !</string>
     <string name="tx_subaddress">Sous-adresse #%1$d</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 66c8b484..2b5103f6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -292,7 +292,6 @@
     <string name="accounts_drawer_new">Számla létrehozása</string>
     <string name="accounts_new">Új számla hozzáadva (#%1$d)</string>
     <string name="tx_account">Számla #</string>
-    <string name="tx_address">Cím</string>
 
     <string name="send_sweepall">Teljes megerősített egyenleg küldése!</string>
     <string name="tx_subaddress">Alcím #%1$d</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3ab02558..74fd719e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -294,7 +294,6 @@
     <string name="accounts_drawer_new">Crea Account</string>
     <string name="accounts_new">Aggiunto nuovo account #%1$d</string>
     <string name="tx_account">Account #</string>
-    <string name="tx_address">Indirizzo</string>
 
     <string name="send_sweepall">Manda tutti i fondi confermati in questo account!</string>
     <string name="tx_subaddress">Sottoindirizzo #%1$d</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 78cfd84e..5a963d62 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -292,7 +292,6 @@
     <string name="accounts_drawer_new">Create Account</string>
     <string name="accounts_new">Added new account #%1$d</string>
     <string name="tx_account">Account #</string>
-    <string name="tx_address">Adresse</string>
 
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b218744a..2e69b262 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -290,7 +290,6 @@
     <string name="accounts_drawer_new">Account maken</string>
     <string name="accounts_new">Nieuw account #%1$d toegevoegd</string>
     <string name="tx_account">Accountnr.</string>
-    <string name="tx_address">Adres</string>
 
     <string name="send_sweepall">Al het bevestigde geld in dit account verzenden!</string>
     <string name="tx_subaddress">Subadres #%1$d</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3035874e..1b50b7f2 100755
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -292,7 +292,6 @@
     <string name="accounts_drawer_new">Criar conta</string>
     <string name="accounts_new">Conta adicionada #%1$d</string>
     <string name="tx_account">Conta #</string>
-    <string name="tx_address">Endereço</string>
 
     <string name="send_sweepall">Enviar todo o saldo disponível nesta conta!</string>
     <string name="tx_subaddress">Subendereço #%1$d</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 52683d9d..c95ab46b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -294,7 +294,6 @@
     <string name="accounts_drawer_new">Create Account</string>
     <string name="accounts_new">Added new account #%1$d</string>
     <string name="tx_account">Account #</string>
-    <string name="tx_address">Endereço</string>
 
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 7de855ca..5bad90eb 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -293,7 +293,6 @@
     <string name="accounts_drawer_new">Create Account</string>
     <string name="accounts_new">Added new account #%1$d</string>
     <string name="tx_account">Account #</string>
-    <string name="tx_address">Adresă</string>
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
     <string name="generate_address_label_sub">Public Subaddress #%1$d</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index cd2df2f6..a47de261 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -293,7 +293,6 @@
     <string name="accounts_drawer_new">Создать учетную запись</string>
     <string name="accounts_new">Добавить новую учетную запись #%1$d</string>
     <string name="tx_account">Учетная запись #</string>
-    <string name="tx_address">Адрес</string>
 
     <string name="send_sweepall">Отправить все средства на этот счет!</string>
     <string name="tx_subaddress">Субадрес #%1$d</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index bf921ccd..91f1d178 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -290,7 +290,6 @@
     <string name="accounts_drawer_new">Vytvor Účet</string>
     <string name="accounts_new">Pridaný nový účet #%1$d</string>
     <string name="tx_account">Účet #</string>
-    <string name="tx_address">Adresa</string>
 
     <string name="send_sweepall">Pošli všetky potvrdené prostriedky na tomto účte!</string>
     <string name="tx_subaddress">Podadresa #%1$d</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b8d116c0..9ba59e23 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -276,7 +276,6 @@
     <string name="accounts_drawer_new">Skapa konto</string>
     <string name="accounts_new">Nytt konto skapat #%1$d</string>
     <string name="tx_account">Konto #</string>
-    <string name="tx_address">Adress</string>
 
     <string name="send_sweepall">Skicka alla bekräftade pengar i detta konto!</string>
     <string name="tx_subaddress">Underadress #%1$d</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cd643260..fdd9ebd8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -290,7 +290,6 @@
     <string name="accounts_drawer_new">开新户口</string>
     <string name="accounts_new">已新增户口 #%1$d</string>
     <string name="tx_account">户口 #</string>
-    <string name="tx_address">地址</string>
 
     <string name="send_sweepall">发送这个户口的所有已确认款项！</string>
     <string name="tx_subaddress">附属地址 #%1$d</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6eade71a..a59cc65d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -291,7 +291,6 @@
     <string name="accounts_drawer_new">新增帳戶</string>
     <string name="accounts_new">已新增帳戶 #%1$d</string>
     <string name="tx_account">帳戶 #</string>
-    <string name="tx_address">地址</string>
 
     <string name="send_sweepall">發送這個帳戶的所有已確認款項！</string>
     <string name="tx_subaddress">子地址 #%1$d</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c063edc3..0aed9795 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -345,7 +345,6 @@
     <string name="accounts_drawer_new">Create Account</string>
     <string name="accounts_new">Added new account #%1$d</string>
     <string name="tx_account">Account #</string>
-    <string name="tx_address">Address</string>
 
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>