From 4e5eecfece269772aaa288905d580b4d51d3e36c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 14 Sep 2018 17:21:32 +0000
Subject: [PATCH] Added inbox and archive to legend

---
 .idea/misc.xml                              |  2 +-
 app/src/main/res/layout/fragment_legend.xml | 84 +++++++++++++++------
 app/src/main/res/values/strings.xml         |  4 +-
 3 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 77d47004..caad359b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -30,7 +30,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index 82f648bc..c190224b 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -9,13 +9,73 @@
         android:layout_height="match_parent"
         android:padding="18dp">
 
+        <ImageView
+            android:id="@+id/ivInbox"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/baseline_inbox_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvInbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_inbox"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivInbox"
+            app:layout_constraintStart_toEndOf="@id/ivInbox"
+            app:layout_constraintTop_toTopOf="@id/ivInbox" />
+
+        <ImageView
+            android:id="@+id/ivUnified"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_folder_special_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivInbox" />
+
+        <TextView
+            android:id="@+id/tvUnified"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_unified"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivUnified"
+            app:layout_constraintStart_toEndOf="@id/ivUnified"
+            app:layout_constraintTop_toTopOf="@id/ivUnified" />
+
+        <ImageView
+            android:id="@+id/ivArchive"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_archive_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivUnified" />
+
+        <TextView
+            android:id="@+id/tvArchive"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_archive"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivArchive"
+            app:layout_constraintStart_toEndOf="@id/ivArchive"
+            app:layout_constraintTop_toTopOf="@id/ivArchive" />
+
         <ImageView
             android:id="@+id/ivCC"
             android:layout_width="24dp"
             android:layout_height="24dp"
+            android:layout_marginTop="12dp"
             android:src="@drawable/baseline_people_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/ivArchive" />
 
         <TextView
             android:id="@+id/tvCC"
@@ -108,26 +168,6 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimary"
             app:layout_constraintTop_toTopOf="@id/ivPrimary" />
 
-        <ImageView
-            android:id="@+id/ivUnified"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginTop="12dp"
-            android:src="@drawable/baseline_folder_special_24"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPrimary" />
-
-        <TextView
-            android:id="@+id/tvUnified"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:text="@string/title_legend_unified"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivUnified"
-            app:layout_constraintStart_toEndOf="@id/ivUnified"
-            app:layout_constraintTop_toTopOf="@id/ivUnified" />
-
         <ImageView
             android:id="@+id/ivDisconnected"
             android:layout_width="24dp"
@@ -135,7 +175,7 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_cloud_off_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivUnified" />
+            app:layout_constraintTop_toBottomOf="@id/ivPrimary" />
 
         <TextView
             android:id="@+id/tvDisconnected"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca2fceb5..f0deb35a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -218,12 +218,14 @@
     <string name="title_answer_name">Answer name</string>
     <string name="title_answer_text">Answer text</string>
 
+    <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_unified">Unified inbox</string>
+    <string name="title_legend_archive">Archive</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_synchronize">Synchronize</string>
     <string name="title_legend_primary">Primary</string>
-    <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_disconnected">Disconnected</string>
     <string name="title_legend_connecting">Connecting</string>
     <string name="title_legend_connected">Connected</string>