From 083b1c1066bac10108069b68402923417db9808f Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 9 May 2020 18:05:27 +0200
Subject: [PATCH] Remove unused views from accounts_item layout

---
 .../com/fsck/k9/activity/AccountList.java     |  2 -
 .../res/layout/accounts_folders_icons.xml     | 66 -------------------
 app/ui/src/main/res/layout/accounts_item.xml  | 32 ---------
 3 files changed, 100 deletions(-)
 delete mode 100644 app/ui/src/main/res/layout/accounts_folders_icons.xml

diff --git a/app/ui/src/main/java/com/fsck/k9/activity/AccountList.java b/app/ui/src/main/java/com/fsck/k9/activity/AccountList.java
index 0b9c31669..0972e50e8 100644
--- a/app/ui/src/main/java/com/fsck/k9/activity/AccountList.java
+++ b/app/ui/src/main/java/com/fsck/k9/activity/AccountList.java
@@ -111,8 +111,6 @@ public abstract class AccountList extends K9ListActivity implements OnItemClickL
                 view = convertView;
             } else {
                 view = getLayoutInflater().inflate(R.layout.accounts_item, parent, false);
-                view.findViewById(R.id.active_icons).setVisibility(View.GONE);
-                view.findViewById(R.id.folders).setVisibility(View.GONE);
             }
 
             AccountViewHolder holder = (AccountViewHolder) view.getTag();
diff --git a/app/ui/src/main/res/layout/accounts_folders_icons.xml b/app/ui/src/main/res/layout/accounts_folders_icons.xml
deleted file mode 100644
index bd98c6207..000000000
--- a/app/ui/src/main/res/layout/accounts_folders_icons.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/active_icons"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"
-    android:clickable="true"
-    android:focusable="true">
-
-    <LinearLayout
-        android:id="@+id/flagged_message_count_wrapper"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:clickable="true"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:focusable="true">
-
-        <View
-            android:id="@+id/flagged_message_count_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp" />
-
-        <TextView
-            android:id="@+id/flagged_message_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/new_message_count_wrapper"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/flagged_message_count_wrapper"
-        android:gravity="center_vertical"
-        android:clickable="true"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:focusable="true">
-
-        <View
-            android:id="@+id/new_message_count_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"/>
-
-        <TextView
-            android:id="@+id/new_message_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/app/ui/src/main/res/layout/accounts_item.xml b/app/ui/src/main/res/layout/accounts_item.xml
index fc45e6f2f..0a216c1a7 100644
--- a/app/ui/src/main/res/layout/accounts_item.xml
+++ b/app/ui/src/main/res/layout/accounts_item.xml
@@ -2,7 +2,6 @@
 <LinearLayout
         android:id="@+id/accounts_item_layout"
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
@@ -47,35 +46,4 @@
 
     </LinearLayout>
 
-    <include layout="@layout/accounts_folders_icons"/>
-
-    <LinearLayout
-            android:id="@+id/folder_button_wrapper"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-
-        <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dip"
-                android:layout_marginRight="4dip"
-                android:background="?android:attr/dividerVertical" />
-
-        <ImageButton
-                android:id="@+id/folders"
-                android:gravity="center_vertical"
-                android:focusable="false"
-                android:layout_marginRight="3dip"
-                app:srcCompat="?attr/iconFolder"
-                android:background="?selectableItemBackground"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:padding="8dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                />
-
-    </LinearLayout>
 </LinearLayout>