From 0c426c9c4bd660e8dbae38c3c0328229ba0b7b09 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Tue, 28 Dec 2010 09:11:10 +0000
Subject: [PATCH] Round our color chips, clean up color hcip rendering a bit

---
 res/layout/accounts_item.xml              |  4 ++-
 res/layout/folder_list_item.xml           |  2 ++
 res/layout/message_view_header.xml        |  2 ++
 src/com/fsck/k9/Account.java              |  6 ++++
 src/com/fsck/k9/activity/Accounts.java    |  5 +--
 src/com/fsck/k9/activity/ColorChip.java   | 39 +++++++++++++++++++++++
 src/com/fsck/k9/activity/FolderList.java  |  2 +-
 src/com/fsck/k9/activity/MessageList.java |  6 +++-
 src/com/fsck/k9/activity/MessageView.java |  2 +-
 9 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 src/com/fsck/k9/activity/ColorChip.java

diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index 0edc146da..5a968619b 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -14,6 +14,8 @@
         android:id="@+id/chip"
         android:layout_width="6dip"
         android:layout_height="fill_parent"
+        android:layout_marginTop="2dip"
+        android:layout_marginBottom="1dip"
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true" />
 
@@ -24,7 +26,7 @@
         android:layout_weight="1"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:paddingLeft="1dip" >
+        android:paddingLeft="6dip" >
 
         <ImageButton
             android:id="@+id/folders"
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index b452f8b03..78933c0a3 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -12,6 +12,8 @@
     <View
         android:id="@+id/chip"
         android:layout_width="6dip"
+        android:layout_marginTop="2dip"
+        android:layout_marginBottom="1dip"
         android:layout_height="fill_parent"
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true" />
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 5de6d8de4..40498d399 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -9,6 +9,8 @@
         >
         <View
             android:id="@+id/chip"
+            android:layout_marginTop="1dip"
+            android:layout_marginBottom="1dip"
             android:layout_width="6dip"
             android:layout_height="fill_parent" />
         <LinearLayout
diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index d839936f5..3e1c520cd 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -18,6 +18,7 @@ import com.fsck.k9.mail.store.LocalStore;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.mail.store.StorageManager.StorageProvider;
+import com.fsck.k9.view.ColorChip;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -691,6 +692,11 @@ public class Account implements BaseAccount
     }
 
 
+    public ColorChip generateColorChip() {
+        return new ColorChip( mChipColor);
+    }
+
+
     public String getUuid()
     {
         return mUuid;
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 4474cfad0..80b562012 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -27,6 +27,7 @@ import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.mail.Flag;
+import com.fsck.k9.view.ColorChip;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -1010,7 +1011,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             {
                 Account realAccount = (Account)account;
 
-                holder.chip.setBackgroundColor(realAccount.getChipColor());
+                holder.chip.setBackgroundDrawable(realAccount.generateColorChip().drawable());
                 if (unreadMessageCount == null)
                 {
                     holder.chip.getBackground().setAlpha(0);
@@ -1027,7 +1028,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             }
             else
             {
-                holder.chip.setBackgroundColor(0x00000000);
+                holder.chip.setBackgroundDrawable(new ColorChip(0xff999999).drawable());
             }
 
 
diff --git a/src/com/fsck/k9/activity/ColorChip.java b/src/com/fsck/k9/activity/ColorChip.java
new file mode 100644
index 000000000..0383e63d0
--- /dev/null
+++ b/src/com/fsck/k9/activity/ColorChip.java
@@ -0,0 +1,39 @@
+package com.fsck.k9.view;
+
+import android.graphics.Path;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.PathShape;
+
+public class ColorChip {
+    private static final Path CHIP_PATH = new Path();
+
+    static
+    {
+
+        CHIP_PATH.lineTo(6,0);
+
+        CHIP_PATH.cubicTo( 8f, 0f, 10f, 0f, 10f, 2f );
+        CHIP_PATH.lineTo(10, 8);
+        CHIP_PATH.cubicTo( 10f, 9f, 10f, 10f, 6f, 10f );
+        CHIP_PATH.lineTo(0,10);
+        CHIP_PATH.close();
+    }
+
+
+    private ShapeDrawable mDrawable;
+
+    public ColorChip(int color) {
+                    
+                mDrawable = new ShapeDrawable(new PathShape(CHIP_PATH, 10, 10));
+                mDrawable.getPaint().setColor(color);
+
+
+    }
+    
+    public ShapeDrawable drawable () {
+
+        return mDrawable;
+    }
+
+
+}
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index fcbd1f705..b082cbf27 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1417,7 +1417,7 @@ public class FolderList extends K9ListActivity
             }
                                                  );
 
-            holder.chip.setBackgroundColor(mAccount.getChipColor());
+            holder.chip.setBackgroundDrawable(mAccount.generateColorChip().drawable());
             holder.chip.getBackground().setAlpha(folder.unreadMessageCount == 0 ? 127 : 255);
 
             holder.folderName.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getFolderName());
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 07cdfed7c..13e73042d 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -74,6 +74,8 @@ import com.fsck.k9.mail.store.LocalStore;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.mail.store.LocalStore.LocalMessage;
+import com.fsck.k9.view.ColorChip;
+
 
 /**
  * MessageList is the primary user interface for the program. This Activity
@@ -2749,7 +2751,9 @@ public class MessageList
                 holder.selected.setVisibility(message.selected ? View.VISIBLE : View.GONE);
             }
 
-            holder.chip.setBackgroundColor(message.message.getFolder().getAccount().getChipColor());
+
+
+            holder.chip.setBackgroundDrawable(message.message.getFolder().getAccount().generateColorChip().drawable());
             holder.chip.getBackground().setAlpha(message.read ? 127 : 255);
             view.getBackground().setAlpha(message.downloaded ? 0 : 127);
 
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index ed48a1976..aee9655b0 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -478,7 +478,7 @@ public class MessageView extends K9Activity implements OnClickListener
                     mAttachmentIcon.setVisibility(((LocalMessage) message).hasAttachments() ? View.VISIBLE : View.GONE);
                     mFlagged.setChecked(message.isSet(Flag.FLAGGED));
                     mSubjectView.setTextColor(0xff000000 | defaultSubjectColor);
-                    chip.setBackgroundColor(mAccount.getChipColor());
+                    chip.setBackgroundDrawable(mAccount.generateColorChip().drawable());
                     chip.getBackground().setAlpha(!message.isSet(Flag.SEEN) ? 255 : 127);
                     if (message.isSet(Flag.ANSWERED))
                     {