From f3f80b46c099334c1fba967a4f7b2a3caf3fcc6a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 2 Jul 2020 10:16:45 +0200
Subject: [PATCH] Small layout improvement

---
 .../eu/faircode/email/FragmentCompose.java    | 10 ++++---
 app/src/main/res/layout/dialog_send.xml       | 29 ++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 4bdc320d40..af2873d61d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5153,13 +5153,13 @@ public class FragmentCompose extends FragmentBase {
 
             final ViewGroup dview = (ViewGroup) LayoutInflater.from(getContext()).inflate(R.layout.dialog_send, null);
             final TextView tvAddressError = dview.findViewById(R.id.tvAddressError);
+            final TextView tvRemindSize = dview.findViewById(R.id.tvRemindSize);
             final TextView tvRemindTo = dview.findViewById(R.id.tvRemindTo);
             final TextView tvRemindExtra = dview.findViewById(R.id.tvRemindExtra);
             final TextView tvRemindPgp = dview.findViewById(R.id.tvRemindPgp);
             final TextView tvRemindSubject = dview.findViewById(R.id.tvRemindSubject);
             final TextView tvRemindText = dview.findViewById(R.id.tvRemindText);
             final TextView tvRemindAttachment = dview.findViewById(R.id.tvRemindAttachment);
-            final TextView tvRemindSize = dview.findViewById(R.id.tvRemindSize);
             final SwitchCompat swSendReminders = dview.findViewById(R.id.swSendReminders);
             final TextView tvSendRemindersHint = dview.findViewById(R.id.tvSendRemindersHint);
             final TextView tvTo = dview.findViewById(R.id.tvTo);
@@ -5177,15 +5177,17 @@ public class FragmentCompose extends FragmentBase {
 
             tvAddressError.setText(address_error);
             tvAddressError.setVisibility(address_error == null ? View.GONE : View.VISIBLE);
+
+            tvRemindSize.setText(getString(R.string.title_size_reminder,
+                    Helper.humanReadableByteCount(size, true), Helper.humanReadableByteCount(max_size, true)));
+            tvRemindSize.setVisibility(remind_size ? View.VISIBLE : View.GONE);
+
             tvRemindTo.setVisibility(send_reminders && remind_to ? View.VISIBLE : View.GONE);
             tvRemindExtra.setVisibility(send_reminders && remind_extra ? View.VISIBLE : View.GONE);
             tvRemindPgp.setVisibility(send_reminders && remind_pgp ? View.VISIBLE : View.GONE);
             tvRemindSubject.setVisibility(send_reminders && remind_subject ? View.VISIBLE : View.GONE);
             tvRemindText.setVisibility(send_reminders && remind_text ? View.VISIBLE : View.GONE);
             tvRemindAttachment.setVisibility(send_reminders && remind_attachment ? View.VISIBLE : View.GONE);
-            tvRemindSize.setText(getString(R.string.title_size_reminder,
-                    Helper.humanReadableByteCount(size, true), Helper.humanReadableByteCount(max_size, true)));
-            tvRemindSize.setVisibility(remind_size ? View.VISIBLE : View.GONE);
 
             tvTo.setText(null);
             tvVia.setText(null);
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 2e384c4ebb..992fd046f4 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -27,9 +27,22 @@
             android:text="Invalid address"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?attr/colorError"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvRemindSize"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_size_reminder"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?attr/colorError"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAddressError" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvRemindTo"
             android:layout_width="wrap_content"
@@ -38,8 +51,9 @@
             android:text="@string/title_to_missing"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?attr/colorWarning"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAddressError" />
+            app:layout_constraintTop_toBottomOf="@id/tvRemindSize" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvRemindExtra"
@@ -96,17 +110,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindText" />
 
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvRemindSize"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_size_reminder"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvRemindAttachment" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swSendReminders"
             android:layout_width="0dp"
@@ -116,7 +119,7 @@
             android:text="@string/title_advanced_send_reminders"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvRemindSize"
+            app:layout_constraintTop_toBottomOf="@id/tvRemindAttachment"
             app:switchPadding="12dp" />
 
         <eu.faircode.email.FixedTextView