From 2dc7e45a0d323865c332430ceab9594185f009b7 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 27 Jan 2012 17:03:40 -0800
Subject: [PATCH] Themed colors except for toggle buttons

---
 .../deadline_timepicker_button_bl_on.xml      |  2 +-
 .../deadline_timepicker_button_br_on.xml      |  2 +-
 .../res/drawable-v11/timepicker_am_btn_on.xml |  2 +-
 .../res/drawable-v11/timepicker_pm_btn_on.xml |  2 +-
 .../res/drawable/date_shortcut_bottom_on.xml  |  2 +-
 .../res/drawable/date_shortcut_middle_on.xml  |  2 +-
 .../drawable/date_shortcut_standalone_on.xml  |  2 +-
 astrid/res/drawable/date_shortcut_top_on.xml  |  2 +-
 .../deadline_timepicker_button_bl_on.xml      |  2 +-
 .../deadline_timepicker_button_br_on.xml      |  2 +-
 .../deadline_timepicker_button_tl_on.xml      |  2 +-
 .../deadline_timepicker_button_tr_on.xml      |  2 +-
 astrid/res/drawable/timepicker_am_btn_on.xml  |  2 +-
 astrid/res/drawable/timepicker_pm_btn_on.xml  |  2 +-
 astrid/res/layout/filter_list_activity.xml    |  2 +-
 astrid/res/layout/header_nav_views.xml        |  2 +-
 astrid/res/values/attrs.xml                   |  6 ++--
 astrid/res/values/colors.xml                  |  4 +--
 astrid/res/values/styles.xml                  | 28 ++++++++-----------
 .../activity/TaskListWrapperActivity.java     |  4 +--
 .../com/todoroo/astrid/ui/CalendarView.java   |  5 +++-
 21 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/astrid/res/drawable-v11/deadline_timepicker_button_bl_on.xml b/astrid/res/drawable-v11/deadline_timepicker_button_bl_on.xml
index b9106ed45..4358d6aaa 100644
--- a/astrid/res/drawable-v11/deadline_timepicker_button_bl_on.xml
+++ b/astrid/res/drawable-v11/deadline_timepicker_button_bl_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:bottomLeftRadius="5dip"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable-v11/deadline_timepicker_button_br_on.xml b/astrid/res/drawable-v11/deadline_timepicker_button_br_on.xml
index 1d1fdecc1..7bd7de7d2 100644
--- a/astrid/res/drawable-v11/deadline_timepicker_button_br_on.xml
+++ b/astrid/res/drawable-v11/deadline_timepicker_button_br_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:bottomRightRadius="5dip"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable-v11/timepicker_am_btn_on.xml b/astrid/res/drawable-v11/timepicker_am_btn_on.xml
index 7ae789e1b..8a54a2a67 100644
--- a/astrid/res/drawable-v11/timepicker_am_btn_on.xml
+++ b/astrid/res/drawable-v11/timepicker_am_btn_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners
 	    android:topLeftRadius="5dip"
 	    android:bottomLeftRadius="5dip"/>
diff --git a/astrid/res/drawable-v11/timepicker_pm_btn_on.xml b/astrid/res/drawable-v11/timepicker_pm_btn_on.xml
index 92914f342..516adba02 100644
--- a/astrid/res/drawable-v11/timepicker_pm_btn_on.xml
+++ b/astrid/res/drawable-v11/timepicker_pm_btn_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners
 	    android:topRightRadius="5dip"
 	    android:bottomRightRadius="5dip"/>
diff --git a/astrid/res/drawable/date_shortcut_bottom_on.xml b/astrid/res/drawable/date_shortcut_bottom_on.xml
index cd0de8292..a7e18559c 100644
--- a/astrid/res/drawable/date_shortcut_bottom_on.xml
+++ b/astrid/res/drawable/date_shortcut_bottom_on.xml
@@ -5,7 +5,7 @@
 	    android:width="2dip"
 	    android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:bottomRightRadius="5dip"
 	    android:bottomLeftRadius="5dip"/>
