From 161ded49cb30c7ee5b7b9dd621f4ec252d43cd5b Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 27 Jan 2012 20:26:09 -0800
Subject: [PATCH] Separating line in the header, added some missing icons

---
 astrid/res/drawable-hdpi/header_blue.9.png       | Bin 0 -> 85 bytes
 astrid/res/drawable-hdpi/header_red.9.png        | Bin 0 -> 84 bytes
 astrid/res/drawable/header_blue.9.png            | Bin 0 -> 85 bytes
 astrid/res/drawable/header_red.9.png             | Bin 0 -> 84 bytes
 astrid/res/drawable/icn_tutorial.png             | Bin 0 -> 887 bytes
 astrid/res/drawable/mic_button_blue.png          | Bin 0 -> 3257 bytes
 astrid/res/layout/task_edit_activity.xml         |   2 +-
 astrid/res/values/styles.xml                     |   6 +++---
 .../com/todoroo/astrid/ui/MainMenuPopover.java   |   2 +-
 9 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 astrid/res/drawable-hdpi/header_blue.9.png
 create mode 100644 astrid/res/drawable-hdpi/header_red.9.png
 create mode 100644 astrid/res/drawable/header_blue.9.png
 create mode 100644 astrid/res/drawable/header_red.9.png
 create mode 100644 astrid/res/drawable/icn_tutorial.png
 create mode 100644 astrid/res/drawable/mic_button_blue.png

diff --git a/astrid/res/drawable-hdpi/header_blue.9.png b/astrid/res/drawable-hdpi/header_blue.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..43168f4a80db9745f766d138daeac0567bdbd655
GIT binary patch
literal 85
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y;!3HFk*Rf{-DH%@}$B>F!$q5Y&|9L!kB$i3H
iAFO#Dyo39}IYx%|Sotji7Ud;Cbqt=aelF{r5}E)PgcfW7

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/header_red.9.png b/astrid/res/drawable-hdpi/header_red.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a4a10d672fa3560bb7e68031caf5d8feab13c68
GIT binary patch
literal 84
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y;!3HFk*Rf{-DQQm^$B>F!$q5Y&|9K49I1aG9
iIGVVl^9j?AVulnE%Y{oe<OKqiF?hQAxvX<aXaWETau%lm

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/header_blue.9.png b/astrid/res/drawable/header_blue.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..43168f4a80db9745f766d138daeac0567bdbd655
GIT binary patch
literal 85
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y;!3HFk*Rf{-DH%@}$B>F!$q5Y&|9L!kB$i3H
iAFO#Dyo39}IYx%|Sotji7Ud;Cbqt=aelF{r5}E)PgcfW7

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/header_red.9.png b/astrid/res/drawable/header_red.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a4a10d672fa3560bb7e68031caf5d8feab13c68
GIT binary patch
literal 84
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y;!3HFk*Rf{-DQQm^$B>F!$q5Y&|9K49I1aG9
iIGVVl^9j?AVulnE%Y{oe<OKqiF?hQAxvX<aXaWETau%lm

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/icn_tutorial.png b/astrid/res/drawable/icn_tutorial.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1a4d9c46850577fc9d506554199be652bfebd5f
GIT binary patch
literal 887
zcmV--1Bm>IP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;{YgYYRCwC#nLTJzQ5462Z4+&*gA%B?bWl)K+9Dc1ilU-}C@v1Vv<@nCQKW<5
zN2#L44k8W;MWG?!2Xt`}L`1P5q+$gdE9g*BEILHgrP@l9#=%nvulFVQ+^4O<{2_##
zmwV1X_nmjn{hw6iayd!~m6RCDgv*3I2$_tTOh)5l8?X-82s8ju&-E|BOQ0Wk20XSV
z7n)A5!c-+J2+s%h1FgVnzaMVe3*ZHC4d?|%XM*q!-~tc}cy|YYQ@}$F;Yww`w*&VS
zWV678&$XENYS-|v{bB@20Ox_Q<(lh4Dh8a9bnqf9J`)nd?V<CgjRbF2+>P6k-&06Q
z-XHh*ev8C80OW%1aEFpCz)gcKQDjXsa5890Yz0m`JWvY_wy4Frvl7#Za1C%-k+b<Y
z1}w<?JQp}&u`VnzYkc#wKv_Eo^aLnduYfr46W9lAQLH@##5Hxe3U~^vouv-^9M}*F
zg|fCO(F8R9q2O<%J!{Y?9IVS)lQMU|N$DB^J_GN8Vc;E*md@C!@D~;iPc(!zxC0z6
zaNVViH)*Owz0!FMI0CFOTw5V8E$TIdYn9F$fGfaJpIRPqAY7{<oOOJ_`VF>Cj=r*g
zTXBpV4(Cx|{Y*%tD#u1K?6EBamO65)(hyEN1b6^UdTiSRY-U<Rc*r3@(ns&PVn{<c
zsdWBPv|2vufK>qqC$)qp6wY4*pA7AFks(cNFyTTtr3moIVB0M3yX9~`uJD)A63znM
zmd<mAayAFp16%^`17pe^?sloey}+P_^AX^!fpA<7?Mr~GK(!^=L5Zza9N&R9i(LL{
z*uhcYq8zSzfW?a3ZIjqenyycDRw1kemK*HzfLp~hnnBa`1y#*mJ}TII`=^eB)xb{R
zF0farw7ZJV94tpw5t)az6!7%}_#lF_PTAgX$N_(>*r-Y~TdR~=ScjvM_RHCGqDZFI
z>!7o>NuU$h#qU90Pz;E#PEB+9FUGB=1J3LYwEtz4|CA{cE_K4c1_0D#$sNhm&KUpz
N002ovPDHLkV1hk4fs+6L

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/mic_button_blue.png b/astrid/res/drawable/mic_button_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fedb507d99e398889164fefed3d0737d36b557f
GIT binary patch
literal 3257
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

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index ab59be39a..a82ca2446 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -185,7 +185,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
                 android:gravity="center_horizontal"
