Applied white stile to filters page, minor style tweaks

astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java

@@ -177,7 +177,6 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
         };
         adapter.filterStyle = R.style.TextAppearance_LEA_Filter;
         adapter.headerStyle = R.style.TextAppearance_LEA_Header;
-        adapter.categoryStyle = R.style.TextAppearance_LEA_Category;
         setListAdapter(adapter);
 
         // check for plugin

astrid/res/drawable/filter_count.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <solid
-    android:color="#ff282828" />
+    android:color="#aa282828" />
   <corners
     android:bottomRightRadius="4dp"
     android:bottomLeftRadius="4dp"

astrid/res/layout/filter_adapter_row.xml

@@ -77,6 +77,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="55dp"
         android:layout_marginTop="29dp"
+        style="@style/TextAppearance.TAd_ItemDetails"
         android:paddingRight="30dp"
         android:gravity="center_vertical"
         android:visibility="gone"/>

astrid/res/layout/filter_list_activity.xml

@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
-    android:background="@drawable/background_gradient"
+    style="@style/Content"
     android:orientation="vertical">
 
     <!-- Header -->
@@ -12,7 +12,7 @@
         android:layout_height="43dip"
         android:layout_weight="1"
         android:orientation="horizontal"
-        android:background="@drawable/header_background">
+        style="@style/Header">
     
         <!-- Filters Button -->
         <ImageView android:id="@+id/back"

astrid/res/values/attrs.xml

@@ -9,6 +9,8 @@
   <attr name="asDueDateColor" format="color"/>
   <attr name="asDueDateOverdueColor" format="color"/>
   <attr name="asDueDateCompletedColor" format="color"/>
+  <attr name="asFilterHeaderColor" format="color"/>
+  <attr name="asFilterHeaderBackground" format="reference"/>
 
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>

astrid/res/values/styles.xml

@@ -13,6 +13,8 @@
         <item name="asDueDateColor">#ff7777aa</item>
         <item name="asDueDateOverdueColor">#ffee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
+        <item name="asFilterHeaderColor">#ffcccccc</item>
+        <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
     </style>
     
     <style name="Theme.Transparent">
@@ -25,9 +27,11 @@
         <item name="asTextColor">#ff000000</item>
         <item name="asDetailsColor">#ff7777aa</item>
         <item name="asDueDateColor">#ff000000</item>
+        <item name="asFilterHeaderColor">#ffffff</item>
+        <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
     </style>
     
-    <!--================================================== Stuff == -->
+    <!--================================================== General == -->
 
     <style name="Content">
         <item name="android:background">?attr/asContentBackground</item>
@@ -35,6 +39,7 @@
     
     <style name="Header">
         <item name="android:background">?attr/asHeaderBackground</item>
+        <item name="android:textColor">?attr/asTextColor</item>    
     </style>
     
     <style name="TextAppearance" parent="android:TextAppearance">
@@ -71,6 +76,7 @@
     <style name="TextAppearance.TLA_Header">
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
+        <item name="android:textColor">#ffffff</item>        
     </style>
     
     <style name="TextAppearance.TLA_Reminder">
@@ -123,15 +129,11 @@
     <style name="TextAppearance.FLA_Filter">
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?attr/asTextColor</item>
     </style>
     
     <style name="TextAppearance.FLA_Header" parent="TextAppearance.FLA_Filter">
-        <item name="android:textColor">#ffcccccc</item>
-        <item name="android:textStyle"></item>
-    </style>
-    
-    <style name="TextAppearance.FLA_Category" parent="TextAppearance.FLA_Filter">
-        <item name="android:textColor">#ffdddddd</item>
+        <item name="android:textColor">?attr/asFilterHeaderColor</item>
         <item name="android:textStyle"></item>
     </style>
 

astrid/src/com/todoroo/astrid/activity/FilterListActivity.java

@@ -102,9 +102,9 @@ public class FilterListActivity extends ExpandableListActivity {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
         new StartupService().onStartupApplication(this);
+        ThemeService.applyTheme(this);
 
         setContentView(R.layout.filter_list_activity);
-        ThemeService.applyTheme(this);
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         findViewById(R.id.back).setOnClickListener(new OnClickListener() {

astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -16,7 +16,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.text.TextUtils;
@@ -51,7 +53,6 @@ public class FilterAdapter extends BaseExpandableListAdapter {
     // --- style constants
 
     public int filterStyle = R.style.TextAppearance_FLA_Filter;
-    public int categoryStyle = R.style.TextAppearance_FLA_Category;
     public int headerStyle = R.style.TextAppearance_FLA_Header;
 
     // --- instance variables
@@ -91,6 +92,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
     // if new filters are queued (obviously it cannot be garbage collected if it is possible for new filters to
     // be added).
     private final ThreadPoolExecutor filterExecutor = new ThreadPoolExecutor(0, 1, 1, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+    private final Drawable headerBackground;
 
     public FilterAdapter(Activity activity, ExpandableListView listView,
             int rowLayout, boolean skipIntentFilters) {
@@ -110,6 +112,9 @@ public class FilterAdapter extends BaseExpandableListAdapter {
         activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
         listView.setGroupIndicator(
                 activity.getResources().getDrawable(R.drawable.expander_group));
+
+        TypedArray a = activity.obtainStyledAttributes(new int[] { R.attr.asFilterHeaderBackground });
+        headerBackground = a.getDrawable(0);
     }
 
     private void offerFilter(final Filter filter) {
@@ -416,7 +421,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
         if(viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
             viewHolder.name.setTextAppearance(activity, headerStyle);
-            viewHolder.view.setBackgroundResource(R.drawable.edit_titlebar);
+            viewHolder.view.setBackgroundDrawable(headerBackground);
             viewHolder.view.setPadding((int) (7 * metrics.density), 5, 0, 5);
             viewHolder.view.getLayoutParams().height = (int) (40 * metrics.density);
         } else {
@@ -487,6 +492,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
         add.setTextColor(Color.WHITE);
         add.setShadowLayer(1, 1, 1, Color.BLACK);
         add.setText(filter.label);
+        add.setFocusable(false);
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
                 (int)(32 * metrics.density));
         lp.rightMargin = (int) (4 * metrics.density);