diff --git a/astrid/res/drawable/date_shortcut_middle_on.xml b/astrid/res/drawable/date_shortcut_middle_on.xml
index 96cff5040..4510b989d 100644
--- a/astrid/res/drawable/date_shortcut_middle_on.xml
+++ b/astrid/res/drawable/date_shortcut_middle_on.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
     android:shape="rectangle">
     <solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<stroke
 	    android:width="2dip"
 	    android:color="@color/task_edit_deadline_gray"/>
diff --git a/astrid/res/drawable/date_shortcut_standalone_on.xml b/astrid/res/drawable/date_shortcut_standalone_on.xml
index 92be9ab38..38575b708 100644
--- a/astrid/res/drawable/date_shortcut_standalone_on.xml
+++ b/astrid/res/drawable/date_shortcut_standalone_on.xml
@@ -5,7 +5,7 @@
 	    android:width="2dip"
 	    android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:topLeftRadius="5dip"
 	    android:topRightRadius="5dip"
diff --git a/astrid/res/drawable/date_shortcut_top_on.xml b/astrid/res/drawable/date_shortcut_top_on.xml
index 34276fb81..53e90079c 100644
--- a/astrid/res/drawable/date_shortcut_top_on.xml
+++ b/astrid/res/drawable/date_shortcut_top_on.xml
@@ -5,7 +5,7 @@
 	    android:width="2dip"
 	    android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:topLeftRadius="5dip"
 	    android:topRightRadius="5dip"/>
diff --git a/astrid/res/drawable/deadline_timepicker_button_bl_on.xml b/astrid/res/drawable/deadline_timepicker_button_bl_on.xml
index 1d1fdecc1..7bd7de7d2 100644
--- a/astrid/res/drawable/deadline_timepicker_button_bl_on.xml
+++ b/astrid/res/drawable/deadline_timepicker_button_bl_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:bottomRightRadius="5dip"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/deadline_timepicker_button_br_on.xml b/astrid/res/drawable/deadline_timepicker_button_br_on.xml
index b9106ed45..4358d6aaa 100644
--- a/astrid/res/drawable/deadline_timepicker_button_br_on.xml
+++ b/astrid/res/drawable/deadline_timepicker_button_br_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:bottomLeftRadius="5dip"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/deadline_timepicker_button_tl_on.xml b/astrid/res/drawable/deadline_timepicker_button_tl_on.xml
index a986c84ef..e0881be13 100644
--- a/astrid/res/drawable/deadline_timepicker_button_tl_on.xml
+++ b/astrid/res/drawable/deadline_timepicker_button_tl_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:topLeftRadius="5dip"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/deadline_timepicker_button_tr_on.xml b/astrid/res/drawable/deadline_timepicker_button_tr_on.xml
index c0e96792f..2f599207a 100644
--- a/astrid/res/drawable/deadline_timepicker_button_tr_on.xml
+++ b/astrid/res/drawable/deadline_timepicker_button_tr_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners 
 	    android:topRightRadius="5dip"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/timepicker_am_btn_on.xml b/astrid/res/drawable/timepicker_am_btn_on.xml
index 0cbdf78b6..23aa37938 100644
--- a/astrid/res/drawable/timepicker_am_btn_on.xml
+++ b/astrid/res/drawable/timepicker_am_btn_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners
 	    android:topLeftRadius="5dip"
 	    android:bottomRightRadius="5dip"/>
diff --git a/astrid/res/drawable/timepicker_pm_btn_on.xml b/astrid/res/drawable/timepicker_pm_btn_on.xml
index 5ab8be869..0048693b8 100644
--- a/astrid/res/drawable/timepicker_pm_btn_on.xml
+++ b/astrid/res/drawable/timepicker_pm_btn_on.xml
@@ -5,7 +5,7 @@
         android:width="2dip"
         android:color="@color/task_edit_deadline_gray"/>
 	<solid
-	    android:color="@color/task_edit_details"/>
+	    android:color="@color/blue_theme_color"/>
 	<corners
 	    android:topRightRadius="5dip"
 	    android:bottomLeftRadius="5dip"/>
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index af90a002e..1fcb5e822 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/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="wrap_content"
-    android:background="@drawable/list_popover_bg"
+    android:background="#eeffffff"
     android:orientation="vertical">
 
 
diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index d496af38d..eb2cb7e66 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -41,7 +41,7 @@
 	        android:layout_marginLeft="10dip" 
 	        android:layout_toRightOf="@id/list_title"
 	        android:layout_alignBottom="@id/list_title"
-	        android:src="?attr/asListsDisclosure"
+	        android:src="@drawable/lists_disclosure_red"
 	        android:scaleType="fitCenter"/>
 	
 	</RelativeLayout>
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 7ddbbd62d..550fd8278 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- theme attributes -->
-  <attr name="asContentBackground" format="reference"/>
+  <attr name="asContentBackground" format="color"/>
   <attr name="asEditBackground" format="color"/>
   <attr name="asEditRowBackground" format="reference"/>
   <attr name="asEditTabBackground" format="reference"/>
@@ -18,12 +18,12 @@
   <attr name="asFilterCountColor" format="color"/>
   <attr name="asMembersHeaderBackground" format="reference"/>
   <attr name="asSeparatorBackground" format="color"/>
-  <attr name="asAbTextColor" format="color"/>
+  
+  <attr name="asThemeTextColor" format="color"/>
   
   <attr name="asAddButtonImg" format="reference" />
   <attr name="asMicButtonImg" format="reference" />
   <attr name="asCameraButtonImg" format="reference" />
-  <attr name="asListsDisclosure" format="reference" />
   <attr name="asMainMenuOn" format="reference" />
   <attr name="asMainMenuOff" format="reference" />
 
diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml
index a47776064..c6bc7ff2d 100644
--- a/astrid/res/values/colors.xml
+++ b/astrid/res/values/colors.xml
@@ -24,10 +24,10 @@
     
     <color name="task_edit_selected">#438cb6</color>
     
-    <color name="task_edit_details">#c60f1a</color>
     <color name="task_edit_deadline_gray">#888888</color>
     
-    <color name="red_text_color">#d00000</color>
+    <color name="blue_theme_color">#33b5e5</color>
+    <color name="red_theme_color">#d90000</color>
     <color name="tablet_list_bg">#292929</color>
     <color name="tablet_list_selected">#101010</color>
         
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 63362972a..cbbbe8587 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -6,7 +6,7 @@
     
     <style name="Theme" parent="@style/Theme.Sherlock">
         <item name="android:windowBackground">@null</item>
-        <item name="asContentBackground">@drawable/background_gradient</item>
+        <item name="asContentBackground">@android:color/black</item>
         <item name="asHeaderBackground">@drawable/header_background</item>
         <item name="asHeaderButtonBackground">@drawable/header_button</item>
         <item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item>
@@ -22,23 +22,22 @@
         <item name="asAddButtonImg">@drawable/plus_button_red</item>
         <item name="asMicButtonImg">@drawable/mic_button_gray</item>
         <item name="asCameraButtonImg">@drawable/camera_button_gray</item>
-        <item name="asListsDisclosure">@drawable/lists_disclosure_gray</item>
         <item name="asEditBackground">#171317</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
         <item name="asMainMenuOn">@drawable/menu</item>
         <item name="asMainMenuOff">@drawable/menu</item>
+        <item name="asThemeTextColor">@color/blue_theme_color</item>
         <!-- actionbar-styling -->
-        <item name="abBackground">@drawable/header_background</item>
+        <item name="abBackground">@android:color/black</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
-        <item name="asAbTextColor">@android:color/darker_gray</item>
         <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
         <item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item>
     </style>
     
     <style name="Theme.Transparent" parent="@style/Theme">
-		<item name="asContentBackground">@drawable/background_transparent</item>
+		<item name="asContentBackground">@android:color/transparent</item>
         <item name="asEditBackground">#33272327</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
@@ -62,7 +61,7 @@
 	</style>
         
     <style name="Theme.White" parent="@style/Theme.Sherlock.Light">
