From 7dd42155f6b4f2c1e9fa45916cb1cccf456d6c1a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 20 Oct 2019 09:22:08 +0200
Subject: [PATCH] Cleanup

---
 .../eu/faircode/email/AdapterMessage.java     | 10 -------
 .../res/layout/include_message_addresses.xml  | 29 ++-----------------
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 62237c3142..6a27cfd332 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -295,7 +295,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvIdentityTitle;
         private TextView tvTimeExTitle;
         private TextView tvSizeExTitle;
-        private TextView tvFolderExTitle;
 
         private TextView tvFromEx;
         private TextView tvTo;
@@ -305,7 +304,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvIdentity;
         private TextView tvTimeEx;
         private TextView tvSizeEx;
-        private TextView tvFolderEx;
 
         private TextView tvSubjectEx;
         private TextView tvFlags;
@@ -437,7 +435,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvIdentityTitle = vsBody.findViewById(R.id.tvIdentityTitle);
             tvTimeExTitle = vsBody.findViewById(R.id.tvTimeExTitle);
             tvSizeExTitle = vsBody.findViewById(R.id.tvSizeExTitle);
-            tvFolderExTitle = vsBody.findViewById(R.id.tvFolderExTitle);
 
             tvFromEx = vsBody.findViewById(R.id.tvFromEx);
             tvTo = vsBody.findViewById(R.id.tvTo);
@@ -448,7 +445,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvTimeEx = vsBody.findViewById(R.id.tvTimeEx);
             tvSizeEx = vsBody.findViewById(R.id.tvSizeEx);
 
-            tvFolderEx = vsBody.findViewById(R.id.tvFolderEx);
             tvSubjectEx = vsBody.findViewById(R.id.tvSubjectEx);
             tvFlags = vsBody.findViewById(R.id.tvFlags);
             tvKeywords = vsBody.findViewById(R.id.tvKeywords);
@@ -947,7 +943,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvIdentityTitle.setVisibility(View.GONE);
             tvTimeExTitle.setVisibility(View.GONE);
             tvSizeExTitle.setVisibility(View.GONE);
-            tvFolderExTitle.setVisibility(View.GONE);
 
             tvFromEx.setVisibility(View.GONE);
             tvTo.setVisibility(View.GONE);
@@ -957,7 +952,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvIdentity.setVisibility(View.GONE);
             tvTimeEx.setVisibility(View.GONE);
             tvSizeEx.setVisibility(View.GONE);
-            tvFolderEx.setVisibility(View.GONE);
             tvSubjectEx.setVisibility(View.GONE);
             tvFlags.setVisibility(View.GONE);
             tvKeywords.setVisibility(View.GONE);
@@ -1133,10 +1127,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     .append(message.total == null ? "-" : Helper.humanReadableByteCount(message.total, true));
             tvSizeEx.setText(size.toString());
 
-            tvFolderExTitle.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
-            tvFolderEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
-            tvFolderEx.setText(tvFolder.getText());
-
             tvSubjectEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
             tvSubjectEx.setText(message.subject);
             if (subject_italic)
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index 34cea9e423..c3fd86abe4 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -290,30 +290,6 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
 
-    <TextView
-        android:id="@+id/tvFolderExTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:text="@string/title_folder"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
-
-    <TextView
-        android:id="@+id/tvFolderEx"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:text="Folder"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textIsSelectable="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
-        app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
-
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/barrier_addresses"
         android:layout_width="wrap_content"
@@ -323,8 +299,7 @@
             tvFromExTitle,tvToTitle,tvReplyToTitle,
             tvCcTitle,tvBccTitle,
             tvIdentityTitle,
-            tvTimeExTitle,tvSizeExTitle,
-            tvFolderExTitle" />
+            tvTimeExTitle,tvSizeExTitle" />
 
     <TextView
         android:id="@+id/tvSubjectEx"
@@ -337,7 +312,7 @@
         android:textIsSelectable="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvFolderEx" />
+        app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
 
     <TextView
         android:id="@+id/tvFlags"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 00ca9970a7..7f8d3ba2ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -607,7 +607,6 @@
     <string name="title_via_identity">Via:</string>
     <string name="title_received">Received:</string>
     <string name="title_size">Size:</string>
-    <string name="title_folder">Folder:</string>
     <string name="title_subject">Subject:</string>
     <string name="title_body_hint">Your message</string>
     <string name="title_discard">Discard</string>