From 861e7077f04a8b6e72198a2be1dd60c2fd173ad6 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 10 Feb 2012 12:22:42 -0800
Subject: [PATCH] Fixed crashes and theming issues with WidgetConfigActivity

---
 .../res/drawable/filter_selected_icon_black.png   | Bin 0 -> 892 bytes
 astrid/res/layout/filter_adapter_row.xml          |   2 +-
 astrid/res/layout/widget_config_activity.xml      |   2 +-
 astrid/res/values/attrs.xml                       |   1 +
 astrid/res/values/styles.xml                      |   6 ++++++
 .../astrid/widget/WidgetConfigActivity.java       |   3 +++
 6 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 astrid/res/drawable/filter_selected_icon_black.png

diff --git a/astrid/res/drawable/filter_selected_icon_black.png b/astrid/res/drawable/filter_selected_icon_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..4618874329baf505435c13585ee146fc721bc05c
GIT binary patch
literal 892
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQk(@Ik;M!Q+`=Ht$S`Y;1Oo$;
zTxLi_NrbPDRdRl=USdjqQmS4>ZUIm=1A|S46_A;mT9T+xk(-lOY*k^a1Xf`MWP^nD
zl@!2AO0sR0B76fBob!uP6-@L@^bC~jxD*r=Y>HCStb$zJpxS{vTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDh#@d@TvCgZi!uvJGV}8kK;|YU
z<(HP&Dk*_1f&+*<Q<CBK6qFX_fNe=h)=$kz%}vcKDb_dCGt`G04%BOtl5AC6nv|8A
zTmp7C+&HiYoD$RZk%VpZF;&~>gIt8<LYR860Z8J6Tn-FxxYP5Bq45EX8U2dH0-&=E
zP@N4_ZRK2)npl!w6q28xW9JBpJ_XO*#Prml)WnoZ8+~*Y(7?j(UWh0#zU;VwI$?2d
z#}%+=VF&{QBa5etV~9oX+AD@$%#I=q7tGmM90iz~5<~@996zu*9k^yTb*;b$4l}2`
z3D>-rd}3%y(5_%moT`wqS%GEWS&ig7N8Y?@*DU*Y-+Xs{y1Hx2{$o+MrGveqHJ5&#
z5)|%YBKIPp>40x^%9KX&H`^H5Bsu1|wJbXzxQeG||1)WZ+cVN02uk+~ta)t4EXud<
zY4Jt7bJG;AyUMqjRvzDZ+IY?tkr<H!DF>C-bu9{)5j$CTjM@LiHKm;uK@P!h68O(o
z=C%Dhbp7lJH94*qb?>USZ25R}@%OH&rwiN9d3juH{?4@G!tYY<D<xGC3eBP40)PE+
uDc=86B44oZr*fq5R*%aWwHkk|KQY>F=UL#ZxH<)tKRjLiT-G@yGywpos4AfV

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
index 2e0a897f9..a9b38d8c5 100644
--- a/astrid/res/layout/filter_adapter_row.xml
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -61,7 +61,7 @@
         android:layout_toLeftOf="@id/size"
         android:paddingLeft="5dip" 
         android:paddingRight="5dip" 
-        android:src="@drawable/filter_selected_icon"
+        android:src="?attr/asFilterSelectedIcon"
         android:scaleType="fitCenter"
         android:visibility="gone"/>
                     
diff --git a/astrid/res/layout/widget_config_activity.xml b/astrid/res/layout/widget_config_activity.xml
index 94c3cf125..ffdb8faf3 100644
--- a/astrid/res/layout/widget_config_activity.xml
+++ b/astrid/res/layout/widget_config_activity.xml
@@ -5,7 +5,7 @@
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:background="@drawable/background_gradient">
+    style="@style/Content">
         
     <!-- List -->
     <ListView android:id="@android:id/list"
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index b5a3fc398..6170ef33d 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -32,6 +32,7 @@
   <attr name="asAbBackgroundColor" format="color"/>
   <attr name="asListPopoverBg" format="reference"/>
   <attr name="asListArrowUp" format="reference"/>
+  <attr name="asFilterSelectedIcon" format="reference"/>
 
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index db1f1ca99..c20f0933e 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -34,6 +34,7 @@
         <item name="asRepeatIcon">@drawable/icn_edit_repeats_blue</item>
         <item name="asListPopoverBg">@drawable/list_popover_bg_white</item>
         <item name="asListArrowUp">@drawable/list_arrow_up_white</item>
+        <item name="asFilterSelectedIcon">@drawable/filter_selected_icon</item>
         
         <!-- actionbar-styling -->
         <item name="abBackground">@drawable/header_blue</item>
@@ -80,6 +81,7 @@
         <item name="asAbBackgroundColor">#ffffff</item>
         <item name="asListPopoverBg">@drawable/list_popover_bg</item>
         <item name="asListArrowUp">@drawable/list_arrow_up</item>
+        <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
         
         <!-- actionbar-styling -->
         <item name="abBackground">@drawable/header_red</item>
@@ -347,6 +349,10 @@
         <item name="android:textColor">?attr/asTextColorInverse</item>
     </style>
     
+    <style name="TextAppearance.FLA_Filter_Widget" parent="TextAppearance.FLA_Filter">
+        <item name="android:textColor">?attr/asTextColor</item>
+    </style>
+    
     <style name="TextAppearance.FLA_Filter_Tablet" parent="TextAppearance.FLA_Filter">
         <item name="android:textColor">@android:color/white</item>
     </style>
diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
index 35ba09f05..2026d296e 100644
--- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
@@ -19,6 +19,7 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
+import com.todoroo.astrid.service.ThemeService;
 
 @SuppressWarnings("nls")
 abstract public class WidgetConfigActivity extends ListActivity {
@@ -41,6 +42,7 @@ abstract public class WidgetConfigActivity extends ListActivity {
 
     @Override
     public void onCreate(Bundle icicle) {
+        ThemeService.applyTheme(this);
         super.onCreate(icicle);
 
         // Set the result to CANCELED.  This will cause the widget host to cancel
@@ -68,6 +70,7 @@ abstract public class WidgetConfigActivity extends ListActivity {
         // set up ui
         adapter = new FilterAdapter(this, getListView(),
                 R.layout.filter_adapter_row, true, true);
+        adapter.filterStyle = R.style.TextAppearance_FLA_Filter_Widget;
         setListAdapter(adapter);
 
         Button button = (Button)findViewById(R.id.ok);