From bf608284b4f274d1a8023418a3ae28407d32baf2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:13:22 +0200
Subject: [PATCH] Cleanup

---
 .../drawable/baseline_folder_shared_24.xml    | 10 --------
 .../res/layout/fragment_legend_folders.xml    | 24 +------------------
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 app/src/main/res/drawable/baseline_folder_shared_24.xml

diff --git a/app/src/main/res/drawable/baseline_folder_shared_24.xml b/app/src/main/res/drawable/baseline_folder_shared_24.xml
deleted file mode 100644
index f1bfc7b7cf..0000000000
--- a/app/src/main/res/drawable/baseline_folder_shared_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM15,9c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM19,17h-8v-1c0,-1.33 2.67,-2 4,-2s4,0.67 4,2v1z"/>
-</vector>
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index ce4a495a1e..febb5de6bf 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -39,28 +39,6 @@
                 app:layout_constraintStart_toEndOf="@id/ivType"
                 app:layout_constraintTop_toTopOf="@id/ivType" />
 
-            <ImageView
-                android:id="@+id/ivShared"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/title_legend_shared"
-                android:padding="12dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ivType"
-                app:srcCompat="@drawable/baseline_folder_shared_24" />
-
-            <TextView
-                android:id="@+id/tvShared"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:gravity="center_vertical"
-                android:text="@string/title_legend_shared"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintBottom_toBottomOf="@id/ivShared"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/ivShared"
-                app:layout_constraintTop_toTopOf="@id/ivShared" />
-
             <ImageView
                 android:id="@+id/ivInbox"
                 android:layout_width="wrap_content"
@@ -68,7 +46,7 @@
                 android:contentDescription="@string/title_legend_inbox"
                 android:padding="12dp"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ivShared"
+                app:layout_constraintTop_toBottomOf="@id/ivType"
                 app:srcCompat="@drawable/baseline_inbox_24" />
 
             <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd2c713b22..8194c3e312 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -650,7 +650,6 @@
     <string name="title_legend_waiting">Waiting for next synchronization</string>
 
     <string name="title_legend_unified">Unified inbox / primary account</string>
-    <string name="title_legend_shared">Unified folder</string>
     <string name="title_legend_inbox">Inbox</string>
     <string name="title_legend_drafts">Drafts</string>
     <string name="title_legend_sent">Sent</string>