From 446cda8618888bb8a021619ad6ea8f6e6356175f Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Tue, 6 Nov 2012 16:02:08 -0500
Subject: [PATCH] Clean up the icons in account list

---
 res/layout/accounts_item.xml           | 64 ++++++++++++++++----------
 src/com/fsck/k9/activity/Accounts.java | 31 +++++++++----
 2 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index 7c983c99c..68c9761c9 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -80,44 +80,60 @@
         android:layout_alignParentRight="true"
         android:clickable="true" >
 
-        <TextView
-            android:id="@+id/flagged_message_count"
+        <LinearLayout
+            android:id="@+id/flagged_message_count_wrapper"
+            android:orientation="horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true" 
-            android:layout_gravity="top"
-            
+            android:clickable="true"
+            android:gravity="center_vertical"
             android:paddingTop="6dip"
             android:paddingBottom="4dip"
             android:paddingLeft="10dip"
             android:paddingRight="10dip"
+        >
+        <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:layout_gravity="center_vertical"
             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" />
-
+            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:clickable="true"
+            android:gravity="center_vertical"
+            android:paddingTop="6dip"
+            android:paddingBottom="4dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+        >
+        <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:layout_gravity="top" 
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@id/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" />
-        
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            />
+        </LinearLayout>
 
     </RelativeLayout>
 
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index f45fe52e5..131d8fb6a 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -1644,6 +1644,10 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                 holder.email = (TextView) view.findViewById(R.id.email);
                 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.activeIcons = (RelativeLayout) view.findViewById(R.id.active_icons);
 
                 holder.chip = view.findViewById(R.id.chip);
@@ -1677,13 +1681,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
             if (stats != null) {
                 unreadMessageCount = stats.unreadMessageCount;
                 holder.newMessageCount.setText(Integer.toString(unreadMessageCount));
-                holder.newMessageCount.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
+                holder.newMessageCountWrapper.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
 
                 holder.flaggedMessageCount.setText(Integer.toString(stats.flaggedMessageCount));
-                holder.flaggedMessageCount.setVisibility(stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
+                holder.flaggedMessageCountWrapper.setVisibility(stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
 
-                holder.flaggedMessageCount.setOnClickListener(new AccountClickListener(account, SearchModifier.FLAGGED));
-                holder.newMessageCount.setOnClickListener(new AccountClickListener(account, SearchModifier.UNREAD));
+                holder.flaggedMessageCountWrapper.setOnClickListener(new AccountClickListener(account, SearchModifier.FLAGGED));
+                holder.newMessageCountWrapper.setOnClickListener(new AccountClickListener(account, SearchModifier.UNREAD));
 
                 view.getBackground().setAlpha(stats.available ? 0 : 127);
 
@@ -1696,8 +1700,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                                                      );
 
             } else {
-                holder.newMessageCount.setVisibility(View.GONE);
-                holder.flaggedMessageCount.setVisibility(View.GONE);
+                holder.newMessageCountWrapper.setVisibility(View.GONE);
+                holder.flaggedMessageCountWrapper.setVisibility(View.GONE);
                 view.getBackground().setAlpha(0);
             }
             if (account instanceof Account) {
@@ -1705,15 +1709,20 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
 
                 holder.chip.setBackgroundDrawable(realAccount.generateColorChip().drawable());
                 if (unreadMessageCount == null) {
-                    holder.chip.getBackground().setAlpha(0);
+                    holder.chip.setBackgroundDrawable(realAccount.generateColorChip().drawable());
                 } else if (unreadMessageCount == 0) {
-                    holder.chip.getBackground().setAlpha(127);
+                    holder.chip.setBackgroundDrawable(realAccount.generateColorChip(true, false, false, false, false).drawable());
                 } else {
-                    holder.chip.getBackground().setAlpha(255);
+                    holder.chip.setBackgroundDrawable(realAccount.generateColorChip(false, false, false, false, false).drawable());
                 }
 
+                holder.flaggedMessageCountIcon.setBackgroundDrawable( realAccount.generateColorChip(false, false, false, false,true).drawable() );
+                holder.newMessageCountIcon.setBackgroundDrawable( realAccount.generateColorChip(false, false, false, false, false).drawable() );
+
             } else {
                 holder.chip.setBackgroundDrawable(new ColorChip(0xff999999, false, ColorChip.CIRCULAR).drawable());
+                holder.newMessageCountIcon.setBackgroundDrawable( new ColorChip(0xff999999, false, ColorChip.CIRCULAR).drawable() );
+                holder.flaggedMessageCountIcon.setBackgroundDrawable(new ColorChip(0xff999999, false, ColorChip.STAR).drawable());
             }
 
 
@@ -1740,6 +1749,10 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
             public TextView email;
             public TextView newMessageCount;
             public TextView flaggedMessageCount;
+            public View newMessageCountIcon;
+            public View flaggedMessageCountIcon;
+            public View newMessageCountWrapper;
+            public View flaggedMessageCountWrapper;
             public RelativeLayout activeIcons;
             public View chip;
             public ImageButton folders;