archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Themed colors except for toggle buttons

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent bcc6d44ffa
commit 2dc7e45a0d
21 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
astrid/res/drawable-v11/deadline_timepicker_button_bl_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:bottomLeftRadius="5dip"/> android:bottomLeftRadius="5dip"/>
</shape> </shape>

2
astrid/res/drawable-v11/deadline_timepicker_button_br_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:bottomRightRadius="5dip"/> android:bottomRightRadius="5dip"/>
</shape> </shape>

2
astrid/res/drawable-v11/timepicker_am_btn_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topLeftRadius="5dip" android:topLeftRadius="5dip"
android:bottomLeftRadius="5dip"/> android:bottomLeftRadius="5dip"/>

2
astrid/res/drawable-v11/timepicker_pm_btn_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topRightRadius="5dip" android:topRightRadius="5dip"
android:bottomRightRadius="5dip"/> android:bottomRightRadius="5dip"/>

2
astrid/res/drawable/date_shortcut_bottom_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:bottomRightRadius="5dip" android:bottomRightRadius="5dip"
android:bottomLeftRadius="5dip"/> android:bottomLeftRadius="5dip"/>

2
astrid/res/drawable/date_shortcut_middle_on.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<stroke <stroke
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>

2
astrid/res/drawable/date_shortcut_standalone_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topLeftRadius="5dip" android:topLeftRadius="5dip"
android:topRightRadius="5dip" android:topRightRadius="5dip"

2
astrid/res/drawable/date_shortcut_top_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topLeftRadius="5dip" android:topLeftRadius="5dip"
android:topRightRadius="5dip"/> android:topRightRadius="5dip"/>

2
astrid/res/drawable/deadline_timepicker_button_bl_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:bottomRightRadius="5dip"/> android:bottomRightRadius="5dip"/>
</shape> </shape>

2
astrid/res/drawable/deadline_timepicker_button_br_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:bottomLeftRadius="5dip"/> android:bottomLeftRadius="5dip"/>
</shape> </shape>

2
astrid/res/drawable/deadline_timepicker_button_tl_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topLeftRadius="5dip"/> android:topLeftRadius="5dip"/>
</shape> </shape>

2
astrid/res/drawable/deadline_timepicker_button_tr_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topRightRadius="5dip"/> android:topRightRadius="5dip"/>
</shape> </shape>

2
astrid/res/drawable/timepicker_am_btn_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topLeftRadius="5dip" android:topLeftRadius="5dip"
android:bottomRightRadius="5dip"/> android:bottomRightRadius="5dip"/>

2
astrid/res/drawable/timepicker_pm_btn_on.xml
Unescape Escape View File

@ -5,7 +5,7 @@
android:width="2dip" android:width="2dip"
android:color="@color/task_edit_deadline_gray"/> android:color="@color/task_edit_deadline_gray"/>
<solid <solid
android:color="@color/task_edit_details"/> android:color="@color/blue_theme_color"/>
<corners <corners
android:topRightRadius="5dip" android:topRightRadius="5dip"
android:bottomLeftRadius="5dip"/> android:bottomLeftRadius="5dip"/>

2
astrid/res/layout/filter_list_activity.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/list_popover_bg" android:background="#eeffffff"
android:orientation="vertical"> android:orientation="vertical">

2
astrid/res/layout/header_nav_views.xml
Unescape Escape View File

@ -41,7 +41,7 @@
android:layout_marginLeft="10dip" android:layout_marginLeft="10dip"
android:layout_toRightOf="@id/list_title" android:layout_toRightOf="@id/list_title"
android:layout_alignBottom="@id/list_title" android:layout_alignBottom="@id/list_title"
android:src="?attr/asListsDisclosure" android:src="@drawable/lists_disclosure_red"
android:scaleType="fitCenter"/> android:scaleType="fitCenter"/>
</RelativeLayout> </RelativeLayout>

