From 54656804e88709a417138680ad27d8d50f5692c8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 24 Nov 2018 13:02:21 +0100
Subject: [PATCH] Added image placeholder to legend

---
 app/src/main/res/layout/fragment_legend.xml | 54 ++++++++++++++-------
 app/src/main/res/values/strings.xml         |  3 +-
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index 6eb0a0dc07..2bb1cbcd98 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -128,6 +128,26 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimaryConnected"
             app:layout_constraintTop_toTopOf="@id/ivPrimaryConnected" />
 
+        <ImageView
+            android:id="@+id/ivThread"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_message_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivPrimaryConnected" />
+
+        <TextView
+            android:id="@+id/tvThread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_thread"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivThread"
+            app:layout_constraintStart_toEndOf="@id/ivThread"
+            app:layout_constraintTop_toTopOf="@id/ivThread" />
+
         <ImageView
             android:id="@+id/ivCC"
             android:layout_width="24dp"
@@ -135,7 +155,7 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_people_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPrimaryConnected" />
+            app:layout_constraintTop_toBottomOf="@id/ivThread" />
 
         <TextView
             android:id="@+id/tvCC"
@@ -169,44 +189,44 @@
             app:layout_constraintTop_toTopOf="@id/ivAttachment" />
 
         <ImageView
-            android:id="@+id/ivThread"
+            android:id="@+id/ivContacts"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginTop="12dp"
-            android:src="@drawable/baseline_message_24"
+            android:src="@drawable/baseline_import_contacts_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivAttachment" />
 
         <TextView
-            android:id="@+id/tvThread"
+            android:id="@+id/tvContacts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:text="@string/title_legend_thread"
+            android:text="@string/title_legend_contacts"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivThread"
-            app:layout_constraintStart_toEndOf="@id/ivThread"
-            app:layout_constraintTop_toTopOf="@id/ivThread" />
+            app:layout_constraintBottom_toBottomOf="@id/ivContacts"
+            app:layout_constraintStart_toEndOf="@id/ivContacts"
+            app:layout_constraintTop_toTopOf="@id/ivContacts" />
 
         <ImageView
-            android:id="@+id/ivContacts"
+            android:id="@+id/ivImage"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginTop="12dp"
-            android:src="@drawable/baseline_import_contacts_24"
+            android:src="@drawable/baseline_image_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivThread" />
+            app:layout_constraintTop_toBottomOf="@id/ivContacts" />
 
         <TextView
-            android:id="@+id/tvContacts"
+            android:id="@+id/tvImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:text="@string/title_legend_contacts"
+            android:text="@string/title_legend_image"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivContacts"
-            app:layout_constraintStart_toEndOf="@id/ivContacts"
-            app:layout_constraintTop_toTopOf="@id/ivContacts" />
+            app:layout_constraintBottom_toBottomOf="@id/ivImage"
+            app:layout_constraintStart_toEndOf="@id/ivImage"
+            app:layout_constraintTop_toTopOf="@id/ivImage" />
 
         <ImageView
             android:id="@+id/ivSynchronize"
@@ -215,7 +235,7 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_sync_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivContacts" />
+            app:layout_constraintTop_toBottomOf="@id/ivImage" />
 
         <TextView
             android:id="@+id/tvSynchronize"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 373bad197f..66fdb67074 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -302,10 +302,11 @@
     <string name="title_legend_trash">Trash</string>
     <string name="title_legend_primary_disconnected">Account disconnected</string>
     <string name="title_legend_primary_connected">Account connected</string>
+    <string name="title_legend_thread">Conversation</string>
     <string name="title_legend_cc">CC/BCC</string>
     <string name="title_legend_attachment">Attachment</string>
-    <string name="title_legend_thread">Conversation</string>
     <string name="title_legend_contacts">Contacts</string>
+    <string name="title_legend_image">Image placeholder</string>
     <string name="title_legend_synchronize_on">Synchronize on</string>
     <string name="title_legend_synchronize_off">Synchronize off</string>
     <string name="title_legend_primary">Primary/starred</string>