From 9980f38c6a959e9ac05e1b78f17c692dc972cd75 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 18 Sep 2018 09:36:48 +0000
Subject: [PATCH] Updated legend

---
 .idea/caches/build_file_checksums.ser       | Bin 588 -> 588 bytes
 app/src/main/res/layout/fragment_legend.xml |  68 ++++++++++++++++++--
 app/src/main/res/values/strings.xml         |   7 +-
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 5041420ac83e71a5855a7d7d5d55f0b59ec88393..eaad7b3c79709c6a7d418d655bdae28c60511c2b 100644
GIT binary patch
delta 14
WcmX@Za)xEXOy<)wA8(wqfe`>R$_Ekv

delta 14
WcmX@Za)xEXOlI4RppA1jFaiK8?FGUB

diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index 676fb59a..10636d37 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -68,6 +68,26 @@
             app:layout_constraintStart_toEndOf="@id/ivArchive"
             app:layout_constraintTop_toTopOf="@id/ivArchive" />
 
+        <ImageView
+            android:id="@+id/ivTrash"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_delete_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivArchive" />
+
+        <TextView
+            android:id="@+id/tvTrash"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_trash"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivTrash"
+            app:layout_constraintStart_toEndOf="@id/ivTrash"
+            app:layout_constraintTop_toTopOf="@id/ivTrash" />
+
         <ImageView
             android:id="@+id/ivCC"
             android:layout_width="24dp"
@@ -75,7 +95,7 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_people_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivArchive" />
+            app:layout_constraintTop_toBottomOf="@id/ivTrash" />
 
         <TextView
             android:id="@+id/tvCC"
@@ -128,6 +148,26 @@
             app:layout_constraintStart_toEndOf="@id/ivThread"
             app:layout_constraintTop_toTopOf="@id/ivThread" />
 
+        <ImageView
+            android:id="@+id/ivContacts"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_import_contacts_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivThread" />
+
+        <TextView
+            android:id="@+id/tvContacts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_contacts"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivContacts"
+            app:layout_constraintStart_toEndOf="@id/ivContacts"
+            app:layout_constraintTop_toTopOf="@id/ivContacts" />
+
         <ImageView
             android:id="@+id/ivSynchronize"
             android:layout_width="24dp"
@@ -135,19 +175,39 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_sync_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivThread" />
+            app:layout_constraintTop_toBottomOf="@id/ivContacts" />
 
         <TextView
             android:id="@+id/tvSynchronize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:text="@string/title_legend_synchronize"
+            android:text="@string/title_legend_synchronize_on"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintBottom_toBottomOf="@id/ivSynchronize"
             app:layout_constraintStart_toEndOf="@id/ivSynchronize"
             app:layout_constraintTop_toTopOf="@id/ivSynchronize" />
 
+        <ImageView
+            android:id="@+id/ivSynchronizeOff"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_sync_disabled_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivSynchronize" />
+
+        <TextView
+            android:id="@+id/tvSynchronizeOff"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_synchronize_off"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivSynchronizeOff"
+            app:layout_constraintStart_toEndOf="@id/ivSynchronizeOff"
+            app:layout_constraintTop_toTopOf="@id/ivSynchronizeOff" />
+
         <ImageView
             android:id="@+id/ivPrimary"
             android:layout_width="24dp"
@@ -155,7 +215,7 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_star_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSynchronize" />
+            app:layout_constraintTop_toBottomOf="@id/ivSynchronizeOff" />
 
         <TextView
             android:id="@+id/tvPrimary"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ba638d8..963c7c45 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -222,11 +222,14 @@
     <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_trash">Trash</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_contacts">Contacts</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>
     <string name="title_legend_disconnected">Disconnected</string>
     <string name="title_legend_connecting">Connecting</string>
     <string name="title_legend_connected">Connected</string>