diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java index 7c249533b..ec98d9f28 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java @@ -10,7 +10,6 @@ import android.support.v4.view.Menu; import android.support.v4.view.MenuItem; import android.text.Editable; import android.text.TextWatcher; -import android.util.TypedValue; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MenuInflater; @@ -173,9 +172,7 @@ public class TagUpdatesFragment extends ListFragment { } private void resetPictureButton() { - TypedValue tv = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.asCameraButtonImg, tv, false); - pictureButton.setImageResource(tv.data); + pictureButton.setImageResource(R.drawable.camera_button_gray); } private void refreshUpdatesList() { diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java index e31242388..2ebd523a7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java @@ -23,7 +23,6 @@ import android.text.TextWatcher; import android.text.format.DateUtils; import android.text.util.Linkify; import android.util.Log; -import android.util.TypedValue; import android.view.Gravity; import android.view.KeyEvent; import android.view.View; @@ -117,9 +116,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } private int getDefaultCameraButton() { - TypedValue tv = new TypedValue(); - fragment.getActivity().getTheme().resolveAttribute(R.attr.asCameraButtonImg, tv, false); - return tv.data; + return R.drawable.camera_button_gray; } public void loadViewForTaskID(long t){ diff --git a/astrid/res/drawable-hdpi/header_day_blue.9.png b/astrid/res/drawable-hdpi/header_day_blue.9.png index a77e47813..277842d3f 100644 Binary files a/astrid/res/drawable-hdpi/header_day_blue.9.png and b/astrid/res/drawable-hdpi/header_day_blue.9.png differ diff --git a/astrid/res/drawable/comment_dark_blue.png b/astrid/res/drawable/comment_dark_blue.png new file mode 100644 index 000000000..b8f8836b9 Binary files /dev/null and b/astrid/res/drawable/comment_dark_blue.png differ diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue.xml b/astrid/res/drawable/custom_tab_indicator_dark_blue.xml new file mode 100755 index 000000000..ec95dea10 --- /dev/null +++ b/astrid/res/drawable/custom_tab_indicator_dark_blue.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_selected.9.png b/astrid/res/drawable/custom_tab_indicator_dark_blue_selected.9.png new file mode 100644 index 000000000..eabd57209 Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_dark_blue_selected.9.png differ diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_focused.9.png b/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_focused.9.png new file mode 100644 index 000000000..76e8e134f Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_focused.9.png differ diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png b/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png new file mode 100644 index 000000000..23566999e Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png differ diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected_focused.9.png b/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected_focused.9.png new file mode 100644 index 000000000..8465d8053 Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected_focused.9.png differ diff --git a/astrid/res/drawable/header_day_blue.9.png b/astrid/res/drawable/header_day_blue.9.png index a77e47813..277842d3f 100644 Binary files a/astrid/res/drawable/header_day_blue.9.png and b/astrid/res/drawable/header_day_blue.9.png differ diff --git a/astrid/res/drawable/icn_edit_repeats_dark_blue.png b/astrid/res/drawable/icn_edit_repeats_dark_blue.png new file mode 100644 index 000000000..59f9bf1c4 Binary files /dev/null and b/astrid/res/drawable/icn_edit_repeats_dark_blue.png differ diff --git a/astrid/res/drawable/lists_disclosure_dark_blue.xml b/astrid/res/drawable/lists_disclosure_dark_blue.xml new file mode 100644 index 000000000..b579577da --- /dev/null +++ b/astrid/res/drawable/lists_disclosure_dark_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/lists_disclosure_dark_blue_off.png b/astrid/res/drawable/lists_disclosure_dark_blue_off.png new file mode 100644 index 000000000..2a3689df5 Binary files /dev/null and b/astrid/res/drawable/lists_disclosure_dark_blue_off.png differ diff --git a/astrid/res/drawable/lists_disclosure_dark_blue_on.png b/astrid/res/drawable/lists_disclosure_dark_blue_on.png new file mode 100644 index 000000000..16bca9568 Binary files /dev/null and b/astrid/res/drawable/lists_disclosure_dark_blue_on.png differ diff --git a/astrid/res/drawable/menu_button_dark_blue.xml b/astrid/res/drawable/menu_button_dark_blue.xml new file mode 100644 index 000000000..4886d2cea --- /dev/null +++ b/astrid/res/drawable/menu_button_dark_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/menu_button_dark_blue_off.png b/astrid/res/drawable/menu_button_dark_blue_off.png new file mode 100644 index 000000000..a99d43a8f Binary files /dev/null and b/astrid/res/drawable/menu_button_dark_blue_off.png differ diff --git a/astrid/res/drawable/menu_button_dark_blue_on.png b/astrid/res/drawable/menu_button_dark_blue_on.png new file mode 100644 index 000000000..3323aa279 Binary files /dev/null and b/astrid/res/drawable/menu_button_dark_blue_on.png differ diff --git a/astrid/res/drawable/mic_button_dark_blue.png b/astrid/res/drawable/mic_button_dark_blue.png new file mode 100644 index 000000000..ab3fd2e09 Binary files /dev/null and b/astrid/res/drawable/mic_button_dark_blue.png differ diff --git a/astrid/res/drawable/plus_button_dark_blue.png b/astrid/res/drawable/plus_button_dark_blue.png new file mode 100644 index 000000000..3bb550fa5 Binary files /dev/null and b/astrid/res/drawable/plus_button_dark_blue.png differ diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml index 6a504e87b..ba565ebf4 100644 --- a/astrid/res/layout/tag_updates_fragment.xml +++ b/astrid/res/layout/tag_updates_fragment.xml @@ -47,7 +47,7 @@ android:paddingLeft="7dip" android:paddingRight="7dip" android:scaleType="centerInside" - android:src="?attr/asCameraButtonImg" /> + android:src="@drawable/camera_button_gray" /> diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml index 1764f65e5..c1f2d38bf 100644 --- a/astrid/res/layout/task_edit_activity.xml +++ b/astrid/res/layout/task_edit_activity.xml @@ -142,7 +142,7 @@ android:paddingLeft="7dip" android:paddingRight="7dip" android:scaleType="centerInside" - android:src="?attr/asCameraButtonImg" /> + android:src="@drawable/camera_button_gray" /> diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml index 37ae07518..2002c6c36 100644 --- a/astrid/res/values/attrs.xml +++ b/astrid/res/values/attrs.xml @@ -24,12 +24,11 @@ - - + diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml index 22e56b191..c3c5a0bc0 100644 --- a/astrid/res/values/colors.xml +++ b/astrid/res/values/colors.xml @@ -28,6 +28,7 @@ #33b5e5 #d90000 + #1f78b4 #292929 #101010 #262626 diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 0a580a6f3..6d406e3bf 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -21,7 +21,6 @@ #888888 @drawable/plus_button_blue @drawable/mic_button_blue - @drawable/camera_button_blue @drawable/comment_blue #101010 @drawable/task_edit_background @@ -29,6 +28,7 @@ @drawable/menu_button_blue @color/blue_theme_color @drawable/lists_disclosure_blue + #000000 @drawable/taskedit_arrow_up_white @drawable/icn_edit_repeats_blue @@ -65,7 +65,6 @@ @drawable/ios_fabric_480 @drawable/plus_button_red @drawable/mic_button_red - @drawable/camera_button_red @drawable/comment_red @drawable/task_edit_background_white @drawable/custom_tab_indicator @@ -74,6 +73,7 @@ @drawable/lists_disclosure_red @drawable/taskedit_arrow_up_white @drawable/icn_edit_repeats_red + #ffffff @drawable/header_red @@ -82,14 +82,15 @@ @@ -191,7 +192,7 @@