From f5c5cfa3540866aa3c3e2fafdac39df3a9da75de Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 20 Jan 2012 12:20:08 -0800
Subject: [PATCH] Updated style of new list button in FLA

---
 astrid/res/color/new_list_button_text.xml     |  7 +++++
 .../res/layout-land/filter_list_activity.xml  | 24 +++++++++--------
 .../filter_list_activity.xml                  | 26 +++++++++----------
 .../res/layout-large/filter_list_activity.xml | 26 +++++++++----------
 astrid/res/layout/filter_list_activity.xml    | 16 +++++++-----
 astrid/res/values/styles.xml                  |  7 +++++
 .../astrid/activity/FilterListActivity.java   |  3 +--
 7 files changed, 63 insertions(+), 46 deletions(-)
 create mode 100644 astrid/res/color/new_list_button_text.xml

diff --git a/astrid/res/color/new_list_button_text.xml b/astrid/res/color/new_list_button_text.xml
new file mode 100644
index 000000000..3b961915e
--- /dev/null
+++ b/astrid/res/color/new_list_button_text.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+        <item android:state_pressed="true"
+              android:color="#444"/>
+        <item android:state_pressed="false"
+              android:color="#888"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/res/layout-land/filter_list_activity.xml
index 08aa2bd49..31c791355 100644
--- a/astrid/res/layout-land/filter_list_activity.xml
+++ b/astrid/res/layout-land/filter_list_activity.xml
@@ -21,19 +21,21 @@
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
-        android:padding="5dip"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:layout_alignParentBottom="true">
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/FLA_Separator"/>
         
-        <Button
-		    android:id="@+id/new_list_button"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:background="@drawable/footer_editbutton"
-		    android:gravity="center"
-		    android:text="@string/FLA_new_list"
-		    android:textStyle="bold"
-		    style="@style/TextAppearance.TEA_action"/>
+        <TextView
+            android:id="@+id/new_list_button"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:padding="10dip"
+            android:gravity="left|center_vertical"
+            android:text="@string/FLA_new_list"
+            style="@style/TextAppearance.FLA_Button"/>
         
     </LinearLayout>
         
diff --git a/astrid/res/layout-large-land/filter_list_activity.xml b/astrid/res/layout-large-land/filter_list_activity.xml
index 9e2d6a58d..cb20f91ad 100644
--- a/astrid/res/layout-large-land/filter_list_activity.xml
+++ b/astrid/res/layout-large-land/filter_list_activity.xml
@@ -10,21 +10,21 @@
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
-        android:layout_weight="1"
-        android:padding="5dip"
-        android:orientation="horizontal"
-        android:background="@android:color/transparent"
+        android:orientation="vertical"
         android:layout_alignParentBottom="true">
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/FLA_Separator"/>
         
-        <Button
-		    android:id="@+id/new_list_button"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:background="@drawable/footer_editbutton"
-		    android:gravity="center"
-		    android:text="@string/FLA_new_list"
-		    android:textStyle="bold"
-		    style="@style/TextAppearance.TEA_action"/>
+        <TextView
+            android:id="@+id/new_list_button"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:padding="10dip"
+            android:gravity="left|center_vertical"
+            android:text="@string/FLA_new_list"
+            style="@style/TextAppearance.FLA_Button"/>
         
     </LinearLayout>
         
diff --git a/astrid/res/layout-large/filter_list_activity.xml b/astrid/res/layout-large/filter_list_activity.xml
index 7ae60813b..750489119 100644
--- a/astrid/res/layout-large/filter_list_activity.xml
+++ b/astrid/res/layout-large/filter_list_activity.xml
@@ -10,21 +10,21 @@
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
-        android:layout_weight="1"
-        android:padding="5dip"
-        android:orientation="horizontal"
-        android:background="@android:color/transparent"
+        android:orientation="vertical"
         android:layout_alignParentBottom="true">
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/FLA_Separator"/>
         
-        <Button
-		    android:id="@+id/new_list_button"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:background="@drawable/footer_editbutton"
-		    android:gravity="center"
-		    android:text="@string/FLA_new_list"
-		    android:textStyle="bold"
-		    style="@style/TextAppearance.TEA_action"/>
+        <TextView
+            android:id="@+id/new_list_button"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:padding="10dip"
+            android:gravity="left|center_vertical"
+            android:text="@string/FLA_new_list"
+            style="@style/TextAppearance.FLA_Button"/>
         
     </LinearLayout>
         
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index c7f793dab..d7cc27794 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -21,19 +21,21 @@
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
-        android:padding="5dip"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:layout_alignParentBottom="true">
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/FLA_Separator"/>
         
-        <Button
+        <TextView
 		    android:id="@+id/new_list_button"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
-		    android:background="@drawable/footer_editbutton"
-		    android:gravity="center"
+            android:padding="10dip"
+		    android:gravity="left|center_vertical"
 		    android:text="@string/FLA_new_list"
-		    android:textStyle="bold"
-		    style="@style/TextAppearance.TEA_action"/>
+		    style="@style/TextAppearance.FLA_Button"/>
         
     </LinearLayout>
         
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index cbcb5942d..53f2e15cf 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -126,6 +126,9 @@
         <item name="android:background">?attr/asSeparatorBackground</item>
     </style>
     
+    <style name="FLA_Separator" parent="TEA_Separator">
+    </style>
+    
     <style name="TextAppearance" parent="android:TextAppearance">
         <item name="android:textColor">?attr/asTextColor</item>    
     </style>
@@ -273,6 +276,10 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
     
+    <style name="TextAppearance.FLA_Button" parent="TextAppearance.FLA_Filter">
+        <item name="android:textColor">@color/new_list_button_text</item>
+    </style>
+    
     <style name="TextAppearance.FLA_Header" parent="TextAppearance.FLA_Filter">
         <item name="android:textColor">?attr/asFilterHeaderColor</item>
     </style>
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 744a40b25..67857a9be 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -33,7 +33,6 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ListView;
@@ -161,7 +160,7 @@ public class FilterListActivity extends ListFragment {
 
         getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL);
         //ImageView backButton = (ImageView) getView().findViewById(R.id.back);
-        Button newListButton = (Button) getView().findViewById(R.id.new_list_button);
+        View newListButton = getView().findViewById(R.id.new_list_button);
 
 //        backButton.setOnClickListener(new OnClickListener() {
 //            @Override