6
astrid/res/values/attrs.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- theme attributes --> <!-- theme attributes -->
<attr name="asContentBackground" format="reference"/> <attr name="asContentBackground" format="color"/>
<attr name="asEditBackground" format="color"/> <attr name="asEditBackground" format="color"/>
<attr name="asEditRowBackground" format="reference"/> <attr name="asEditRowBackground" format="reference"/>
<attr name="asEditTabBackground" format="reference"/> <attr name="asEditTabBackground" format="reference"/>
@ -18,12 +18,12 @@
<attr name="asFilterCountColor" format="color"/> <attr name="asFilterCountColor" format="color"/>
<attr name="asMembersHeaderBackground" format="reference"/> <attr name="asMembersHeaderBackground" format="reference"/>
<attr name="asSeparatorBackground" format="color"/> <attr name="asSeparatorBackground" format="color"/>
<attr name="asAbTextColor" format="color"/>
<attr name="asThemeTextColor" format="color"/>
<attr name="asAddButtonImg" format="reference" /> <attr name="asAddButtonImg" format="reference" />
<attr name="asMicButtonImg" format="reference" /> <attr name="asMicButtonImg" format="reference" />
<attr name="asCameraButtonImg" format="reference" /> <attr name="asCameraButtonImg" format="reference" />
<attr name="asListsDisclosure" format="reference" />
<attr name="asMainMenuOn" format="reference" /> <attr name="asMainMenuOn" format="reference" />
<attr name="asMainMenuOff" format="reference" /> <attr name="asMainMenuOff" format="reference" />

4
astrid/res/values/colors.xml
Unescape Escape View File

@ -24,10 +24,10 @@
<color name="task_edit_selected">#438cb6</color> <color name="task_edit_selected">#438cb6</color>
<color name="task_edit_details">#c60f1a</color>
<color name="task_edit_deadline_gray">#888888</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_bg">#292929</color>
<color name="tablet_list_selected">#101010</color> <color name="tablet_list_selected">#101010</color>

