From 30e239bde1a42f046b10a025f5dcf9639cce8b2c Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 27 Mar 2013 13:21:58 -0700
Subject: [PATCH] More custom filter activity polish

---
 .../com/todoroo/astrid/core/FilterView.java   |  8 +++----
 astrid/res/layout/custom_filter_activity.xml  | 21 ++++++++++++++++++-
 astrid/res/values/strings-filters.xml         |  4 +---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java b/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
index 51c44656e..4c5323ec5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
@@ -23,9 +23,9 @@ public class FilterView extends View {
 
     private int start = 0, end = 0, max = 1;
 
-    private static final int FILTER_COLOR = Color.rgb(85, 155, 255);
-    private static final int BG_COLOR = Color.CYAN;
-    private static final int TEXT_COLOR = Color.BLACK;
+    private static final int FILTER_COLOR = Color.rgb(0x1f, 0x78, 0xb4);
+    private static final int BG_COLOR = Color.rgb(0xe9, 0xe9, 0xe9);
+    private static final int TEXT_COLOR = Color.WHITE;
 
     // --- boilerplate
 
@@ -74,7 +74,7 @@ public class FilterView extends View {
         paint.setColor(TEXT_COLOR);
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setTextSize(16);
-        canvas.drawText(Integer.toString(end), getWidth() / 2, getHeight() / 2, paint);
+        canvas.drawText(Integer.toString(end), getWidth() / 2, getHeight() / 2 + 8, paint);
     }
 
 }
diff --git a/astrid/res/layout/custom_filter_activity.xml b/astrid/res/layout/custom_filter_activity.xml
index 462ed1d8f..f8639e3d4 100644
--- a/astrid/res/layout/custom_filter_activity.xml
+++ b/astrid/res/layout/custom_filter_activity.xml
@@ -14,11 +14,20 @@
     <EditText android:id="@+id/filterName"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
+        android:layout_marginTop="15dip"
+        android:layout_marginLeft="10dip"
+        android:layout_marginRight="10dip"
+        android:layout_marginBottom="15dip"
         android:layout_weight="1"
+        android:background="@null"
         android:hint="@string/CFA_filterName_hint"
         android:capitalize="sentences" />
     
+    <View 
+        android:layout_height="1px"
+        android:layout_width="fill_parent"
+        android:background="#e9e9e9"/>
+    
     <!-- List -->
     <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
         android:layout_width="fill_parent"
@@ -27,6 +36,16 @@
         android:scrollbars="vertical"
         android:cacheColorHint="#00000000"/>
     
+    <!-- help text -->
+    <TextView android:id="@+id/help"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:paddingLeft="5dip"
+        android:text="@string/CFA_help"
+        style="@style/TextAppearance"/>
+    
     <!-- buttons -->
     <LinearLayout
       android:orientation="horizontal"
diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml
index 7e888e8b8..25e57115e 100644
--- a/astrid/res/values/strings-filters.xml
+++ b/astrid/res/values/strings-filters.xml
@@ -57,9 +57,7 @@
     <string name="CFA_context_delete">Delete Row</string>
     
     <!-- slide 30b: Filter Screen Help Text -->
-    <string name="CFA_help">This screen lets you create a new filters. Add 
-    criteria using the button below, short or long-press them to adjust, and
-    then click \"View\"!</string>
+    <string name="CFA_help">Long press on items for additional options</string>
     
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Add Criteria</string>