-        <item name="asContentBackground">@drawable/background_white</item>
+        <item name="asContentBackground">@android:color/white</item>
         <item name="asEditBackground">#f7f3f7</item>
         <item name="asHeaderBackground">@drawable/header_background_white</item>
         <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
@@ -75,20 +74,19 @@
         <item name="asAddButtonImg">@drawable/plus_button_red</item>
         <item name="asMicButtonImg">@drawable/mic_button_red</item>
         <item name="asCameraButtonImg">@drawable/camera_button_red</item>
-        <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenuOn">@drawable/menu</item>
         <item name="asMainMenuOff">@drawable/menu</item>
+        <item name="asThemeTextColor">@color/red_theme_color</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
-        <item name="asAbTextColor">@color/red_text_color</item>
     </style>
     
     <style name="Theme.TransparentWhite" parent="@style/Theme.White">
-        <item name="asContentBackground">@drawable/background_transparent</item>
+        <item name="asContentBackground">@android:color/transparent</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
@@ -96,12 +94,11 @@
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
-        <item name="asAbTextColor">@color/red_text_color</item>
     </style>
     
     <style name="Theme_Dialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowBackground">@null</item>
-        <item name="asContentBackground">@drawable/background_gradient</item>
+        <item name="asContentBackground">@android:color/black</item>
         <item name="asHeaderBackground">@drawable/header_background</item>
         <item name="asHeaderButtonBackground">@drawable/header_button</item>
         <item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item>
@@ -133,7 +130,7 @@
     </style>
     
     <style name="Theme_Dialog.White">
-        <item name="asContentBackground">@drawable/background_white</item>
+        <item name="asContentBackground">@android:color/white</item>
         <item name="asHeaderBackground">@drawable/header_background_white</item>
         <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
         <item name="asTextColor">#ff000000</item>
@@ -146,7 +143,6 @@
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
-        <item name="asAbTextColor">@color/red_text_color</item>
     </style>
         
     <!--================================================== General == -->
@@ -184,7 +180,7 @@
    	
    	<style name="TextAppearance.ActionBar_ListsHeader">
    	    <item name="android:background">@android:color/transparent</item>
-   	    <item name="android:textColor">?attr/asAbTextColor</item>
+   	    <item name="android:textColor">?attr/asThemeTextColor</item>
    	    <item name="android:textSize">20dip</item>
    	    <item name="android:textStyle">bold</item>
    	</style>
@@ -236,12 +232,12 @@
    	</style>
    	
    	<style name="TextAppearance.EditRowDisplay">
-   	    <item name="android:textColor">@color/task_edit_details</item>
+   	    <item name="android:textColor">?attr/asThemeTextColor</item>
    	</style>
 
    	<style name="TextAppearance.TEA_action">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/task_edit_details</item>        
+        <item name="android:textColor">?attr/asThemeTextColor</item>        
     </style>
    	
    	<style name="Theme.WhenDialog">
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
index c903da63c..1b4fe65b8 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
@@ -206,9 +206,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma
 	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
 	    lists.setTextAppearance(this, textStyle);
 	    listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
-	    TypedValue tv = new TypedValue();
-	    getTheme().resolveAttribute(R.attr.asListsDisclosure, tv, false);
-	    listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : tv.data);
+	    listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : R.drawable.lists_disclosure_red);
 	}
 
 	private void setMainMenuSelected(boolean selected) {
diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
index b087e56e1..cb3546225 100644
--- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java
+++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
@@ -17,6 +17,7 @@ import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.view.Display;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
@@ -139,9 +140,11 @@ public class CalendarView extends View {
     	todayCalendarPaint.setAntiAlias(true);
     	todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
 
+    	TypedValue selectedColor = new TypedValue();
+    	context.getTheme().resolveAttribute(R.attr.asThemeTextColor, selectedColor, false);
     	selectedCalendarPaint = new Paint();
     	selectedCalendarPaint.setAntiAlias(true);
-    	selectedCalendarPaint.setColor(r.getColor(R.color.task_edit_details));
+    	selectedCalendarPaint.setColor(r.getColor(selectedColor.data));
 
     	backgroundColorPaint = new Paint();
     	backgroundColorPaint.setAntiAlias(true);