28
astrid/res/values/styles.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<style name="Theme" parent="@style/Theme.Sherlock"> <style name="Theme" parent="@style/Theme.Sherlock">
<item name="android:windowBackground">@null</item> <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="asHeaderBackground">@drawable/header_background</item>
<item name="asHeaderButtonBackground">@drawable/header_button</item> <item name="asHeaderButtonBackground">@drawable/header_button</item>
<item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item> <item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item>
@ -22,23 +22,22 @@
<item name="asAddButtonImg">@drawable/plus_button_red</item> <item name="asAddButtonImg">@drawable/plus_button_red</item>
<item name="asMicButtonImg">@drawable/mic_button_gray</item> <item name="asMicButtonImg">@drawable/mic_button_gray</item>
<item name="asCameraButtonImg">@drawable/camera_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="asEditBackground">#171317</item>
<item name="asEditRowBackground">@drawable/task_edit_background</item> <item name="asEditRowBackground">@drawable/task_edit_background</item>
<item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item> <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
<item name="asMainMenuOn">@drawable/menu</item> <item name="asMainMenuOn">@drawable/menu</item>
<item name="asMainMenuOff">@drawable/menu</item> <item name="asMainMenuOff">@drawable/menu</item>
<item name="asThemeTextColor">@color/blue_theme_color</item>
<!-- actionbar-styling --> <!-- 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="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">@android:color/darker_gray</item>
<item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item> <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
<item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item> <item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item>
</style> </style>
<style name="Theme.Transparent" parent="@style/Theme"> <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="asEditBackground">#33272327</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item> <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
@ -62,7 +61,7 @@
</style> </style>
<style name="Theme.White" parent="@style/Theme.Sherlock.Light"> <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="asEditBackground">#f7f3f7</item>
<item name="asHeaderBackground">@drawable/header_background_white</item> <item name="asHeaderBackground">@drawable/header_background_white</item>
<item name="asHeaderButtonBackground">@drawable/header_button_white</item> <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
@ -75,20 +74,19 @@
<item name="asAddButtonImg">@drawable/plus_button_red</item> <item name="asAddButtonImg">@drawable/plus_button_red</item>
<item name="asMicButtonImg">@drawable/mic_button_red</item> <item name="asMicButtonImg">@drawable/mic_button_red</item>
<item name="asCameraButtonImg">@drawable/camera_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="asEditRowBackground">@drawable/task_edit_background_white</item>
<item name="asEditTabBackground">@drawable/custom_tab_indicator</item> <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
<item name="asMainMenuOn">@drawable/menu</item> <item name="asMainMenuOn">@drawable/menu</item>
<item name="asMainMenuOff">@drawable/menu</item> <item name="asMainMenuOff">@drawable/menu</item>
<item name="asThemeTextColor">@color/red_theme_color</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
<item name="abBackground">@android:color/white</item> <item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">@color/red_text_color</item>
</style> </style>
<style name="Theme.TransparentWhite" parent="@style/Theme.White"> <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:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item> <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
<item name="asMembersHeaderBackground">@android:color/transparent</item> <item name="asMembersHeaderBackground">@android:color/transparent</item>
@ -96,12 +94,11 @@
<item name="abBackground">@android:color/white</item> <item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">@color/red_text_color</item>
</style> </style>
<style name="Theme_Dialog" parent="@android:style/Theme.Dialog"> <style name="Theme_Dialog" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@null</item> <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="asHeaderBackground">@drawable/header_background</item>
<item name="asHeaderButtonBackground">@drawable/header_button</item> <item name="asHeaderButtonBackground">@drawable/header_button</item>
<item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item> <item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item>
@ -133,7 +130,7 @@
</style> </style>
<style name="Theme_Dialog.White"> <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="asHeaderBackground">@drawable/header_background_white</item>
<item name="asHeaderButtonBackground">@drawable/header_button_white</item> <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
<item name="asTextColor">#ff000000</item> <item name="asTextColor">#ff000000</item>
@ -146,7 +143,6 @@
<item name="abBackground">@android:color/white</item> <item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">@color/red_text_color</item>
</style> </style>
<!--================================================== General == --> <!--================================================== General == -->
@ -184,7 +180,7 @@
<style name="TextAppearance.ActionBar_ListsHeader"> <style name="TextAppearance.ActionBar_ListsHeader">
<item name="android:background">@android:color/transparent</item> <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:textSize">20dip</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
@ -236,12 +232,12 @@
</style> </style>
<style name="TextAppearance.EditRowDisplay"> <style name="TextAppearance.EditRowDisplay">
<item name="android:textColor">@color/task_edit_details</item> <item name="android:textColor">?attr/asThemeTextColor</item>
</style> </style>
<style name="TextAppearance.TEA_action"> <style name="TextAppearance.TEA_action">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">@color/task_edit_details</item> <item name="android:textColor">?attr/asThemeTextColor</item>
</style> </style>
<style name="Theme.WhenDialog"> <style name="Theme.WhenDialog">

4
astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
Unescape Escape View File

@ -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); int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
lists.setTextAppearance(this, textStyle); lists.setTextAppearance(this, textStyle);
listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent); listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
TypedValue tv = new TypedValue(); listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : R.drawable.lists_disclosure_red);
getTheme().resolveAttribute(R.attr.asListsDisclosure, tv, false);
listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : tv.data);
} }
private void setMainMenuSelected(boolean selected) { private void setMainMenuSelected(boolean selected) {

5
astrid/src/com/todoroo/astrid/ui/CalendarView.java
Unescape Escape View File

@ -17,6 +17,7 @@ import android.text.format.DateFormat;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.Display; import android.view.Display;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.GestureDetector.SimpleOnGestureListener; import android.view.GestureDetector.SimpleOnGestureListener;
@ -139,9 +140,11 @@ public class CalendarView extends View {
todayCalendarPaint.setAntiAlias(true); todayCalendarPaint.setAntiAlias(true);
todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); 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 = new Paint();
selectedCalendarPaint.setAntiAlias(true); selectedCalendarPaint.setAntiAlias(true);
selectedCalendarPaint.setColor(r.getColor(R.color.task_edit_details)); selectedCalendarPaint.setColor(r.getColor(selectedColor.data));
backgroundColorPaint = new Paint(); backgroundColorPaint = new Paint();
backgroundColorPaint.setAntiAlias(true); backgroundColorPaint.setAntiAlias(true);

Write Preview
Loading…
Cancel
Save