From e75e41643bfddce2dd6338d90b2a0dddf00eab00 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 7 Jul 2010 04:33:07 -0700
Subject: [PATCH] Fixed disappearing filter text

---
 .../astrid/filters/ExtendedFilterExposer.java    |   2 +-
 .../todoroo/astrid/tags/TagFilterExposer.java    |   2 --
 astrid/res/drawable/tango_clouds.png             | Bin 0 -> 1165 bytes
 astrid/res/layout/filter_list_activity.xml       |   6 +++---
 .../todoroo/astrid/adapter/FilterAdapter.java    |  11 +++++++----
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 astrid/res/drawable/tango_clouds.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java
index 10f295d11..74aacbb69 100644
--- a/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java
@@ -64,7 +64,7 @@ public final class ExtendedFilterExposer extends BroadcastReceiver {
                         Criterion.not(TaskCriteria.isVisible(DateUtilities.now())))).
                         orderBy(Order.asc(Task.HIDE_UNTIL)),
                         hiddenValues);
-        hidden.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_calendar)).getBitmap();
+        hidden.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_clouds)).getBitmap();
 
         Filter deleted = new Filter(ExtendedPlugin.IDENTIFIER,
                 "Deleted Tasks",
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index 080719b34..ca0a96c24 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -9,7 +9,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
-import android.util.Log;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.sql.QueryTemplate;
@@ -83,7 +82,6 @@ public class TagFilterExposer extends BroadcastReceiver {
                 "Untagged",
                 tagService.untaggedTemplate(),
                 null);
-        Log.e("sdlfk", untagged.sqlQuery);
         untagged.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_untagged)).getBitmap();
         FilterCategory tagsCategoryBySize = new FilterCategory(TagsPlugin.IDENTIFIER,
                 context.getString(R.string.tag_FEx_by_size), filtersBySize);
diff --git a/astrid/res/drawable/tango_clouds.png b/astrid/res/drawable/tango_clouds.png
new file mode 100644
index 0000000000000000000000000000000000000000..79d7bc250afc03969ebb2a1ad1c5c37689613351
GIT binary patch
literal 1165
zcmV;81akX{P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&UR~E+V4D)_?#203CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00Z$!L_t(I%f*%7Z&XDT
z$3JuDZntjtM-fz7=nG{jwgp3f&_K)r0)jCyF~;~tVhRt&H&P1;zHYKzN%Vz~m>B*9
z!Nd@rR7j){)R3SOnwG90u=I!B?cLtFckaF8Lw`sM#`<79FO$ri^UawvpK}KOZwt=n
z2rlGS?Qi{C&*00|iHl`fEd<$bU#3vZw@4|^7-RMV2qC@=!|+4fw(kW&0Kmz?Q%}YH
zt?=oQLjW6NvDmHLt9#N-%^QU0DN3dB@P{97IAIue#$vJi#u$PiU|{Pd2zj<}p_s1+
zK9Eu#2TT-2)z|hNXwPoW3RfwVa#60!*xk|S=U;C9DzGvLVWKEJ?biIyKkoWQ*>8Qf
ztQ7Xb+W*S-9Yb9^x?-+!86LiBnwpw~)*1mA13J(&G$gH#j_vI|T|L58F4wPL`(*6y
zm?ku5pZO$G$`jpP-7(9uz(99bw@9Zl^W_NwjES&qn|NIvJA3=YqF;7%w$8TY!0C}g
z6pH!f85fHAL=;77r&gmOk)UzS8f@D}`#xH0eC;Ep&HDAtq>^a@t<hTJDwj&Nf{CKE
zn$z`(WL&K*#j(zg?a5R!Nh+1Xbrk}LOoXrJ#b0{yd8)Hju3Wjy<B2jDXl!g`!^RfY
zu3Oh=qR0KmTQ8m&d{S6S`B86AuLSTs58w9)0w3QG@O>Zc`%Fzu^Yz8A*wwe2J$v@z
zc^>1Xac<uHiH`Pd_Vm>B3F@pf!G#<cz|3c?m8ZZ!rBWe`LR{rie)NcukvkYbS{A$d
zc9YF+!Bq;&(loDc!c#7HMs8y;&7a;rTnfXm0Gu1hUQ%-ZfqkCiIIky@NjX=mQLR=e
zmBx{l&4K*~*|cdBlamv4c5XumfiVWH1C(+Jf{4U(3EnvTrnM#8mT?^CV5Krs&K*5>
z!v@aX9UqgW-^NcwQPct;Ey<B1?_&vpK+xN>lXNPB=cyHx#OUbT#X@J&*0#0o{_pn&
zfU`@TS19I*$K!aOmk^fq;N5rL%QPes#Ov#qC~;jE<tZ#nl1`_oInMl<*3{-|l*^B}
zc71r#7}K&egia2g!uNfEW1a2WlBr~pOeTYg%u|#!W-?$5VH7e`nV~vcrRF#w1nbtm
zkOBJbC)qQ`@GMI70=tWpDCME`{0(MjXYqY+5iwd@TVvCIObsp@n*-TPEK=gSE)x?I
z%v5G5mmlJ)xuu4A@bEs>*$R&Hm*~o=X|LP~!*FQ$>i3_uZGAbeeIMn`H<atnA?+Ai
z`)D07SF3>#%Rhr4V03KM55sUstQ0O3^Ksy)Wm!v<tk$HI_rfq70=`&PK%tl?xR4__
fpZiC@|J?or-5Vcb>=S2d00000NkvXXu0mjfx0Ek@

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index 55d99b19f..dae02138c 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -2,21 +2,21 @@
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:background="@drawable/background_gradient">
+    android:layout_height="fill_parent">
 
     <!-- Loading Filters label -->
     <TextView android:id="@android:id/empty"
         android:layout_width="fill_parent" 
         android:layout_height="fill_parent"
         android:text="@string/FLA_loading"
+        android:background="@drawable/background_gradient"
         style="@style/TextAppearance.TLA_NoItems"/>
 
     <!-- List -->
     <ExpandableListView android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:background="@null"
+        android:background="@drawable/background_gradient"
         android:scrollbars="vertical"
         />
     
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 3fa5409e0..583ca032c 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -122,10 +122,10 @@ public class FilterAdapter extends BaseExpandableListAdapter {
             image.setImageResource(R.drawable.expander_ic_maximized);
         else
             image.setImageResource(R.drawable.expander_ic_minimized);
-        FrameLayout.LayoutParams llp = new FrameLayout.LayoutParams(
+        FrameLayout.LayoutParams expansionImageLayout = new FrameLayout.LayoutParams(
                 32, 32);
-        llp.gravity = Gravity.CENTER_VERTICAL;
-        image.setLayoutParams(llp);
+        expansionImageLayout.gravity = Gravity.CENTER_VERTICAL;
+        image.setLayoutParams(expansionImageLayout);
         image.setScaleType(ScaleType.FIT_CENTER);
         layout.addView(image);
 
@@ -136,7 +136,10 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
         View view = augmentView(textView, filter);
         view.setPadding(60, 2, 0, 2);
-        view.setLayoutParams(llp);
+        FrameLayout.LayoutParams rowLayout = new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        rowLayout.gravity = Gravity.CENTER_VERTICAL;
+        view.setLayoutParams(rowLayout);
 
         layout.addView(view);