From 9be4efe58f24c682aa3ac58ae0c5b7e3ecbc7893 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Tue, 6 Nov 2012 16:18:00 -0500
Subject: [PATCH] Get the Folder list to use the new common icons

---
 res/layout/folder_list_item.xml          | 54 +-----------------------
 src/com/fsck/k9/activity/FolderList.java | 30 ++++++++-----
 2 files changed, 21 insertions(+), 63 deletions(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 1ac616a86..1050de2a9 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -49,57 +49,5 @@
 
     </LinearLayout>
 
-    <RelativeLayout
-        android:id="@+id/active_icons"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal"
-        android:paddingTop="2dip"
-        android:paddingBottom="0dip"
-        android:paddingLeft="6dip"
-        android:paddingRight="6dip"
-        android:gravity="right"
-        android:clickable="true" >
-       <TextView
-            android:id="@+id/folder_flagged_message_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_alignParentTop="true"
-            android:layout_marginBottom="1dip"
-            android:paddingTop="6dip"
-            android:paddingBottom="4dip"
-            android:paddingLeft="10dip"
-            android:paddingRight="10dip"
-            android:gravity="right"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#000000"
-            android:background="@drawable/btn_star_big_buttonless_on"
-            android:clickable="true" />
-        <TextView
-            android:id="@+id/folder_unread_message_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top" 
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@id/folder_flagged_message_count"
-            android:paddingTop="4dip"
-            android:paddingBottom="4dip"
-            android:paddingLeft="10dip"
-            android:paddingRight="10dip"
-            android:gravity="right"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textStyle="bold"
-            android:background="@drawable/envelope"
-            android:clickable="true" />
-
-        
-
-    </RelativeLayout>
-
+    <include layout="@layout/accounts_folders_icons" />
 </LinearLayout>
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index fa2deb5c9..2e761c8a0 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1064,8 +1064,13 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             if (holder == null) {
                 holder = new FolderViewHolder();
                 holder.folderName = (TextView) view.findViewById(R.id.folder_name);
-                holder.newMessageCount = (TextView) view.findViewById(R.id.folder_unread_message_count);
-                holder.flaggedMessageCount = (TextView) view.findViewById(R.id.folder_flagged_message_count);
+                holder.newMessageCount = (TextView) view.findViewById(R.id.new_message_count);
+                holder.flaggedMessageCount = (TextView) view.findViewById(R.id.flagged_message_count);
+                holder.newMessageCountWrapper = (View) view.findViewById(R.id.new_message_count_wrapper);
+                holder.flaggedMessageCountWrapper = (View) view.findViewById(R.id.flagged_message_count_wrapper);
+                holder.newMessageCountIcon = (View) view.findViewById(R.id.new_message_count_icon);
+                holder.flaggedMessageCountIcon = (View) view.findViewById(R.id.flagged_message_count_icon);
+
                 holder.folderStatus = (TextView) view.findViewById(R.id.folder_status);
                 holder.activeIcons = (RelativeLayout) view.findViewById(R.id.active_icons);
                 holder.chip = view.findViewById(R.id.chip);
@@ -1108,19 +1113,21 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             if (folder.unreadMessageCount != 0) {
                 holder.newMessageCount.setText(Integer
                                                .toString(folder.unreadMessageCount));
-                holder.newMessageCount.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.UNREAD));
-                holder.newMessageCount.setVisibility(View.VISIBLE);
+                holder.newMessageCountWrapper.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.UNREAD));
+                holder.newMessageCountWrapper.setVisibility(View.VISIBLE);
+                holder.newMessageCountIcon.setBackgroundDrawable( mAccount.generateColorChip(false, false, false, false, false).drawable() );
             } else {
-                holder.newMessageCount.setVisibility(View.GONE);
+                holder.newMessageCountWrapper.setVisibility(View.GONE);
             }
 
             if (folder.flaggedMessageCount > 0) {
                 holder.flaggedMessageCount.setText(Integer
                                                    .toString(folder.flaggedMessageCount));
-                holder.flaggedMessageCount.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.FLAGGED));
-                holder.flaggedMessageCount.setVisibility(View.VISIBLE);
+                holder.flaggedMessageCountWrapper.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.FLAGGED));
+                holder.flaggedMessageCountWrapper.setVisibility(View.VISIBLE);
+                holder.flaggedMessageCountIcon.setBackgroundDrawable( mAccount.generateColorChip(false, false, false, false,true).drawable() );
             } else {
-                holder.flaggedMessageCount.setVisibility(View.GONE);
+                holder.flaggedMessageCountWrapper.setVisibility(View.GONE);
             }
 
             holder.activeIcons.setOnClickListener(new OnClickListener() {
@@ -1131,8 +1138,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             }
                                                  );
 
-            holder.chip.setBackgroundDrawable(mAccount.generateColorChip().drawable());
-            holder.chip.getBackground().setAlpha(folder.unreadMessageCount == 0 ? 127 : 255);
+            holder.chip.setBackgroundDrawable(mAccount.generateColorChip((folder.unreadMessageCount == 0 ? true : false ), false, false, false,false).drawable());
 
             holder.folderName.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderName());
             holder.folderStatus.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderStatus());
@@ -1236,6 +1242,10 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
 
         public TextView newMessageCount;
         public TextView flaggedMessageCount;
+        public View newMessageCountIcon;
+        public View flaggedMessageCountIcon;
+        public View newMessageCountWrapper;
+        public View flaggedMessageCountWrapper;
 
         public RelativeLayout activeIcons;
         public String rawFolderName;