-                android:textColor="@color/task_edit_details"
+                android:textColor="?attr/asThemeTextColor"
                 android:textSize="10sp"
                 android:visibility="visible" />
         </LinearLayout>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 80a6b63e1..33a14270d 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -20,7 +20,7 @@
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
         <item name="asSeparatorBackground">#888888</item>
         <item name="asAddButtonImg">@drawable/plus_button_blue</item>
-        <item name="asMicButtonImg">@drawable/mic_button_gray</item>
+        <item name="asMicButtonImg">@drawable/mic_button_blue</item>
         <item name="asCameraButtonImg">@drawable/camera_button_gray</item>
         <item name="asEditBackground">#171317</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
@@ -29,7 +29,7 @@
         <item name="asThemeTextColor">@color/blue_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_blue</item>
         <!-- actionbar-styling -->
-        <item name="abBackground">@android:color/black</item>
+        <item name="abBackground">@drawable/header_blue</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
         <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
@@ -80,7 +80,7 @@
         <item name="asThemeTextColor">@color/red_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
         <!-- actionbar-styling -->
-        <item name="abBackground">@android:color/white</item>
+        <item name="abBackground">@drawable/header_red</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
     </style>
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index a8a6c199f..de3cbfe72 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -83,7 +83,7 @@ public class MainMenuPopover extends FragmentPopover {
     }
 
     private void addTutorialItem() {
-        addMenuItem(R.string.TLA_menu_tutorial, 0, MAIN_MENU_ITEM_TUTORIAL);
+        addMenuItem(R.string.TLA_menu_tutorial, R.drawable.icn_tutorial, MAIN_MENU_ITEM_TUTORIAL);
     }
 
     private void addSettingsItem() {