Play Store changes
diff --git a/res/anim/peak_meter_1.xml b/res/anim/peak_meter_1.xml
deleted file mode 100644
index c9fbfde..0000000
--- a/res/anim/peak_meter_1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animation-list android:oneshot="false"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_1" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_2" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_2" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_5" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_2" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_1" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
-</animation-list>
diff --git a/res/anim/peak_meter_2.xml b/res/anim/peak_meter_2.xml
deleted file mode 100644
index 5601a21..0000000
--- a/res/anim/peak_meter_2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animation-list android:oneshot="false"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_1" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_2" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_1" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_2" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_3" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_2" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_4" />
- <item android:duration="@integer/peak" android:drawable="@drawable/indicator_playing_peak_meter_5" />
-</animation-list>
diff --git a/res/color/tab_text_color.xml b/res/color/tab_text_color.xml
deleted file mode 100644
index 569f1c3..0000000
--- a/res/color/tab_text_color.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:color="@color/black" />
- <item android:color="@color/transparent_black" />
-</selector>
diff --git a/res/drawable-hdpi-v11/appwidget_bg.9.png b/res/drawable-hdpi-v11/appwidget_bg.9.png
new file mode 100644
index 0000000..6bacc7f
--- /dev/null
+++ b/res/drawable-hdpi-v11/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi-v8/stat_notify_music.png b/res/drawable-hdpi-v8/stat_notify_music.png
new file mode 100644
index 0000000..0ddcf8e
--- /dev/null
+++ b/res/drawable-hdpi-v8/stat_notify_music.png
Binary files differ
diff --git a/res/drawable-hdpi-v9/stat_notify_music.png b/res/drawable-hdpi-v9/stat_notify_music.png
new file mode 100644
index 0000000..d6be948
--- /dev/null
+++ b/res/drawable-hdpi-v9/stat_notify_music.png
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_dark_overflow.png b/res/drawable-hdpi/apollo_holo_dark_overflow.png
deleted file mode 100644
index 38aadc6..0000000
--- a/res/drawable-hdpi/apollo_holo_dark_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_favorite_normal.png b/res/drawable-hdpi/apollo_holo_light_favorite_normal.png
deleted file mode 100644
index 98dd2ca..0000000
--- a/res/drawable-hdpi/apollo_holo_light_favorite_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_favorite_selected.png b/res/drawable-hdpi/apollo_holo_light_favorite_selected.png
deleted file mode 100644
index 861b898..0000000
--- a/res/drawable-hdpi/apollo_holo_light_favorite_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_next.png b/res/drawable-hdpi/apollo_holo_light_next.png
deleted file mode 100644
index b4f692f..0000000
--- a/res/drawable-hdpi/apollo_holo_light_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_overflow.png b/res/drawable-hdpi/apollo_holo_light_overflow.png
deleted file mode 100644
index 0c844f3..0000000
--- a/res/drawable-hdpi/apollo_holo_light_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_pause.png b/res/drawable-hdpi/apollo_holo_light_pause.png
deleted file mode 100644
index 9661cfb..0000000
--- a/res/drawable-hdpi/apollo_holo_light_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_play.png b/res/drawable-hdpi/apollo_holo_light_play.png
deleted file mode 100644
index e70f041..0000000
--- a/res/drawable-hdpi/apollo_holo_light_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_previous.png b/res/drawable-hdpi/apollo_holo_light_previous.png
deleted file mode 100644
index ba9d60c..0000000
--- a/res/drawable-hdpi/apollo_holo_light_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_repeat_all.png b/res/drawable-hdpi/apollo_holo_light_repeat_all.png
deleted file mode 100644
index bc4c95a..0000000
--- a/res/drawable-hdpi/apollo_holo_light_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_repeat_normal.png b/res/drawable-hdpi/apollo_holo_light_repeat_normal.png
deleted file mode 100644
index 8fc95ba..0000000
--- a/res/drawable-hdpi/apollo_holo_light_repeat_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_repeat_one.png b/res/drawable-hdpi/apollo_holo_light_repeat_one.png
deleted file mode 100644
index 4656cc0..0000000
--- a/res/drawable-hdpi/apollo_holo_light_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_search.png b/res/drawable-hdpi/apollo_holo_light_search.png
deleted file mode 100644
index e6b7045..0000000
--- a/res/drawable-hdpi/apollo_holo_light_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_shuffle_normal.png b/res/drawable-hdpi/apollo_holo_light_shuffle_normal.png
deleted file mode 100644
index 7397176..0000000
--- a/res/drawable-hdpi/apollo_holo_light_shuffle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_light_shuffle_on.png b/res/drawable-hdpi/apollo_holo_light_shuffle_on.png
deleted file mode 100644
index 1095fcc..0000000
--- a/res/drawable-hdpi/apollo_holo_light_shuffle_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/apollo_settings_themes.png b/res/drawable-hdpi/apollo_settings_themes.png
deleted file mode 100644
index a646ad5..0000000
--- a/res/drawable-hdpi/apollo_settings_themes.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
index 1783677..9739693 100644
--- a/res/drawable-hdpi/appwidget_bg.9.png
+++ b/res/drawable-hdpi/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/bg_stripes_dark.png b/res/drawable-hdpi/bg_stripes_dark.png
new file mode 100644
index 0000000..4b61fb2
--- /dev/null
+++ b/res/drawable-hdpi/bg_stripes_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_dark_notifiation_bar_collapse.png b/res/drawable-hdpi/btn_notification_collapse.png
similarity index 100%
rename from res/drawable-hdpi/apollo_holo_dark_notifiation_bar_collapse.png
rename to res/drawable-hdpi/btn_notification_collapse.png
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_dark_next.png b/res/drawable-hdpi/btn_playback_next.png
similarity index 100%
rename from res/drawable-hdpi/apollo_holo_dark_next.png
rename to res/drawable-hdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_dark_pause.png b/res/drawable-hdpi/btn_playback_pause.png
similarity index 100%
rename from res/drawable-hdpi/apollo_holo_dark_pause.png
rename to res/drawable-hdpi/btn_playback_pause.png
Binary files differ
diff --git a/res/drawable-hdpi/apollo_holo_dark_play.png b/res/drawable-hdpi/btn_playback_play.png
similarity index 100%
rename from res/drawable-hdpi/apollo_holo_dark_play.png
rename to res/drawable-hdpi/btn_playback_play.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_previous.png b/res/drawable-hdpi/btn_playback_previous.png
new file mode 100644
index 0000000..ba6c5ad
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_previous.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_repeat.png b/res/drawable-hdpi/btn_playback_repeat.png
new file mode 100644
index 0000000..fd84738
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_repeat.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_repeat_all.png b/res/drawable-hdpi/btn_playback_repeat_all.png
new file mode 100644
index 0000000..d665477
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_repeat_all.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_repeat_one.png b/res/drawable-hdpi/btn_playback_repeat_one.png
new file mode 100644
index 0000000..1a49b49
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_repeat_one.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_shuffle.png b/res/drawable-hdpi/btn_playback_shuffle.png
new file mode 100644
index 0000000..6504781
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_shuffle.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_shuffle_all.png b/res/drawable-hdpi/btn_playback_shuffle_all.png
new file mode 100644
index 0000000..ea3cd12
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_switch_queue.png b/res/drawable-hdpi/btn_switch_queue.png
new file mode 100644
index 0000000..740e55b
--- /dev/null
+++ b/res/drawable-hdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-hdpi/colorstrip_shadow.9.png b/res/drawable-hdpi/colorstrip_shadow.9.png
deleted file mode 100644
index 285f123..0000000
--- a/res/drawable-hdpi/colorstrip_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png b/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png
deleted file mode 100644
index d362ec1..0000000
--- a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_favorite.png b/res/drawable-hdpi/ic_action_favorite.png
new file mode 100644
index 0000000..6678536
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_favorite.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_pinn_to_home.png b/res/drawable-hdpi/ic_action_pinn_to_home.png
new file mode 100644
index 0000000..e6c7bf3
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_pinn_to_home.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_overflow.png b/res/drawable-hdpi/ic_action_search.png
similarity index 85%
copy from res/drawable-mdpi/apollo_holo_light_overflow.png
copy to res/drawable-hdpi/ic_action_search.png
index 493e1f1..67de12d 100644
--- a/res/drawable-mdpi/apollo_holo_light_overflow.png
+++ b/res/drawable-hdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_shop.png b/res/drawable-hdpi/ic_action_shop.png
new file mode 100644
index 0000000..c8c5bc9
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_shop.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index b0006c9..dd0ff7d 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-hdpi/indicator_playing_peak_meter_1.png b/res/drawable-hdpi/indicator_playing_peak_meter_1.png
deleted file mode 100644
index 7539244..0000000
--- a/res/drawable-hdpi/indicator_playing_peak_meter_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/indicator_playing_peak_meter_2.png b/res/drawable-hdpi/indicator_playing_peak_meter_2.png
deleted file mode 100644
index 289855e..0000000
--- a/res/drawable-hdpi/indicator_playing_peak_meter_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/indicator_playing_peak_meter_3.png b/res/drawable-hdpi/indicator_playing_peak_meter_3.png
deleted file mode 100644
index af883b3..0000000
--- a/res/drawable-hdpi/indicator_playing_peak_meter_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/indicator_playing_peak_meter_4.png b/res/drawable-hdpi/indicator_playing_peak_meter_4.png
deleted file mode 100644
index 3af8e7d..0000000
--- a/res/drawable-hdpi/indicator_playing_peak_meter_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/indicator_playing_peak_meter_5.png b/res/drawable-hdpi/indicator_playing_peak_meter_5.png
deleted file mode 100644
index eebba7c..0000000
--- a/res/drawable-hdpi/indicator_playing_peak_meter_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_section_divider_holo_custom.9.png b/res/drawable-hdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 1e3e778..0000000
--- a/res/drawable-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/res/drawable-hdpi/notify_panel_notification_icon_bg.png
deleted file mode 100644
index 6f37a22..0000000
--- a/res/drawable-hdpi/notify_panel_notification_icon_bg.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/playlist_tile_normal.9.png b/res/drawable-hdpi/playlist_tile_normal.9.png
new file mode 100644
index 0000000..c6726bc
--- /dev/null
+++ b/res/drawable-hdpi/playlist_tile_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi/queue_thumbnail_bg.9.png b/res/drawable-hdpi/queue_thumbnail_bg.9.png
deleted file mode 100644
index d000f7e..0000000
--- a/res/drawable-hdpi/queue_thumbnail_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/recents_thumbnail_bg_press.9.png b/res/drawable-hdpi/recents_thumbnail_bg_press.9.png
deleted file mode 100644
index 288d818..0000000
--- a/res/drawable-hdpi/recents_thumbnail_bg_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/scrubber_primary_holo.9.png b/res/drawable-hdpi/scrubber_primary_holo.9.png
new file mode 100644
index 0000000..eb8b3ab
--- /dev/null
+++ b/res/drawable-hdpi/scrubber_primary_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/scrubber_secondary_holo.9.png b/res/drawable-hdpi/scrubber_secondary_holo.9.png
new file mode 100644
index 0000000..3a0ca29
--- /dev/null
+++ b/res/drawable-hdpi/scrubber_secondary_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/scrubber_track_holo_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark.9.png
new file mode 100644
index 0000000..0c0ccda
--- /dev/null
+++ b/res/drawable-hdpi/scrubber_track_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_holo.9.png b/res/drawable-hdpi/tab_selected_holo.9.png
deleted file mode 100644
index b9801b0..0000000
--- a/res/drawable-hdpi/tab_selected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png
deleted file mode 100644
index 296613b..0000000
--- a/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_pressed_holo.9.png b/res/drawable-hdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index 6c0e61e..0000000
--- a/res/drawable-hdpi/tab_selected_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_focused_holo.9.png b/res/drawable-hdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index 9967301..0000000
--- a/res/drawable-hdpi/tab_unselected_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_holo.9.png b/res/drawable-hdpi/tab_unselected_holo.9.png
deleted file mode 100644
index 1070d6a..0000000
--- a/res/drawable-hdpi/tab_unselected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_pressed_holo.9.png b/res/drawable-hdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index 2b6bdac..0000000
--- a/res/drawable-hdpi/tab_unselected_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/title_bar_shadow.9.png b/res/drawable-hdpi/title_bar_shadow.9.png
deleted file mode 100644
index e106a4c..0000000
--- a/res/drawable-hdpi/title_bar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/view_pager_background_texture.png b/res/drawable-hdpi/view_pager_background_texture.png
new file mode 100644
index 0000000..e8cd304
--- /dev/null
+++ b/res/drawable-hdpi/view_pager_background_texture.png
Binary files differ
diff --git a/res/drawable-mdpi-v11/appwidget_bg.9.png b/res/drawable-mdpi-v11/appwidget_bg.9.png
new file mode 100644
index 0000000..09309a9
--- /dev/null
+++ b/res/drawable-mdpi-v11/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_dark_overflow.png b/res/drawable-mdpi/apollo_holo_dark_overflow.png
deleted file mode 100644
index c37420e..0000000
--- a/res/drawable-mdpi/apollo_holo_dark_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_favorite_normal.png b/res/drawable-mdpi/apollo_holo_light_favorite_normal.png
deleted file mode 100644
index f4838d4..0000000
--- a/res/drawable-mdpi/apollo_holo_light_favorite_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_favorite_selected.png b/res/drawable-mdpi/apollo_holo_light_favorite_selected.png
deleted file mode 100644
index 55e1d3b..0000000
--- a/res/drawable-mdpi/apollo_holo_light_favorite_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_next.png b/res/drawable-mdpi/apollo_holo_light_next.png
deleted file mode 100644
index 937e029..0000000
--- a/res/drawable-mdpi/apollo_holo_light_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_pause.png b/res/drawable-mdpi/apollo_holo_light_pause.png
deleted file mode 100644
index 01858e3..0000000
--- a/res/drawable-mdpi/apollo_holo_light_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_play.png b/res/drawable-mdpi/apollo_holo_light_play.png
deleted file mode 100644
index 1e3bc97..0000000
--- a/res/drawable-mdpi/apollo_holo_light_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_previous.png b/res/drawable-mdpi/apollo_holo_light_previous.png
deleted file mode 100644
index 4e2b588..0000000
--- a/res/drawable-mdpi/apollo_holo_light_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_repeat_all.png b/res/drawable-mdpi/apollo_holo_light_repeat_all.png
deleted file mode 100644
index 4880369..0000000
--- a/res/drawable-mdpi/apollo_holo_light_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_repeat_normal.png b/res/drawable-mdpi/apollo_holo_light_repeat_normal.png
deleted file mode 100644
index a6e8935..0000000
--- a/res/drawable-mdpi/apollo_holo_light_repeat_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_repeat_one.png b/res/drawable-mdpi/apollo_holo_light_repeat_one.png
deleted file mode 100644
index 8889d93..0000000
--- a/res/drawable-mdpi/apollo_holo_light_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_search.png b/res/drawable-mdpi/apollo_holo_light_search.png
deleted file mode 100644
index 3aa6440..0000000
--- a/res/drawable-mdpi/apollo_holo_light_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_shuffle_normal.png b/res/drawable-mdpi/apollo_holo_light_shuffle_normal.png
deleted file mode 100644
index 5fd81e5..0000000
--- a/res/drawable-mdpi/apollo_holo_light_shuffle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_shuffle_on.png b/res/drawable-mdpi/apollo_holo_light_shuffle_on.png
deleted file mode 100644
index 86c608a..0000000
--- a/res/drawable-mdpi/apollo_holo_light_shuffle_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_settings_themes.png b/res/drawable-mdpi/apollo_settings_themes.png
deleted file mode 100644
index a5ae584..0000000
--- a/res/drawable-mdpi/apollo_settings_themes.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
index 2ae3070..4523c65 100644
--- a/res/drawable-mdpi/appwidget_bg.9.png
+++ b/res/drawable-mdpi/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/bg_stripes_dark.png b/res/drawable-mdpi/bg_stripes_dark.png
new file mode 100644
index 0000000..4b61fb2
--- /dev/null
+++ b/res/drawable-mdpi/bg_stripes_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_dark_notifiation_bar_collapse.png b/res/drawable-mdpi/btn_notification_collapse.png
similarity index 100%
rename from res/drawable-mdpi/apollo_holo_dark_notifiation_bar_collapse.png
rename to res/drawable-mdpi/btn_notification_collapse.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_dark_next.png b/res/drawable-mdpi/btn_playback_next.png
similarity index 100%
rename from res/drawable-mdpi/apollo_holo_dark_next.png
rename to res/drawable-mdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_dark_pause.png b/res/drawable-mdpi/btn_playback_pause.png
similarity index 100%
rename from res/drawable-mdpi/apollo_holo_dark_pause.png
rename to res/drawable-mdpi/btn_playback_pause.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_dark_play.png b/res/drawable-mdpi/btn_playback_play.png
similarity index 100%
rename from res/drawable-mdpi/apollo_holo_dark_play.png
rename to res/drawable-mdpi/btn_playback_play.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_previous.png b/res/drawable-mdpi/btn_playback_previous.png
new file mode 100644
index 0000000..6c67842
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_previous.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_repeat.png b/res/drawable-mdpi/btn_playback_repeat.png
new file mode 100644
index 0000000..685609c
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_repeat.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_repeat_all.png b/res/drawable-mdpi/btn_playback_repeat_all.png
new file mode 100644
index 0000000..e708613
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_repeat_all.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_repeat_one.png b/res/drawable-mdpi/btn_playback_repeat_one.png
new file mode 100644
index 0000000..1c51450
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_repeat_one.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_shuffle.png b/res/drawable-mdpi/btn_playback_shuffle.png
new file mode 100644
index 0000000..fbbffa5
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_shuffle.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_shuffle_all.png b/res/drawable-mdpi/btn_playback_shuffle_all.png
new file mode 100644
index 0000000..fc687d1
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_switch_queue.png b/res/drawable-mdpi/btn_switch_queue.png
new file mode 100644
index 0000000..206dd48
--- /dev/null
+++ b/res/drawable-mdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png b/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png
deleted file mode 100644
index c3fdef7..0000000
--- a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_favorite.png b/res/drawable-mdpi/ic_action_favorite.png
new file mode 100644
index 0000000..f62b665
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_favorite.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_pinn_to_home.png b/res/drawable-mdpi/ic_action_pinn_to_home.png
new file mode 100644
index 0000000..de9a29e
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_pinn_to_home.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_overflow.png b/res/drawable-mdpi/ic_action_search.png
similarity index 88%
rename from res/drawable-mdpi/apollo_holo_light_overflow.png
rename to res/drawable-mdpi/ic_action_search.png
index 493e1f1..134d549 100644
--- a/res/drawable-mdpi/apollo_holo_light_overflow.png
+++ b/res/drawable-mdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_shop.png b/res/drawable-mdpi/ic_action_shop.png
new file mode 100644
index 0000000..29a47d0
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_shop.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index 34ebfd0..0352727 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-mdpi/indicator_playing_peak_meter_1.png b/res/drawable-mdpi/indicator_playing_peak_meter_1.png
deleted file mode 100644
index 68013aa..0000000
--- a/res/drawable-mdpi/indicator_playing_peak_meter_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/indicator_playing_peak_meter_2.png b/res/drawable-mdpi/indicator_playing_peak_meter_2.png
deleted file mode 100644
index 4937611..0000000
--- a/res/drawable-mdpi/indicator_playing_peak_meter_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/indicator_playing_peak_meter_3.png b/res/drawable-mdpi/indicator_playing_peak_meter_3.png
deleted file mode 100644
index af6aa3d..0000000
--- a/res/drawable-mdpi/indicator_playing_peak_meter_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/indicator_playing_peak_meter_4.png b/res/drawable-mdpi/indicator_playing_peak_meter_4.png
deleted file mode 100644
index b7f92cd..0000000
--- a/res/drawable-mdpi/indicator_playing_peak_meter_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/indicator_playing_peak_meter_5.png b/res/drawable-mdpi/indicator_playing_peak_meter_5.png
deleted file mode 100644
index 98c1f10..0000000
--- a/res/drawable-mdpi/indicator_playing_peak_meter_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_section_divider_holo_custom.9.png b/res/drawable-mdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 1d8fd09..0000000
--- a/res/drawable-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/notify_panel_notification_icon_bg.png b/res/drawable-mdpi/notify_panel_notification_icon_bg.png
deleted file mode 100644
index 8fbf4bb..0000000
--- a/res/drawable-mdpi/notify_panel_notification_icon_bg.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/playlist_tile_normal.9.png b/res/drawable-mdpi/playlist_tile_normal.9.png
new file mode 100644
index 0000000..3d2cebf
--- /dev/null
+++ b/res/drawable-mdpi/playlist_tile_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi/queue_thumbnail_bg.9.png b/res/drawable-mdpi/queue_thumbnail_bg.9.png
deleted file mode 100644
index f19dc93..0000000
--- a/res/drawable-mdpi/queue_thumbnail_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/recents_thumbnail_bg_press.9.png b/res/drawable-mdpi/recents_thumbnail_bg_press.9.png
deleted file mode 100644
index 10e4fd2..0000000
--- a/res/drawable-mdpi/recents_thumbnail_bg_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/scrubber_primary_holo.9.png b/res/drawable-mdpi/scrubber_primary_holo.9.png
new file mode 100644
index 0000000..aa2e382
--- /dev/null
+++ b/res/drawable-mdpi/scrubber_primary_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/scrubber_secondary_holo.9.png b/res/drawable-mdpi/scrubber_secondary_holo.9.png
new file mode 100644
index 0000000..9a2f058
--- /dev/null
+++ b/res/drawable-mdpi/scrubber_secondary_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/scrubber_track_holo_dark.9.png b/res/drawable-mdpi/scrubber_track_holo_dark.9.png
new file mode 100644
index 0000000..b91a4ee
--- /dev/null
+++ b/res/drawable-mdpi/scrubber_track_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_holo.9.png b/res/drawable-mdpi/tab_selected_holo.9.png
deleted file mode 100644
index ec093fe..0000000
--- a/res/drawable-mdpi/tab_selected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png
deleted file mode 100644
index 4dda20b..0000000
--- a/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_pressed_holo.9.png b/res/drawable-mdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index 2b338ba..0000000
--- a/res/drawable-mdpi/tab_selected_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_focused_holo.9.png b/res/drawable-mdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index d25a427..0000000
--- a/res/drawable-mdpi/tab_unselected_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_holo.9.png b/res/drawable-mdpi/tab_unselected_holo.9.png
deleted file mode 100644
index 90a94d7..0000000
--- a/res/drawable-mdpi/tab_unselected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_pressed_holo.9.png b/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index 8f666ba..0000000
--- a/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/title_bar_shadow.9.png b/res/drawable-mdpi/title_bar_shadow.9.png
deleted file mode 100644
index 3b7cf57..0000000
--- a/res/drawable-mdpi/title_bar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/view_pager_background_texture.png b/res/drawable-mdpi/view_pager_background_texture.png
new file mode 100644
index 0000000..60bbbba
--- /dev/null
+++ b/res/drawable-mdpi/view_pager_background_texture.png
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_large.png b/res/drawable-nodpi/app_widget_large.png
new file mode 100644
index 0000000..db2c003
--- /dev/null
+++ b/res/drawable-nodpi/app_widget_large.png
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_large_alternate.png b/res/drawable-nodpi/app_widget_large_alternate.png
new file mode 100644
index 0000000..ad37031
--- /dev/null
+++ b/res/drawable-nodpi/app_widget_large_alternate.png
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_recents.png b/res/drawable-nodpi/app_widget_recents.png
new file mode 100644
index 0000000..ecf7be1
--- /dev/null
+++ b/res/drawable-nodpi/app_widget_recents.png
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_recents_stack_preview.png b/res/drawable-nodpi/app_widget_recents_stack_preview.png
new file mode 100644
index 0000000..a8f7af7
--- /dev/null
+++ b/res/drawable-nodpi/app_widget_recents_stack_preview.png
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_small.png b/res/drawable-nodpi/app_widget_small.png
new file mode 100644
index 0000000..ad3cc11
--- /dev/null
+++ b/res/drawable-nodpi/app_widget_small.png
Binary files differ
diff --git a/res/drawable-nodpi/background_holo_dark.png b/res/drawable-nodpi/background_holo_dark.png
new file mode 100644
index 0000000..85bd6f7
--- /dev/null
+++ b/res/drawable-nodpi/background_holo_dark.png
Binary files differ
diff --git a/res/drawable-nodpi/colorstrip_shadow.9.png b/res/drawable-nodpi/colorstrip_shadow.9.png
deleted file mode 100644
index 285f123..0000000
--- a/res/drawable-nodpi/colorstrip_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/default_artwork.png b/res/drawable-nodpi/default_artwork.png
new file mode 100644
index 0000000..269c8de
--- /dev/null
+++ b/res/drawable-nodpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-nodpi/header_temp.png b/res/drawable-nodpi/header_temp.png
new file mode 100644
index 0000000..95f66d9
--- /dev/null
+++ b/res/drawable-nodpi/header_temp.png
Binary files differ
diff --git a/res/drawable-nodpi/promo.png b/res/drawable-nodpi/promo.png
deleted file mode 100644
index 651f5eb..0000000
--- a/res/drawable-nodpi/promo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/theme_preview.png b/res/drawable-nodpi/theme_preview.png
new file mode 100644
index 0000000..d94bb0b
--- /dev/null
+++ b/res/drawable-nodpi/theme_preview.png
Binary files differ
diff --git a/res/drawable-v14/pager_background.xml b/res/drawable-v14/pager_background.xml
new file mode 100644
index 0000000..ac03fea
--- /dev/null
+++ b/res/drawable-v14/pager_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/view_pager_background_texture"
+ android:tileMode="repeat" />
diff --git a/res/drawable-v14/tpi_background.xml b/res/drawable-v14/tpi_background.xml
new file mode 100644
index 0000000..d96958b
--- /dev/null
+++ b/res/drawable-v14/tpi_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/bg_stripes_dark"
+ android:tileMode="repeat" />
diff --git a/res/drawable-xhdpi-v11/appwidget_bg.9.png b/res/drawable-xhdpi-v11/appwidget_bg.9.png
new file mode 100644
index 0000000..900859c
--- /dev/null
+++ b/res/drawable-xhdpi-v11/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_dark_overflow.png b/res/drawable-xhdpi/apollo_holo_dark_overflow.png
deleted file mode 100644
index 3a48be2..0000000
--- a/res/drawable-xhdpi/apollo_holo_dark_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_favorite_normal.png b/res/drawable-xhdpi/apollo_holo_light_favorite_normal.png
deleted file mode 100644
index e6acafd..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_favorite_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_favorite_selected.png b/res/drawable-xhdpi/apollo_holo_light_favorite_selected.png
deleted file mode 100644
index 767bf0d..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_favorite_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_next.png b/res/drawable-xhdpi/apollo_holo_light_next.png
deleted file mode 100644
index 61b8d59..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_overflow.png b/res/drawable-xhdpi/apollo_holo_light_overflow.png
deleted file mode 100644
index 9a62ae0..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_pause.png b/res/drawable-xhdpi/apollo_holo_light_pause.png
deleted file mode 100644
index 97d6f91..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_play.png b/res/drawable-xhdpi/apollo_holo_light_play.png
deleted file mode 100644
index 2d67d31..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_previous.png b/res/drawable-xhdpi/apollo_holo_light_previous.png
deleted file mode 100644
index 5ba8441..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_repeat_all.png b/res/drawable-xhdpi/apollo_holo_light_repeat_all.png
deleted file mode 100644
index 1cc1063..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_repeat_normal.png b/res/drawable-xhdpi/apollo_holo_light_repeat_normal.png
deleted file mode 100644
index 468415a..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_repeat_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_repeat_one.png b/res/drawable-xhdpi/apollo_holo_light_repeat_one.png
deleted file mode 100644
index d9d4c20..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_search.png b/res/drawable-xhdpi/apollo_holo_light_search.png
deleted file mode 100644
index 804420a..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_shuffle_normal.png b/res/drawable-xhdpi/apollo_holo_light_shuffle_normal.png
deleted file mode 100644
index eee9d97..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_shuffle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_light_shuffle_on.png b/res/drawable-xhdpi/apollo_holo_light_shuffle_on.png
deleted file mode 100644
index 6b7468d..0000000
--- a/res/drawable-xhdpi/apollo_holo_light_shuffle_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_settings_themes.png b/res/drawable-xhdpi/apollo_settings_themes.png
deleted file mode 100644
index 57dd2a5..0000000
--- a/res/drawable-xhdpi/apollo_settings_themes.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg.9.png b/res/drawable-xhdpi/appwidget_bg.9.png
index 909f498..4523c65 100644
--- a/res/drawable-xhdpi/appwidget_bg.9.png
+++ b/res/drawable-xhdpi/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/bg_stripes_dark.png b/res/drawable-xhdpi/bg_stripes_dark.png
new file mode 100644
index 0000000..76aab7c
--- /dev/null
+++ b/res/drawable-xhdpi/bg_stripes_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_dark_notifiation_bar_collapse.png b/res/drawable-xhdpi/btn_notification_collapse.png
similarity index 100%
rename from res/drawable-xhdpi/apollo_holo_dark_notifiation_bar_collapse.png
rename to res/drawable-xhdpi/btn_notification_collapse.png
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_dark_next.png b/res/drawable-xhdpi/btn_playback_next.png
similarity index 100%
rename from res/drawable-xhdpi/apollo_holo_dark_next.png
rename to res/drawable-xhdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_dark_pause.png b/res/drawable-xhdpi/btn_playback_pause.png
similarity index 100%
rename from res/drawable-xhdpi/apollo_holo_dark_pause.png
rename to res/drawable-xhdpi/btn_playback_pause.png
Binary files differ
diff --git a/res/drawable-xhdpi/apollo_holo_dark_play.png b/res/drawable-xhdpi/btn_playback_play.png
similarity index 100%
rename from res/drawable-xhdpi/apollo_holo_dark_play.png
rename to res/drawable-xhdpi/btn_playback_play.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_previous.png b/res/drawable-xhdpi/btn_playback_previous.png
new file mode 100644
index 0000000..5be8b46
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_previous.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_repeat.png b/res/drawable-xhdpi/btn_playback_repeat.png
new file mode 100644
index 0000000..b72f10d
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_repeat.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_repeat_all.png b/res/drawable-xhdpi/btn_playback_repeat_all.png
new file mode 100644
index 0000000..963be39
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_repeat_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_repeat_one.png b/res/drawable-xhdpi/btn_playback_repeat_one.png
new file mode 100644
index 0000000..7c1b347
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_repeat_one.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_shuffle.png b/res/drawable-xhdpi/btn_playback_shuffle.png
new file mode 100644
index 0000000..b5cae4f
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_shuffle.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_shuffle_all.png b/res/drawable-xhdpi/btn_playback_shuffle_all.png
new file mode 100644
index 0000000..ad17616
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_switch_queue.png b/res/drawable-xhdpi/btn_switch_queue.png
new file mode 100644
index 0000000..37b292d
--- /dev/null
+++ b/res/drawable-xhdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png b/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png
deleted file mode 100644
index 36d8cf4..0000000
--- a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_overflow.png b/res/drawable-xhdpi/ic_action_favorite.png
similarity index 73%
copy from res/drawable-mdpi/apollo_holo_light_overflow.png
copy to res/drawable-xhdpi/ic_action_favorite.png
index 493e1f1..a4acf1b 100644
--- a/res/drawable-mdpi/apollo_holo_light_overflow.png
+++ b/res/drawable-xhdpi/ic_action_favorite.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_pinn_to_home.png b/res/drawable-xhdpi/ic_action_pinn_to_home.png
new file mode 100644
index 0000000..6b197c3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_pinn_to_home.png
Binary files differ
diff --git a/res/drawable-mdpi/apollo_holo_light_overflow.png b/res/drawable-xhdpi/ic_action_search.png
similarity index 83%
copy from res/drawable-mdpi/apollo_holo_light_overflow.png
copy to res/drawable-xhdpi/ic_action_search.png
index 493e1f1..d699c6b 100644
--- a/res/drawable-mdpi/apollo_holo_light_overflow.png
+++ b/res/drawable-xhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_shop.png b/res/drawable-xhdpi/ic_action_shop.png
new file mode 100644
index 0000000..8df476a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_shop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index d22f8f3..f593286 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/indicator_playing_peak_meter_1.png b/res/drawable-xhdpi/indicator_playing_peak_meter_1.png
deleted file mode 100644
index b5c524e..0000000
--- a/res/drawable-xhdpi/indicator_playing_peak_meter_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/indicator_playing_peak_meter_2.png b/res/drawable-xhdpi/indicator_playing_peak_meter_2.png
deleted file mode 100644
index 6f48de3..0000000
--- a/res/drawable-xhdpi/indicator_playing_peak_meter_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/indicator_playing_peak_meter_3.png b/res/drawable-xhdpi/indicator_playing_peak_meter_3.png
deleted file mode 100644
index 485f52c..0000000
--- a/res/drawable-xhdpi/indicator_playing_peak_meter_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/indicator_playing_peak_meter_4.png b/res/drawable-xhdpi/indicator_playing_peak_meter_4.png
deleted file mode 100644
index a148d0e..0000000
--- a/res/drawable-xhdpi/indicator_playing_peak_meter_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/indicator_playing_peak_meter_5.png b/res/drawable-xhdpi/indicator_playing_peak_meter_5.png
deleted file mode 100644
index e85552c..0000000
--- a/res/drawable-xhdpi/indicator_playing_peak_meter_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_section_divider_holo_custom.9.png b/res/drawable-xhdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 0bd8a0f..0000000
--- a/res/drawable-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/notify_panel_notification_icon_bg.png b/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
deleted file mode 100644
index adbe4d2..0000000
--- a/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/playlist_tile_normal.9.png b/res/drawable-xhdpi/playlist_tile_normal.9.png
new file mode 100644
index 0000000..296399c
--- /dev/null
+++ b/res/drawable-xhdpi/playlist_tile_normal.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/queue_thumbnail_bg.9.png b/res/drawable-xhdpi/queue_thumbnail_bg.9.png
deleted file mode 100644
index 80fc849..0000000
--- a/res/drawable-xhdpi/queue_thumbnail_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png b/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png
deleted file mode 100644
index 5bae56d..0000000
--- a/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/scrubber_primary_holo.9.png b/res/drawable-xhdpi/scrubber_primary_holo.9.png
new file mode 100644
index 0000000..0fc5305
--- /dev/null
+++ b/res/drawable-xhdpi/scrubber_primary_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/scrubber_secondary_holo.9.png b/res/drawable-xhdpi/scrubber_secondary_holo.9.png
new file mode 100644
index 0000000..1c356da
--- /dev/null
+++ b/res/drawable-xhdpi/scrubber_secondary_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/scrubber_track_holo_dark.9.png b/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
new file mode 100644
index 0000000..bfb2048
--- /dev/null
+++ b/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/tab_selected_holo.9.png b/res/drawable-xhdpi/tab_selected_holo.9.png
deleted file mode 100644
index 1d66449..0000000
--- a/res/drawable-xhdpi/tab_selected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-xhdpi/tab_selected_pressed_focused_holo.9.png
deleted file mode 100644
index e9f327f..0000000
--- a/res/drawable-xhdpi/tab_selected_pressed_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/tab_selected_pressed_holo.9.png b/res/drawable-xhdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index 79a1e0a..0000000
--- a/res/drawable-xhdpi/tab_selected_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/tab_unselected_focused_holo.9.png b/res/drawable-xhdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index 823638f..0000000
--- a/res/drawable-xhdpi/tab_unselected_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/tab_unselected_holo.9.png b/res/drawable-xhdpi/tab_unselected_holo.9.png
deleted file mode 100644
index 244f04b..0000000
--- a/res/drawable-xhdpi/tab_unselected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png b/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index a75e182..0000000
--- a/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/title_bar_shadow.9.png b/res/drawable-xhdpi/title_bar_shadow.9.png
deleted file mode 100644
index 45b5456..0000000
--- a/res/drawable-xhdpi/title_bar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/view_pager_background_texture.png b/res/drawable-xhdpi/view_pager_background_texture.png
new file mode 100644
index 0000000..8b85814
--- /dev/null
+++ b/res/drawable-xhdpi/view_pager_background_texture.png
Binary files differ
diff --git a/res/drawable/action_bar.xml b/res/drawable/action_bar.xml
new file mode 100644
index 0000000..eb2c17e
--- /dev/null
+++ b/res/drawable/action_bar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@color/action_bar"></item>
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable/audio_player_pager_container.xml b/res/drawable/audio_player_pager_container.xml
new file mode 100644
index 0000000..eb2c17e
--- /dev/null
+++ b/res/drawable/audio_player_pager_container.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@color/action_bar"></item>
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable/audio_player_seekbar.xml b/res/drawable/audio_player_seekbar.xml
new file mode 100644
index 0000000..db3416a
--- /dev/null
+++ b/res/drawable/audio_player_seekbar.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@android:id/background"
+ android:drawable="@drawable/scrubber_track_holo_dark"/>
+ <item android:id="@android:id/secondaryProgress">
+ <scale
+ android:drawable="@drawable/scrubber_secondary_holo"
+ android:scaleWidth="100%" />
+ </item>
+ <item android:id="@android:id/progress">
+ <scale
+ android:drawable="@drawable/scrubber_primary_holo"
+ android:scaleWidth="100%" />
+ </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/bottom_action_bar.xml b/res/drawable/bottom_action_bar.xml
new file mode 100644
index 0000000..2fceb5c
--- /dev/null
+++ b/res/drawable/bottom_action_bar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@color/bottom_action_bar"></item>
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable/bottom_shadow.xml b/res/drawable/bottom_shadow.xml
new file mode 100644
index 0000000..f6cb3f5
--- /dev/null
+++ b/res/drawable/bottom_shadow.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <gradient
+ android:angle="90.0"
+ android:endColor="@color/transparent"
+ android:startColor="@color/black" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/holo_selector.xml b/res/drawable/holo_selector.xml
deleted file mode 100644
index 46330f1..0000000
--- a/res/drawable/holo_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-
- <item android:drawable="@color/holo_blue_dark" android:state_pressed="true"/>
- <item android:drawable="@color/holo_blue_dark" android:state_enabled="true" android:state_focused="true"/>
- <item android:drawable="@color/transparent"/>
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/pager_background.xml b/res/drawable/pager_background.xml
new file mode 100644
index 0000000..559b986
--- /dev/null
+++ b/res/drawable/pager_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/background_holo_dark" />
diff --git a/res/drawable/queue_thumbnail_fg.xml b/res/drawable/queue_thumbnail_fg.xml
deleted file mode 100644
index d1201c9..0000000
--- a/res/drawable/queue_thumbnail_fg.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_selected="true"/>
- <item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_pressed="true"/>
- <item android:drawable="@color/transparent"/>
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/right_shadow.xml b/res/drawable/right_shadow.xml
new file mode 100644
index 0000000..e22eee1
--- /dev/null
+++ b/res/drawable/right_shadow.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <gradient
+ android:angle="180"
+ android:endColor="@color/transparent"
+ android:startColor="@color/black" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/status_bg.xml b/res/drawable/status_bg.xml
deleted file mode 100644
index 99e5ea6..0000000
--- a/res/drawable/status_bg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/notify_panel_notification_icon_bg"
- android:tileMode="repeat" />
diff --git a/res/drawable/tab.xml b/res/drawable/tab.xml
deleted file mode 100644
index a6e1b55..0000000
--- a/res/drawable/tab.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/tab_unselected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
- <item android:drawable="@drawable/tab_selected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
- <item android:drawable="@drawable/tab_unselected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
- <item android:drawable="@drawable/tab_unselected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
- <item android:drawable="@drawable/tab_selected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
- <item android:drawable="@drawable/tab_selected_pressed_focused_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/top_shadow.xml b/res/drawable/top_shadow.xml
new file mode 100644
index 0000000..59e060b
--- /dev/null
+++ b/res/drawable/top_shadow.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <gradient
+ android:angle="270"
+ android:endColor="@color/transparent"
+ android:startColor="@color/black" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/tpi_background.xml b/res/drawable/tpi_background.xml
new file mode 100644
index 0000000..cf8d123
--- /dev/null
+++ b/res/drawable/tpi_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<color xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/action_bar_color" />
diff --git a/res/drawable/viewpager_margin.xml b/res/drawable/viewpager_margin.xml
deleted file mode 100644
index 850607c..0000000
--- a/res/drawable/viewpager_margin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
-
- <solid android:color="@color/transparent" />
-
- <stroke
- android:width="@dimen/viewpager_margin_stroke_width"
- android:color="@color/transparent_black" />
-
-</shape>
\ No newline at end of file
diff --git a/res/layout-land/activity_player_base.xml b/res/layout-land/activity_player_base.xml
new file mode 100644
index 0000000..ac0e480
--- /dev/null
+++ b/res/layout-land/activity_player_base.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.theme.ThemeableFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <RelativeLayout
+ android:id="@+id/audio_player_large_album_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_album_art"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:scaleType="fitXY" />
+
+ <ImageView
+ android:layout_width="@dimen/shadow_height"
+ android:layout_height="match_parent"
+ android:layout_alignRight="@+id/audio_player_album_art"
+ android:contentDescription="@null"
+ android:src="@drawable/right_shadow" />
+ </RelativeLayout>
+
+ <FrameLayout
+ android:id="@+id/audio_player_pager_container"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignRight="@+id/audio_player_large_album_frame"
+ android:visibility="invisible" >
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/audio_player_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:layout_width="@dimen/shadow_height"
+ android:layout_height="match_parent"
+ android:layout_gravity="right"
+ android:contentDescription="@null"
+ android:src="@drawable/right_shadow" />
+ </FrameLayout>
+
+ <View
+ android:id="@+id/audio_player_footer"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/audio_player_large_album_frame" />
+
+ <LinearLayout
+ android:id="@+id/audio_player_header"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/audio_player_header_height"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_toRightOf="@+id/audio_player_large_album_frame"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ android:padding="0dp" >
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:baselineAligned="false"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/audio_player_header_padding_left"
+ android:paddingRight="@dimen/audio_player_header_padding_right" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_track_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="bottom"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="audio_player_line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_artist_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="top"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ app:themeResource="audio_player_line_two" />
+ </LinearLayout>
+
+ <FrameLayout
+ android:id="@+id/audio_player_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:padding="@dimen/audio_player_switch_padding" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_switch_queue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:contentDescription="@null" />
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_switch_album_art"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:visibility="invisible" />
+ </FrameLayout>
+ </LinearLayout>
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_current_time"
+ android:layout_width="@dimen/audio_player_time_width"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@android:id/progress"
+ android:layout_alignTop="@android:id/progress"
+ android:layout_toRightOf="@+id/audio_player_large_album_frame"
+ android:gravity="center"
+ android:textSize="@dimen/text_size_micro"
+ app:themeResource="audio_player_current_time" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_total_time"
+ android:layout_width="@dimen/audio_player_time_width"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@android:id/progress"
+ android:layout_alignParentRight="true"
+ android:layout_alignTop="@android:id/progress"
+ android:gravity="center"
+ android:textSize="@dimen/text_size_micro"
+ app:themeResource="audio_player_total_time" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableSeekBar
+ android:id="@android:id/progress"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/audio_player_controlss"
+ android:layout_marginBottom="@dimen/audio_player_seek_bar_margin_bottom"
+ android:layout_toLeftOf="@+id/audio_player_total_time"
+ android:layout_toRightOf="@+id/audio_player_current_time"
+ android:background="@null"
+ android:max="1000"
+ android:thumb="@null" />
+
+ <LinearLayout
+ android:id="@+id/audio_player_controlss"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/audio_player_large_album_frame"
+ android:baselineAligned="false" >
+
+ <include layout="@layout/audio_player_controls" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <include layout="@layout/colorstrip" />
+
+</com.andrew.apollo.widgets.theme.ThemeableFrameLayout>
\ No newline at end of file
diff --git a/res/layout-v11/app_widget_recents.xml b/res/layout-v11/app_widget_recents.xml
new file mode 100644
index 0000000..54ce198
--- /dev/null
+++ b/res/layout-v11/app_widget_recents.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="0dp"
+ android:background="@color/action_bar_color" >
+
+ <RelativeLayout
+ android:id="@+id/app_widget_recents_action_bar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/app_widget_recents_action_bar_height" >
+
+ <ImageView
+ android:id="@+id/app_widget_recents_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/app_name"
+ android:padding="@dimen/app_widget_recents_action_bar_item_padding"
+ android:scaleType="centerInside"
+ android:src="@drawable/ic_launcher" />
+
+ <TextView
+ android:id="@+id/app_widget_recents_app_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/app_widget_recents_icon"
+ android:text="@string/page_recent"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium" />
+
+ <ImageButton
+ android:id="@+id/app_widget_recents_previous"
+ android:layout_width="@dimen/app_widget_recents_action_bar_height"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/app_widget_recents_play"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@null"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/app_widget_recents_play"
+ android:layout_width="@dimen/app_widget_recents_action_bar_height"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/app_widget_recents_next"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@null"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_play" />
+
+ <ImageButton
+ android:id="@+id/app_widget_recents_next"
+ android:layout_width="@dimen/app_widget_recents_action_bar_height"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@null"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_next" />
+ </RelativeLayout>
+
+ <ImageView
+ android:id="@+id/colorstrip"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/colorstrip_height"
+ android:layout_below="@+id/app_widget_recents_action_bar"
+ android:background="@color/holo_blue_light"
+ android:contentDescription="@null" />
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/colorstrip"
+ android:layout_centerVertical="true"
+ android:background="@drawable/appwidget_bg" >
+
+ <ListView
+ android:id="@+id/app_widget_recents_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@null"
+ android:cacheColorHint="@color/transparent" />
+ </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-v11/app_widget_recents_items.xml b/res/layout-v11/app_widget_recents_items.xml
new file mode 100644
index 0000000..1568177
--- /dev/null
+++ b/res/layout-v11/app_widget_recents_items.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/app_widget_recents_items"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/app_widget_recents_base_image"
+ android:layout_width="@dimen/item_normal_height"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:scaleType="fitXY" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_gravity="center_vertical"
+ android:layout_toRightOf="@+id/app_widget_recents_base_image"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/list_preferred_item_padding" >
+
+ <TextView
+ android:id="@+id/app_widget_recents_line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_recents_line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/app_widget_recents_line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-v11/notification_template_base.xml b/res/layout-v11/notification_template_base.xml
new file mode 100644
index 0000000..b4d9e1c
--- /dev/null
+++ b/res/layout-v11/notification_template_base.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/notification_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/notification_base_image"
+ android:layout_width="@dimen/notification_big_icon_width"
+ android:layout_height="@dimen/notification_big_icon_height"
+ android:background="@drawable/default_artwork"
+ android:gravity="center" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/notification_info_container_padding_left"
+ android:paddingBottom="@dimen/notification_info_container_padding_bottom" >
+
+ <TextView
+ android:id="@+id/notification_base_line_one"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title" />
+
+ <TextView
+ android:id="@+id/notification_base_line_two"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/notification_base_previous"
+ style="@style/NotificationAction.Previous" />
+
+ <ImageButton
+ android:id="@+id/notification_base_play"
+ style="@style/NotificationAction.Play" />
+
+ <ImageButton
+ android:id="@+id/notification_base_next"
+ style="@style/NotificationAction.Next" />
+
+ <ImageButton
+ android:id="@+id/notification_base_collapse"
+ style="@style/NotificationAction.Collapse" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v16/notification_template_expanded_base.xml b/res/layout-v16/notification_template_expanded_base.xml
new file mode 100644
index 0000000..a8dd2f3
--- /dev/null
+++ b/res/layout-v16/notification_template_expanded_base.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="128.0dip"
+ tools:ignore="ContentDescription" >
+
+ <!-- The height cannot be specified any other way. It must read "128.0dip" and cannot be referenced. I think it's a bug. -->
+
+ <ImageView
+ android:id="@+id/notification_expanded_base_image"
+ android:layout_width="@dimen/notification_expanded_height"
+ android:layout_height="@dimen/notification_expanded_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/default_artwork"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:id="@+id/notification_expanded_buttons"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/notification_expanded_base_image"
+ android:divider="?android:listDivider"
+ android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:showDividers="middle" >
+
+ <ImageButton
+ android:id="@+id/notification_expanded_base_previous"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/notification_expanded_base_play"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_pause" />
+
+ <ImageButton
+ android:id="@+id/notification_expanded_base_next"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_above="@+id/notification_expanded_buttons"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/notification_expanded_base_image"
+ android:background="?android:dividerHorizontal" />
+
+ <ImageButton
+ android:id="@+id/notification_expanded_base_collapse"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_collapse_padding"
+ android:src="@drawable/btn_notification_collapse" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:layout_toLeftOf="@+id/notification_expanded_base_collapse"
+ android:layout_toRightOf="@+id/notification_expanded_base_image"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/notification_info_container_padding_left"
+ android:paddingTop="@dimen/notification_expanded_content_padding_top" >
+
+ <TextView
+ android:id="@+id/notification_expanded_base_line_one"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title" />
+
+ <TextView
+ android:id="@+id/notification_expanded_base_line_two"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+
+ <TextView
+ android:id="@+id/notification_expanded_base_line_three"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/action_bar.xml b/res/layout/action_bar.xml
new file mode 100644
index 0000000..1fad70e
--- /dev/null
+++ b/res/layout/action_bar.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:enabled="false"
+ android:orientation="horizontal"
+ android:paddingEnd="8dip" >
+
+ <ImageView
+ android:id="@+id/up"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|start"
+ android:contentDescription="@null"
+ android:visibility="gone" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|start"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/action_bar_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium" />
+
+ <TextView
+ android:id="@+id/action_bar_subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-3dp"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ android:visibility="gone" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
new file mode 100644
index 0000000..07316d4
--- /dev/null
+++ b/res/layout/activity_base.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableFrameLayout
+ android:id="@+id/activity_base_content"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1" />
+
+ <include layout="@layout/bottom_action_bar"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_player_base.xml b/res/layout/activity_player_base.xml
new file mode 100644
index 0000000..e98bbb5
--- /dev/null
+++ b/res/layout/activity_player_base.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.theme.ThemeableFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <View
+ android:id="@+id/audio_player_footer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignTop="@android:id/progress" />
+
+ <LinearLayout
+ android:id="@+id/audio_player_header"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/audio_player_header_height"
+ android:layout_alignParentTop="true"
+ android:baselineAligned="false"
+ android:orientation="horizontal" >
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/audio_player_header_padding_left"
+ android:paddingRight="@dimen/audio_player_header_padding_right" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_track_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="audio_player_line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_artist_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ app:themeResource="audio_player_line_two" />
+ </LinearLayout>
+
+ <FrameLayout
+ android:id="@+id/audio_player_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:focusable="true"
+ android:padding="@dimen/audio_player_switch_padding" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_switch_queue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:contentDescription="@null" />
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_switch_album_art"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:visibility="invisible" />
+ </FrameLayout>
+ </LinearLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@android:id/progress"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/audio_player_header" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_album_art"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true"
+ android:scaleType="fitXY" />
+
+ <View
+ android:id="@+id/audio_player_footer_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_below="@+id/audio_player_album_art" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_alignTop="@+id/audio_player_album_art"
+ android:contentDescription="@null"
+ android:src="@drawable/top_shadow" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_alignBottom="@+id/audio_player_album_art"
+ android:contentDescription="@null"
+ android:src="@drawable/bottom_shadow" />
+
+ <FrameLayout
+ android:id="@+id/audio_player_pager_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/audio_player_album_art"
+ android:visibility="invisible" >
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/audio_player_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_gravity="top"
+ android:contentDescription="@null"
+ android:src="@drawable/top_shadow" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_gravity="bottom"
+ android:contentDescription="@null"
+ android:src="@drawable/bottom_shadow" />
+ </FrameLayout>
+ </RelativeLayout>
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_current_time"
+ android:layout_width="@dimen/audio_player_time_width"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@android:id/progress"
+ android:layout_alignParentLeft="true"
+ android:layout_alignTop="@android:id/progress"
+ android:gravity="center"
+ android:textSize="@dimen/text_size_micro"
+ app:themeResource="audio_player_current_time" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_total_time"
+ android:layout_width="@dimen/audio_player_time_width"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@android:id/progress"
+ android:layout_alignParentRight="true"
+ android:layout_alignTop="@android:id/progress"
+ android:gravity="center"
+ android:textSize="@dimen/text_size_micro"
+ app:themeResource="audio_player_total_time" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableSeekBar
+ android:id="@android:id/progress"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/audio_player_controlss"
+ android:layout_marginBottom="@dimen/audio_player_seek_bar_margin_bottom"
+ android:layout_toLeftOf="@+id/audio_player_total_time"
+ android:layout_toRightOf="@+id/audio_player_current_time"
+ android:max="1000"
+ android:thumb="@null" />
+
+ <LinearLayout
+ android:id="@+id/audio_player_controlss"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:baselineAligned="false"
+ android:gravity="center" >
+
+ <include layout="@layout/audio_player_controls" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <include layout="@layout/colorstrip" />
+
+</com.andrew.apollo.widgets.theme.ThemeableFrameLayout>
\ No newline at end of file
diff --git a/res/layout/activity_profile_base.xml b/res/layout/activity_profile_base.xml
new file mode 100644
index 0000000..fa8f654
--- /dev/null
+++ b/res/layout/activity_profile_base.xml
Binary files differ
diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml
new file mode 100644
index 0000000..7756d5f
--- /dev/null
+++ b/res/layout/app_widget_large.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/app_widget_large_min_height"
+ android:background="@drawable/appwidget_bg"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/app_widget_large_image"
+ android:layout_width="@dimen/notification_expanded_height"
+ android:layout_height="@dimen/notification_expanded_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/default_artwork"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_buttons"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/app_widget_large_image"
+ android:divider="?android:listDivider"
+ android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:showDividers="middle" >
+
+ <ImageButton
+ android:id="@+id/app_widget_large_previous"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_prev"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_play"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_pause" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_next"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_next"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_above="@+id/app_widget_large_buttons"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/app_widget_large_image"
+ android:background="?android:dividerHorizontal" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_info_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:layout_toRightOf="@+id/app_widget_large_image"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/notification_info_container_padding_left"
+ android:paddingTop="@dimen/notification_expanded_content_padding_top" >
+
+ <TextView
+ android:id="@+id/app_widget_large_line_one"
+ style="@style/NotificationText"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_large_line_two"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+
+ <TextView
+ android:id="@+id/app_widget_large_line_three"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml
new file mode 100644
index 0000000..8f777dd
--- /dev/null
+++ b/res/layout/app_widget_large_alternate.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/app_widget_large_min_height"
+ android:background="@drawable/appwidget_bg"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/app_widget_large_alternate_image"
+ android:layout_width="@dimen/app_widget_large_alternate_artwork_size"
+ android:layout_height="@dimen/app_widget_large_alternate_artwork_size"
+ android:layout_above="@+id/app_widget_large_alternate_buttons"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/default_artwork"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_alternate_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:divider="?android:listDivider"
+ android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:showDividers="middle" >
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_shuffle"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_shuffle"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_shuffle" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_previous"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_prev"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_play"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_pause" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_next"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_next"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_repeat"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_repeat"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_repeat" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_above="@+id/app_widget_large_alternate_buttons"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/app_widget_large_alternate_image"
+ android:background="?android:dividerHorizontal" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_alternate_info_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:layout_toRightOf="@+id/app_widget_large_alternate_image"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/notification_info_container_padding_left"
+ android:paddingTop="@dimen/notification_expanded_content_padding_top" >
+
+ <TextView
+ android:id="@+id/app_widget_large_alternate_line_one"
+ style="@style/NotificationText"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_large_alternate_line_two"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+
+ <TextView
+ android:id="@+id/app_widget_large_alternate_line_three"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml
new file mode 100644
index 0000000..62eb356
--- /dev/null
+++ b/res/layout/app_widget_small.xml
Binary files differ
diff --git a/res/layout/audio_controls.xml b/res/layout/audio_controls.xml
deleted file mode 100644
index e9602b0..0000000
--- a/res/layout/audio_controls.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <SeekBar
- android:id="@android:id/progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/audio_player_seek_bar_padding"
- android:thumb="@null" />
-
- <TextView
- android:id="@+id/audio_player_current_time"
- style="@style/AudioPlayerText"
- android:layout_alignParentLeft="true"
- android:layout_below="@android:id/progress"
- android:paddingLeft="@dimen/audio_player_info_container_padding"
- android:paddingRight="@dimen/audio_player_info_container_padding"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/audio_player_total_time"
- style="@style/AudioPlayerText"
- android:layout_alignParentRight="true"
- android:layout_below="@android:id/progress"
- android:paddingLeft="@dimen/audio_player_info_container_padding"
- android:paddingRight="@dimen/audio_player_info_container_padding"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
- </RelativeLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/audio_player_controls_height"
- android:layout_gravity="bottom"
- android:orientation="horizontal"
- android:paddingBottom="@dimen/audio_player_button_container_padding" >
-
- <ImageButton
- android:id="@+id/audio_player_repeat"
- style="@style/AudioPlayerButton"
- android:contentDescription="@string/cd_repeat"
- android:src="@drawable/apollo_holo_light_repeat_normal" />
-
- <com.andrew.apollo.ui.widgets.RepeatingImageButton
- android:id="@+id/audio_player_prev"
- style="@style/AudioPlayerButton"
- android:src="@drawable/apollo_holo_light_previous" />
-
- <ImageButton
- android:id="@+id/audio_player_play"
- style="@style/AudioPlayerButton"
- android:contentDescription="@string/cd_play"
- android:src="@drawable/apollo_holo_light_pause" />
-
- <com.andrew.apollo.ui.widgets.RepeatingImageButton
- android:id="@+id/audio_player_next"
- style="@style/AudioPlayerButton"
- android:src="@drawable/apollo_holo_light_next" />
-
- <ImageButton
- android:id="@+id/audio_player_shuffle"
- style="@style/AudioPlayerButton"
- android:contentDescription="@string/cd_shuffle"
- android:src="@drawable/apollo_holo_light_shuffle_normal" />
- </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml
deleted file mode 100644
index fa55223..0000000
--- a/res/layout/audio_player.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- tools:ignore="ContentDescription" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:background="@color/black" >
-
- <ImageView
- android:id="@+id/audio_player_album_art"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scaleType="fitXY" />
- </LinearLayout>
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/audio_player_info_container_padding"
- android:paddingRight="@dimen/audio_player_info_container_padding"
- android:paddingTop="@dimen/audio_player_artwork_padding" >
-
- <TextView
- android:id="@+id/audio_player_track"
- style="@style/AudioPlayerText"
- android:textColor="@color/black"
- android:textSize="@dimen/text_size_large"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/audio_player_album_artist"
- style="@style/AudioPlayerText"
- android:layout_below="@+id/audio_player_track"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
- </RelativeLayout>
-
- <include layout="@layout/audio_controls" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/audio_player_browser.xml b/res/layout/audio_player_browser.xml
deleted file mode 100644
index 9c57385..0000000
--- a/res/layout/audio_player_browser.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <include layout="@layout/colorstrip" />
-
- <android.support.v4.view.ViewPager
- android:id="@+id/viewPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/audio_player_controls.xml b/res/layout/audio_player_controls.xml
new file mode 100644
index 0000000..511aea9
--- /dev/null
+++ b/res/layout/audio_player_controls.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.ShuffleButton
+ android:id="@+id/action_button_shuffle"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_shuffle"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_shuffle" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_previous"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_gravity="center"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_previous" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.PlayPauseButton
+ android:id="@+id/action_button_play"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_play"
+ android:focusable="true"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_play" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_next"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_gravity="center"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_next" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.RepeatButton
+ android:id="@+id/action_button_repeat"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_repeat"
+ android:focusable="true"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_repeat" />
+ </FrameLayout>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index 2994335..2bcb032 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -1,69 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/bottom_action_bar_container"
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.theme.BottomActionBar xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:id="@+id/bottom_action_bar_parent"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_action_bar_height"
android:layout_gravity="bottom"
- android:orientation="vertical" >
+ tools:ignore="ContentDescription" >
- <ImageView
- android:id="@+id/bottom_action_bar_info_divider"
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_divider_height"
- android:background="@color/holo_blue_dark" />
+ <include
+ android:id="@+id/colorstrip"
+ layout="@layout/colorstrip" />
- <com.andrew.apollo.ui.widgets.BottomActionBar
+ <LinearLayout
android:id="@+id/bottom_action_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/holo_selector"
+ android:layout_below="@+id/colorstrip"
+ android:clickable="true"
android:orientation="horizontal" >
- <ImageView
+ <com.andrew.apollo.widgets.SquareImageView
android:id="@+id/bottom_action_bar_album_art"
- android:layout_width="@dimen/bottom_action_bar_album_art_width_height"
- android:layout_height="@dimen/bottom_action_bar_album_art_width_height"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="left|center"
- android:contentDescription="@string/cd_bottom_action_bar_album_art"
- android:scaleType="fitXY" />
+ android:background="@drawable/default_artwork" />
- <LinearLayout
+ <RelativeLayout
+ android:id="@+id/bottom_action_bar_info_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
- android:orientation="vertical"
android:paddingLeft="@dimen/bottom_action_bar_info_padding_left" >
- <TextView
- android:id="@+id/bottom_action_bar_track_name"
- style="@style/BottomActionBarText"
- android:textColor="@color/transparent_black"
- android:textStyle="bold" />
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/bottom_action_bar_line_one"
+ style="@style/BottomActionBarLineOne"
+ app:themeResource="bab_line_one" />
- <TextView
- android:id="@+id/bottom_action_bar_artist_name"
- style="@style/BottomActionBarText"
- android:textColor="@color/transparent_black" />
- </LinearLayout>
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/bottom_action_bar_line_two"
+ style="@style/BottomActionBarLineTwo"
+ android:layout_below="@+id/bottom_action_bar_line_one"
+ app:themeResource="bab_line_two" />
+ </RelativeLayout>
- <com.andrew.apollo.ui.widgets.BottomActionBarItem
- android:id="@+id/bottom_action_bar_item_one"
- style="@style/BottomActionBarItem"
- android:contentDescription="@string/cd_favorite"
- android:src="@drawable/apollo_holo_light_favorite_normal" />
+ <HorizontalScrollView
+ android:layout_width="@dimen/bottom_action_bar_button_container_width"
+ android:layout_height="match_parent"
+ android:scrollbars="none" >
- <com.andrew.apollo.ui.widgets.BottomActionBarItem
- android:id="@+id/bottom_action_bar_item_two"
- style="@style/BottomActionBarItem"
- android:contentDescription="@string/cd_search"
- android:src="@drawable/apollo_holo_light_search" />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
- <com.andrew.apollo.ui.widgets.BottomActionBarItem
- android:id="@+id/bottom_action_bar_item_three"
- style="@style/BottomActionBarItem"
- android:contentDescription="@string/cd_overflow"
- android:src="@drawable/apollo_holo_light_overflow" />
- </com.andrew.apollo.ui.widgets.BottomActionBar>
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_previous"
+ style="@style/BottomActionBarItem.Previous" />
-</LinearLayout>
\ No newline at end of file
+ <com.andrew.apollo.widgets.PlayPauseButton
+ android:id="@+id/action_button_play"
+ style="@style/BottomActionBarItem.Play" />
+
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_next"
+ style="@style/BottomActionBarItem.Next" />
+
+ <com.andrew.apollo.widgets.ShuffleButton
+ android:id="@+id/action_button_shuffle"
+ style="@style/BottomActionBarItem.Shuffle" />
+
+ <com.andrew.apollo.widgets.RepeatButton
+ android:id="@+id/action_button_repeat"
+ style="@style/BottomActionBarItem.Repeat" />
+ </LinearLayout>
+ </HorizontalScrollView>
+ </LinearLayout>
+
+</com.andrew.apollo.widgets.theme.BottomActionBar>
\ No newline at end of file
diff --git a/res/layout/bottom_action_bar_controls.xml b/res/layout/bottom_action_bar_controls.xml
deleted file mode 100644
index 3406c00..0000000
--- a/res/layout/bottom_action_bar_controls.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_height"
- android:layout_gravity="bottom"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/bottom_action_bar_control_divider"
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_divider_height"
- android:background="@color/holo_blue_dark" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
-
- <ImageButton
- android:id="@+id/bottom_action_bar_repeat"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_repeat"
- android:src="@drawable/apollo_holo_light_repeat_normal" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_previous"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_previous"
- android:src="@drawable/apollo_holo_light_previous" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_play"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_play"
- android:src="@drawable/apollo_holo_light_play" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_next"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_next"
- android:src="@drawable/apollo_holo_light_next" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_shuffle"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_shuffle"
- android:src="@drawable/apollo_holo_light_shuffle_normal" />
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/color_scheme_dialog.xml b/res/layout/color_scheme_dialog.xml
new file mode 100644
index 0000000..49bcaf1
--- /dev/null
+++ b/res/layout/color_scheme_dialog.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/color_scheme_dialog_row_padding" >
+
+ <com.andrew.apollo.widgets.ColorPickerView
+ android:id="@+id/color_picker_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout
+ android:id="@+id/color_scheme_dialog_row_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/color_picker_view"
+ android:layout_marginBottom="4dp"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/color_scheme_dialog_row_padding"
+ android:paddingRight="@dimen/color_scheme_dialog_row_padding" >
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_one"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@color/holo_blue_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_two"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_green_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_three"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_orange_dark" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_four"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_orange_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_old_color"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="2"
+ android:background="@color/holo_blue_light"
+ android:text="@string/current_color"
+ android:textSize="@dimen/text_size_micro"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_new_color"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:background="@color/transparent"
+ android:text="@string/new_color"
+ android:textSize="@dimen/text_size_micro"
+ android:textStyle="bold" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/color_scheme_dialog_row_one"
+ android:layout_marginBottom="4dp"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/color_scheme_dialog_row_padding"
+ android:paddingRight="@dimen/color_scheme_dialog_row_padding" >
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_five"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@color/holo_purple" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_six"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_red_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_seven"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/white" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_eight"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/black" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="4"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/hex" />
+
+ <EditText
+ android:id="@+id/color_scheme_dialog_hex_value"
+ android:layout_width="110dp"
+ android:layout_height="wrap_content"
+ android:digits="0123456789ABCDEFabcdef"
+ android:imeOptions="actionGo"
+ android:inputType="textFilter"
+ android:maxLength="8"
+ android:singleLine="true"
+ android:typeface="monospace" />
+ </LinearLayout>
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/colorstrip.xml b/res/layout/colorstrip.xml
index b04eb8c..4c13b7a 100644
--- a/res/layout/colorstrip.xml
+++ b/res/layout/colorstrip.xml
@@ -1,8 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.theme.Colorstrip xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/colorstrip"
android:layout_width="match_parent"
- android:layout_height="@dimen/colorstrip_height"
- android:foreground="@drawable/colorstrip_shadow"
- tools:ignore="Overdraw" />
+ android:layout_height="@dimen/colorstrip_height"/>
\ No newline at end of file
diff --git a/res/layout/context_menu.xml b/res/layout/context_menu.xml
deleted file mode 100644
index 9802971..0000000
--- a/res/layout/context_menu.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/track_list_context_frame"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/listview_item_height"
- android:layout_alignParentRight="true"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:paddingRight="@dimen/quick_context_padding_right" >
-
- <ImageView
- android:id="@+id/quick_context_line"
- android:layout_width="@dimen/quick_context_line_width"
- android:layout_height="@dimen/quick_context_line_height"
- android:layout_gravity="center|left"
- android:background="@color/transparent_black" />
-
- <ImageView
- android:id="@+id/quick_context_tip"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:layout_marginRight="@dimen/quick_context_margin_right"
- android:scaleType="centerInside"
- android:src="@drawable/dropdown_ic_arrow_normal_holo_light" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/context_menu_header.xml b/res/layout/context_menu_header.xml
deleted file mode 100644
index ba41e56..0000000
--- a/res/layout/context_menu_header.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/black" >
-
- <ImageView
- android:id="@+id/header_image"
- android:layout_width="match_parent"
- android:layout_height="@dimen/half_and_half_image_height" />
-
- <TextView
- android:id="@+id/header_text"
- style="@style/HeaderText"
- android:layout_alignBottom="@+id/header_image" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/custom_action_bar.xml b/res/layout/custom_action_bar.xml
deleted file mode 100644
index 090bb1c..0000000
--- a/res/layout/custom_action_bar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/action_bar_layout"
- android:layout_width="96dp"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:focusable="true" >
-
- <ImageView
- android:id="@+id/action_bar_album_art"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true" />
-
- <TextView
- android:id="@+id/action_bar_track_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_toLeftOf="@+id/action_bar_album_art"
- android:ellipsize="end"
- android:paddingRight="5dp"
- android:paddingTop="10dp"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_micro"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/action_bar_album_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/action_bar_track_name"
- android:layout_toLeftOf="@+id/action_bar_album_art"
- android:ellipsize="end"
- android:paddingRight="5dp"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_micro" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/edit_track_list_item.xml b/res/layout/edit_track_list_item.xml
new file mode 100644
index 0000000..1d388d4
--- /dev/null
+++ b/res/layout/edit_track_list_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/edit_track_list_parent"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height" >
+
+ <ImageView
+ android:id="@+id/edit_track_list_item_handle"
+ android:layout_width="@dimen/drag_and_drop_handle"
+ android:layout_height="wrap_content"
+ android:scaleType="fitXY"
+ android:src="@drawable/playlist_tile_normal" />
+
+ <FrameLayout
+ android:id="@+id/edit_track_list_container"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_toRightOf="@+id/edit_track_list_item_handle"
+ android:gravity="center_vertical" >
+
+ <include layout="@layout/list_item_simple" />
+ </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/empty_view.xml b/res/layout/empty_view.xml
deleted file mode 100644
index aa29c7a..0000000
--- a/res/layout/empty_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/bottom_action_bar_height" />
\ No newline at end of file
diff --git a/res/layout/faux_carousel.xml b/res/layout/faux_carousel.xml
new file mode 100644
index 0000000..e8e7564
--- /dev/null
+++ b/res/layout/faux_carousel.xml
Binary files differ
diff --git a/res/layout/fourbyone_app_widget.xml b/res/layout/fourbyone_app_widget.xml
deleted file mode 100644
index 8e0cf1c..0000000
--- a/res/layout/fourbyone_app_widget.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/appwidget_bg"
- android:orientation="horizontal"
- tools:ignore="Overdraw" >
-
- <ImageView
- android:id="@+id/four_by_one_albumart"
- android:layout_width="@dimen/four_by_one_album_art_width"
- android:layout_height="match_parent"
- android:scaleType="centerCrop" />
-
- <LinearLayout
- android:id="@+id/four_by_one_album_appwidget"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="2"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:focusable="true"
- android:gravity="center"
- android:orientation="vertical"
- android:paddingLeft="4dp" >
-
- <TextView
- android:id="@+id/four_by_one_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/four_by_one_artist"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
- </LinearLayout>
-
- <ImageButton
- android:id="@+id/four_by_one_control_prev"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@drawable/holo_selector"
- android:scaleType="center"
- android:src="@drawable/apollo_holo_light_previous"
- android:visibility="gone" />
-
- <ImageView
- android:layout_width="0.2dp"
- android:layout_height="match_parent"
- android:background="@color/transparent_black" />
-
- <ImageButton
- android:id="@+id/four_by_one_control_play"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@drawable/holo_selector"
- android:scaleType="center"
- android:src="@drawable/apollo_holo_light_play" />
-
- <ImageView
- android:layout_width="0.2dp"
- android:layout_height="match_parent"
- android:background="@color/transparent_black" />
-
- <ImageButton
- android:id="@+id/four_by_one_control_next"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@drawable/holo_selector"
- android:scaleType="center"
- android:src="@drawable/apollo_holo_light_next" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fourbytwo_app_widget.xml b/res/layout/fourbytwo_app_widget.xml
deleted file mode 100644
index 05fda67..0000000
--- a/res/layout/fourbytwo_app_widget.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/four_by_two"
- android:layout_width="match_parent"
- android:layout_height="@dimen/four_by_two_height"
- android:background="@drawable/appwidget_bg"
- android:gravity="center"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:id="@+id/four_by_two_controls"
- android:layout_width="match_parent"
- android:layout_height="@dimen/four_by_two_control_height"
- android:layout_alignParentBottom="true"
- android:orientation="horizontal" >
-
- <ImageButton
- android:id="@+id/four_by_two_control_prev"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_previous" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_play"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_play" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_next"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_next" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_shuffle"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_shuffle_normal" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_repeat"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_repeat_normal" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/four_by_two_controls_info_divider"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_above="@id/four_by_two_controls"
- android:scaleType="fitXY" />
-
- <ImageView
- android:id="@+id/four_by_two_albumart"
- android:layout_width="@dimen/four_by_two_album_art_width"
- android:layout_height="match_parent"
- android:layout_above="@id/four_by_two_controls_info_divider"
- android:adjustViewBounds="true"
- android:scaleType="fitXY" />
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_above="@id/four_by_two_controls"
- android:background="@color/holo_blue_dark" />
-
- <LinearLayout
- android:id="@+id/four_by_two_info"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_above="@id/four_by_two_controls"
- android:layout_toRightOf="@+id/four_by_two_albumart"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:focusable="true"
- android:gravity="center"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/four_by_two_trackname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/four_by_two_albumname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
-
- <TextView
- android:id="@+id/four_by_two_artistname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml
new file mode 100644
index 0000000..d45e8f6
--- /dev/null
+++ b/res/layout/fragment_music_browser_phone.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <RelativeLayout
+ android:id="@+id/fragment_home_phone_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTitlePageIndicator
+ android:id="@+id/fragment_home_phone_pager_titles"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="@dimen/text_size_micro" />
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/fragment_home_phone_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/fragment_home_phone_pager_titles" />
+ </RelativeLayout>
+
+ <include layout="@layout/top_shadow" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_themes_base.xml b/res/layout/fragment_themes_base.xml
new file mode 100644
index 0000000..521cce5
--- /dev/null
+++ b/res/layout/fragment_themes_base.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/grid_item_spacing" >
+
+ <ImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="155.0dip"
+ android:scaleType="centerCrop"
+ tools:ignore="ContentDescription" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/image" >
+
+ <TextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:background="@color/transparent_black"
+ android:gravity="center"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_dayum" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/grid_base.xml b/res/layout/grid_base.xml
new file mode 100644
index 0000000..6437b36
--- /dev/null
+++ b/res/layout/grid_base.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/grid_base_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/list_preferred_item_padding" >
+
+ <TextView
+ android:id="@+id/empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center"
+ android:textColor="@color/holo_blue_light"
+ android:textSize="@dimen/text_size_large"
+ android:textStyle="bold"
+ android:visibility="gone" />
+
+ <GridView
+ android:id="@+id/grid_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:cacheColorHint="@color/transparent"
+ android:drawSelectorOnTop="true"
+ android:fadingEdge="vertical"
+ android:fastScrollEnabled="true"
+ android:horizontalSpacing="@dimen/grid_item_spacing"
+ android:scrollbarStyle="outsideOverlay"
+ android:scrollbars="vertical"
+ android:verticalSpacing="@dimen/grid_item_spacing" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
new file mode 100644
index 0000000..290a8b0
--- /dev/null
+++ b/res/layout/grid_items_normal.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical" >
+
+ <include layout="@layout/square_image_view" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_alignParentBottom="true"
+ android:background="@color/transparent_black"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/grid_item_padding_left" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:maxLines="2"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="@null" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:singleLine="true"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="@null" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/gridview.xml b/res/layout/gridview.xml
deleted file mode 100644
index 5e3e940..0000000
--- a/res/layout/gridview.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <include layout="@layout/shadow" />
-
- <GridView
- android:id="@+id/gridview"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:cacheColorHint="@color/transparent"
- android:drawSelectorOnTop="true"
- android:numColumns="@integer/gridview_columns"
- android:scrollbars="none" />
-
- <include layout="@layout/empty_view" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/gridview_items.xml b/res/layout/gridview_items.xml
deleted file mode 100644
index 2c6462f..0000000
--- a/res/layout/gridview_items.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <ImageView
- android:id="@+id/gridview_image"
- android:layout_width="@dimen/gridview_image_width"
- android:layout_height="@dimen/gridview_image_height"
- android:scaleType="centerCrop" />
-
- <LinearLayout
- android:id="@+id/gridview_info_holder"
- android:layout_width="match_parent"
- android:layout_height="@dimen/gridview_item_ccontainer_height"
- android:layout_alignParentBottom="true"
- android:background="@color/transparent_black"
- android:gravity="center_vertical"
- android:orientation="vertical"
- android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
- android:paddingRight="@dimen/gridview_item_ccontainer_padding_right" >
-
- <TextView
- android:id="@+id/gridview_line_one"
- style="@style/GridViewTextItem"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/gridview_line_two"
- style="@style/GridViewTextItem" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/peak_one"
- style="@style/PeakMeter"
- android:layout_alignParentBottom="true"
- android:paddingBottom="@dimen/peak_meter_padding_bottom"
- android:paddingRight="@dimen/peak_meter_one_padding_right" />
-
- <ImageView
- android:id="@+id/peak_two"
- style="@style/PeakMeter"
- android:layout_alignParentBottom="true"
- android:paddingBottom="@dimen/peak_meter_padding_bottom"
- android:paddingRight="@dimen/peak_meter_two_padding_right" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/half_and_half.xml b/res/layout/half_and_half.xml
deleted file mode 100644
index e9a43d0..0000000
--- a/res/layout/half_and_half.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:ignore="UnknownIdInLayout" >
-
- <include layout="@layout/colorstrip" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/colorstrip"
- android:baselineAligned="false"
- android:orientation="horizontal" >
-
- <RelativeLayout
- android:id="@+id/artist_half_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@color/black"
- android:padding="@dimen/half_and_half_container_padding" >
-
- <ImageView
- android:id="@+id/half_artist_image"
- android:layout_width="match_parent"
- android:layout_height="@dimen/half_and_half_image_height"
- android:scaleType="centerCrop" />
-
- <TextView
- android:id="@+id/half_artist_image_text"
- style="@style/HalfText"
- android:layout_alignBottom="@+id/half_artist_image"
- android:visibility="gone" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/album_half_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@color/black"
- android:padding="@dimen/half_and_half_container_padding"
- android:visibility="gone" >
-
- <ImageView
- android:id="@+id/half_album_image"
- android:layout_width="match_parent"
- android:layout_height="@dimen/half_and_half_image_height"
- android:scaleType="centerCrop" />
-
- <TextView
- android:id="@+id/half_album_image_text"
- style="@style/HalfText"
- android:layout_alignBottom="@+id/half_album_image" />
- </RelativeLayout>
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/library_browser.xml b/res/layout/library_browser.xml
deleted file mode 100644
index 383694e..0000000
--- a/res/layout/library_browser.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <com.andrew.apollo.ui.widgets.ScrollableTabView
- android:id="@+id/scrollingTabs"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <android.support.v4.view.ViewPager
- android:id="@+id/viewPager"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/scrollingTabs" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_height"
- android:layout_alignParentBottom="true" >
-
- <android.support.v4.view.ViewPager
- android:id="@+id/bottomActionBarPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_base.xml b/res/layout/list_base.xml
new file mode 100644
index 0000000..0bd7cc6
--- /dev/null
+++ b/res/layout/list_base.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/list_base_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/list_preferred_item_padding"
+ android:paddingTop="@dimen/list_preferred_item_padding" >
+
+ <TextView
+ android:id="@+id/empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center"
+ android:padding="@dimen/list_preferred_item_padding"
+ android:textColor="@color/holo_blue_light"
+ android:textSize="@dimen/text_size_large"
+ android:textStyle="bold"
+ android:visibility="gone" />
+
+ <com.andrew.apollo.dragdrop.DragSortListView
+ android:id="@+id/list_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:cacheColorHint="@color/transparent"
+ android:drawSelectorOnTop="false"
+ android:fadingEdge="vertical"
+ android:fastScrollAlwaysVisible="true"
+ android:fastScrollEnabled="true"
+ android:paddingLeft="@dimen/fast_scroll_padding_left"
+ android:paddingRight="@dimen/fast_scroll_padding_right" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/list_header.xml b/res/layout/list_header.xml
new file mode 100644
index 0000000..b8522eb
--- /dev/null
+++ b/res/layout/list_header.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="32.0dip"
+ android:background="@null"
+ android:gravity="center_vertical"
+ android:paddingLeft="10.0dip"
+ android:textAllCaps="true"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium" />
diff --git a/res/layout/list_item_detailed.xml b/res/layout/list_item_detailed.xml
new file mode 100644
index 0000000..6af42f5
--- /dev/null
+++ b/res/layout/list_item_detailed.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical" >
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/list_item_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:scaleType="centerCrop" />
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/image"
+ android:layout_width="@dimen/list_item_detailed_height"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:scaleType="centerCrop" />
+
+ <RelativeLayout
+ android:id="@+id/image_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:layout_toRightOf="@+id/image"
+ android:background="@color/list_item_background"
+ android:padding="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:maxLines="2"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="@null" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:maxLines="2"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="@null" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_three"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:singleLine="true"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="@null" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_item_detailed_no_background.xml b/res/layout/list_item_detailed_no_background.xml
new file mode 100644
index 0000000..b0c9f56
--- /dev/null
+++ b/res/layout/list_item_detailed_no_background.xml
Binary files differ
diff --git a/res/layout/list_item_normal.xml b/res/layout/list_item_normal.xml
new file mode 100644
index 0000000..615ab5d
--- /dev/null
+++ b/res/layout/list_item_normal.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ tools:ignore="ContentDescription" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/image"
+ android:layout_width="@dimen/item_normal_height"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:scaleType="fitXY" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_toRightOf="@+id/image"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/item_normal_height"
+ android:paddingLeft="@dimen/list_preferred_item_padding"
+ android:paddingRight="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_two" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
new file mode 100644
index 0000000..3cbc3ed
--- /dev/null
+++ b/res/layout/list_item_simple.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/item_normal_height"
+ android:paddingLeft="@dimen/list_preferred_item_padding"
+ android:paddingRight="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_two" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_three"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_three" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_separator.xml b/res/layout/list_separator.xml
deleted file mode 100644
index b8717df..0000000
--- a/res/layout/list_separator.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:focusable="false"
- android:paddingLeft="@dimen/list_separator_container_padding_left"
- android:paddingRight="@dimen/fast_scroll_padding_right" >
-
- <TextView
- android:id="@+id/title"
- style="@style/SeparatorTextViewStyle" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/listview.xml b/res/layout/listview.xml
deleted file mode 100644
index 7e4283a..0000000
--- a/res/layout/listview.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <include layout="@layout/shadow" />
-
- <include layout="@layout/list_separator" />
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:cacheColorHint="@color/transparent"
- android:drawSelectorOnTop="false"
- android:fastScrollAlwaysVisible="true"
- android:fastScrollEnabled="true"
- android:listSelector="@drawable/holo_selector"
- android:paddingRight="@dimen/fast_scroll_padding_right" />
-
- <include
- android:id="@+id/empty_view"
- layout="@layout/empty_view" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml
deleted file mode 100644
index d589ae2..0000000
--- a/res/layout/listview_items.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/listview_item_height"
- android:layout_gravity="center_vertical" >
-
- <ImageView
- android:id="@+id/listview_item_image"
- android:layout_width="@dimen/listview_album_art"
- android:layout_height="@dimen/listview_album_art"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:scaleType="centerCrop" />
-
- <!-- Padding may be set on via code for some tabs -->
-
- <TextView
- android:id="@+id/listview_item_line_one"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/listview_item_image"
- android:ellipsize="end"
- android:maxLength="29"
- android:paddingLeft="@dimen/listview_items_padding_left_top"
- android:paddingRight="@dimen/listview_items_padding_right"
- android:paddingTop="@dimen/listview_items_padding_left_top"
- android:shadowColor="@color/black"
- android:shadowRadius="0.5"
- android:singleLine="true"
- android:textSize="@dimen/text_size_medium" />
-
- <TextView
- android:id="@+id/listview_item_line_two"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/listview_item_line_one"
- android:layout_toRightOf="@+id/listview_item_image"
- android:ellipsize="end"
- android:paddingLeft="@dimen/listview_items_padding_left_top"
- android:paddingRight="@dimen/listview_items_padding_right"
- android:paddingTop="@dimen/listview_items_padding_left_top"
- android:shadowColor="@color/black"
- android:shadowRadius="0.2"
- android:singleLine="true"
- android:textSize="@dimen/text_size_small" />
-
- <include layout="@layout/context_menu" />
-
- <ImageView
- android:id="@+id/peak_two"
- style="@style/PeakMeter"
- android:layout_centerVertical="true"
- android:paddingRight="@dimen/listview_peak_meter_two_padding_right"
- android:paddingTop="@dimen/peak_meter_padding_top" />
-
- <ImageView
- android:id="@+id/peak_one"
- style="@style/PeakMeter"
- android:layout_centerVertical="true"
- android:paddingRight="@dimen/listview_peak_meter_one_padding_right"
- android:paddingTop="@dimen/peak_meter_padding_top" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/lyrics_base.xml b/res/layout/lyrics_base.xml
new file mode 100644
index 0000000..821a8f2
--- /dev/null
+++ b/res/layout/lyrics_base.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ScrollView
+ android:id="@+id/audio_player_lyrics_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_lyrics"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:padding="@dimen/list_preferred_item_padding"
+ android:textStyle="bold"
+ app:themeResource="lyrics" />
+ </ScrollView>
+
+ <ProgressBar
+ android:id="@+id/audio_player_lyrics_progess"
+ style="?android:attr/progressBarStyleLarge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center"
+ android:visibility="gone" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/notification_template_base.xml b/res/layout/notification_template_base.xml
new file mode 100644
index 0000000..87c0990
--- /dev/null
+++ b/res/layout/notification_template_base.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/notification_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/notification_base_image"
+ android:layout_width="@dimen/notification_big_icon_width"
+ android:layout_height="@dimen/notification_big_icon_height"
+ android:background="@drawable/default_artwork"
+ android:gravity="center"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/notification_info_container_padding_bottom"
+ android:paddingLeft="@dimen/notification_info_container_padding_left" >
+
+ <TextView
+ android:id="@+id/notification_base_line_one"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title" />
+
+ <TextView
+ android:id="@+id/notification_base_line_two"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/onebyone_app_widget.xml b/res/layout/onebyone_app_widget.xml
deleted file mode 100644
index b770eec..0000000
--- a/res/layout/onebyone_app_widget.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="@dimen/one_by_one_width"
- android:layout_height="@dimen/one_by_one_height" >
-
- <ImageView
- android:id="@+id/one_by_one_albumart"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/profile_tab.xml b/res/layout/profile_tab.xml
new file mode 100644
index 0000000..27693ba
--- /dev/null
+++ b/res/layout/profile_tab.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ class="com.andrew.apollo.widgets.CarouselTab" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/profile_tab_photo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@null"
+ android:scaleType="centerCrop" />
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/profile_tab_album_art"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@null"
+ android:scaleType="fitXY"
+ android:visibility="gone" />
+
+ <View
+ android:id="@+id/profile_tab_photo_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true" />
+
+ <View
+ android:id="@+id/profile_tab_label_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_carousel_label_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@color/transparent_black" />
+
+ <com.andrew.apollo.widgets.theme.Colorstrip
+ android:id="@+id/profile_tab_colorstrip"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_indicator_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true" />
+
+ <View
+ android:id="@+id/profile_tab_alpha_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginBottom="@dimen/profile_carousel_label_height" />
+
+ <TextView
+ android:id="@+id/profile_tab_label"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_carousel_label_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:gravity="left|center_vertical"
+ android:paddingLeft="@dimen/profile_label_padding"
+ android:paddingRight="@dimen/profile_label_padding"
+ android:singleLine="true"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_large" />
+ </RelativeLayout>
+
+</view>
\ No newline at end of file
diff --git a/res/layout/profile_tab_carousel.xml b/res/layout/profile_tab_carousel.xml
new file mode 100644
index 0000000..18c5580
--- /dev/null
+++ b/res/layout/profile_tab_carousel.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/profile_tab_carousel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ class="com.andrew.apollo.widgets.ProfileTabCarousel"
+ android:fadingEdge="none"
+ android:scrollbars="none" >
+
+ <LinearLayout
+ android:id="@+id/profile_tab_carousel_tab_and_shadow_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:id="@+id/profile_tab_carousel_tab_container"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:baselineAligned="false"
+ android:orientation="horizontal" >
+
+ <include
+ android:id="@+id/profile_tab_carousel_tab_one"
+ layout="@layout/profile_tab" />
+
+ <include
+ android:id="@+id/profile_tab_carousel_tab_two"
+ layout="@layout/profile_tab" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/profile_tab_carousel_shadow"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_photo_shadow_height"
+ android:background="?android:attr/windowContentOverlay" />
+ </LinearLayout>
+
+</view>
\ No newline at end of file
diff --git a/res/layout/quick_queue.xml b/res/layout/quick_queue.xml
deleted file mode 100644
index 4ee60f5..0000000
--- a/res/layout/quick_queue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/quick_queue_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <GridView
- android:id="@+id/gridview"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:cacheColorHint="@color/transparent"
- android:drawSelectorOnTop="false"
- android:listSelector="@color/transparent"
- android:scrollbars="none" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/quick_queue_items.xml b/res/layout/quick_queue_items.xml
deleted file mode 100644
index afcb7ee..0000000
--- a/res/layout/quick_queue_items.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="@dimen/status_bar_recents_item_padding"
- android:paddingTop="@dimen/status_bar_recents_item_padding" >
-
- <RelativeLayout
- android:id="@+id/recent_item"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal" >
-
- <TextView
- android:id="@+id/queue_track_name"
- android:layout_width="@dimen/status_bar_recents_app_label_width"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignTop="@+id/queue_album_art"
- android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"
- android:paddingTop="2dp"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="@color/white"
- android:textSize="@dimen/status_bar_recents_app_label_text_size" />
-
- <FrameLayout
- android:id="@+id/app_thumbnail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"
- android:layout_toRightOf="@+id/queue_track_name"
- android:background="@drawable/queue_thumbnail_bg"
- android:foreground="@drawable/queue_thumbnail_fg" >
-
- <ImageView
- android:id="@+id/queue_artist_image"
- android:layout_width="@dimen/status_bar_recents_thumbnail_width"
- android:layout_height="@dimen/status_bar_recents_thumbnail_height"
- android:scaleType="fitXY" />
- </FrameLayout>
-
- <View
- android:id="@+id/recents_callout_line"
- android:layout_width="@dimen/status_bar_recents_app_label_width"
- android:layout_height="1dip"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/queue_track_name"
- android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
- android:layout_marginRight="3dip"
- android:layout_marginTop="3dip"
- android:layout_toLeftOf="@id/app_thumbnail"
- android:background="@color/queue_callout_line" />
-
- <ImageView
- android:id="@+id/queue_album_art"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin"
- android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin"
- android:layout_toRightOf="@+id/queue_track_name"
- android:adjustViewBounds="true"
- android:maxHeight="@dimen/status_bar_recents_app_icon_max_height"
- android:maxWidth="@dimen/status_bar_recents_app_icon_max_width"
- android:scaleType="centerInside" />
-
- <TextView
- android:id="@+id/app_description"
- android:layout_width="@dimen/status_bar_recents_app_label_width"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/recents_callout_line"
- android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
- android:layout_marginTop="3dip"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textSize="@dimen/status_bar_recents_app_description_text_size" />
- </RelativeLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/shadow.xml b/res/layout/shadow.xml
deleted file mode 100644
index 37f28bb..0000000
--- a/res/layout/shadow.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/shadow"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:foreground="@drawable/title_bar_shadow"
- android:foregroundGravity="fill_horizontal|top|center" />
diff --git a/res/layout/square_image_view.xml b/res/layout/square_image_view.xml
new file mode 100644
index 0000000..ea958b5
--- /dev/null
+++ b/res/layout/square_image_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.SquareView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/square_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop" />
+
+</com.andrew.apollo.widgets.SquareView>
\ No newline at end of file
diff --git a/res/layout/status_bar.xml b/res/layout/status_bar.xml
deleted file mode 100644
index 34385e7..0000000
--- a/res/layout/status_bar.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
-
- <ImageView
- android:id="@+id/status_bar_album_art"
- android:layout_width="@dimen/status_bar_album_art"
- android:layout_height="@dimen/status_bar_album_art"
- android:gravity="center" />
-
- <ImageView
- android:id="@+id/status_bar_icon"
- android:layout_width="@dimen/status_bar_album_art"
- android:layout_height="@dimen/status_bar_album_art"
- android:background="@drawable/status_bg"
- android:scaleType="center"
- android:src="@drawable/stat_notify_music"
- android:visibility="gone" />
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:orientation="vertical"
- android:paddingLeft="@dimen/status_bar_button_info_container_padding_left" >
-
- <TextView
- android:id="@+id/status_bar_track_name"
- style="@style/StatusBarText"
- android:textColor="@color/white"
- android:textSize="@dimen/text_size_medium"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/status_bar_artist_name"
- style="@style/StatusBarText" />
- </LinearLayout>
-
- <ImageButton
- android:id="@+id/status_bar_play"
- style="@style/StatusBarButton" />
-
- <ImageButton
- android:id="@+id/status_bar_next"
- style="@style/StatusBarButton"
- android:src="@drawable/apollo_holo_dark_next" />
-
- <ImageButton
- android:id="@+id/status_bar_collapse"
- style="@style/StatusBarButton"
- android:src="@drawable/apollo_holo_dark_notifiation_bar_collapse" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
deleted file mode 100644
index 0bfd77b..0000000
--- a/res/layout/tabs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/tabs"
- style="@style/Tabs" />
diff --git a/res/layout/theme_preview.xml b/res/layout/theme_preview.xml
deleted file mode 100644
index 0563b44..0000000
--- a/res/layout/theme_preview.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/themeTitle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <TextView
- android:id="@+id/themeDescription"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <ImageView
- android:id="@+id/themeIcon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
-
- <Button
- android:id="@+id/themeApply"
- android:onClick="applyTheme"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/apply_theme" />
-
- <Button
- android:id="@+id/themeSearch"
- android:onClick="getThemes"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/get_more_themes" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/top_shadow.xml b/res/layout/top_shadow.xml
new file mode 100644
index 0000000..f37f41b
--- /dev/null
+++ b/res/layout/top_shadow.xml
Binary files differ
diff --git a/res/layout/track_browser.xml b/res/layout/track_browser.xml
deleted file mode 100644
index 4559091..0000000
--- a/res/layout/track_browser.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <include
- android:id="@+id/half"
- layout="@layout/half_and_half" />
-
- <android.support.v4.view.ViewPager
- android:id="@+id/viewPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@+id/half" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_height"
- android:layout_alignParentBottom="true" >
-
- <android.support.v4.view.ViewPager
- android:id="@+id/bottomActionBarPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/activity_base.xml b/res/menu/activity_base.xml
new file mode 100644
index 0000000..d494081
--- /dev/null
+++ b/res/menu/activity_base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_settings"
+ android:orderInCategory="4"
+ android:showAsAction="never"
+ android:title="@string/menu_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/add_to_homescreen.xml b/res/menu/add_to_homescreen.xml
new file mode 100644
index 0000000..b1a2de2
--- /dev/null
+++ b/res/menu/add_to_homescreen.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_add_to_homescreen"
+ android:icon="@drawable/ic_action_pinn_to_home"
+ android:orderInCategory="2"
+ android:showAsAction="ifRoom"
+ android:title="@string/menu_add_to_homescreen"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/album_song_sort_by.xml b/res/menu/album_song_sort_by.xml
new file mode 100644
index 0000000..9300f86
--- /dev/null
+++ b/res/menu/album_song_sort_by.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_sort_by"
+ android:showAsAction="never"
+ android:title="@string/menu_sort_by">
+ <menu>
+ <item
+ android:id="@+id/menu_sort_by_az"
+ android:title="@string/sort_order_entry_az"/>
+ <item
+ android:id="@+id/menu_sort_by_za"
+ android:title="@string/sort_order_entry_za"/>
+ <item
+ android:id="@+id/menu_sort_by_duration"
+ android:title="@string/sort_order_entry_duration"/>
+ <item
+ android:id="@+id/menu_sort_by_track_list"
+ android:title="@string/sort_order_entry_track_list"/>
+ </menu>
+ </item>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/album_sort_by.xml b/res/menu/album_sort_by.xml
new file mode 100644
index 0000000..dd4bef9
--- /dev/null
+++ b/res/menu/album_sort_by.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_sort_by"
+ android:showAsAction="never"
+ android:title="@string/menu_sort_by">
+ <menu>
+ <item
+ android:id="@+id/menu_sort_by_az"
+ android:title="@string/sort_order_entry_az"/>
+ <item
+ android:id="@+id/menu_sort_by_za"
+ android:title="@string/sort_order_entry_za"/>
+ <item
+ android:id="@+id/menu_sort_by_year"
+ android:title="@string/sort_order_entry_year"/>
+ <item
+ android:id="@+id/menu_sort_by_artist"
+ android:title="@string/sort_order_entry_artist"/>
+ <item
+ android:id="@+id/menu_sort_by_number_of_songs"
+ android:title="@string/sort_order_entry_number_of_songs"/>
+ </menu>
+ </item>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/artist_album_sort_by.xml b/res/menu/artist_album_sort_by.xml
new file mode 100644
index 0000000..9be6ed8
--- /dev/null
+++ b/res/menu/artist_album_sort_by.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_sort_by"
+ android:showAsAction="never"
+ android:title="@string/menu_sort_by">
+ <menu>
+ <item
+ android:id="@+id/menu_sort_by_az"
+ android:title="@string/sort_order_entry_az"/>
+ <item
+ android:id="@+id/menu_sort_by_za"
+ android:title="@string/sort_order_entry_za"/>
+ <item
+ android:id="@+id/menu_sort_by_year"
+ android:title="@string/sort_order_entry_year"/>
+ <item
+ android:id="@+id/menu_sort_by_number_of_songs"
+ android:title="@string/sort_order_entry_number_of_songs"/>
+ </menu>
+ </item>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/artist_song_sort_by.xml b/res/menu/artist_song_sort_by.xml
new file mode 100644
index 0000000..67d1a35
--- /dev/null
+++ b/res/menu/artist_song_sort_by.xml
Binary files differ
diff --git a/res/menu/artist_sort_by.xml b/res/menu/artist_sort_by.xml
new file mode 100644
index 0000000..d87923c
--- /dev/null
+++ b/res/menu/artist_sort_by.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_sort_by"
+ android:showAsAction="never"
+ android:title="@string/menu_sort_by">
+ <menu>
+ <item
+ android:id="@+id/menu_sort_by_az"
+ android:title="@string/sort_order_entry_az"/>
+ <item
+ android:id="@+id/menu_sort_by_za"
+ android:title="@string/sort_order_entry_za"/>
+ <item
+ android:id="@+id/menu_sort_by_number_of_songs"
+ android:title="@string/sort_order_entry_number_of_songs"/>
+ <item
+ android:id="@+id/menu_sort_by_number_of_albums"
+ android:title="@string/sort_order_entry_number_of_albums"/>
+ </menu>
+ </item>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/audio_player.xml b/res/menu/audio_player.xml
new file mode 100644
index 0000000..8625074
--- /dev/null
+++ b/res/menu/audio_player.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_audio_player_share"
+ android:showAsAction="never"
+ android:title="@string/menu_share"/>
+ <item
+ android:id="@+id/menu_audio_player_equalizer"
+ android:showAsAction="never"
+ android:title="@string/menu_equalizer"/>
+ <item
+ android:id="@+id/menu_download_lyrics"
+ android:showAsAction="never"
+ android:title="@string/menu_download_lyrics"/>
+ <item
+ android:id="@+id/menu_audio_player_ringtone"
+ android:showAsAction="never"
+ android:title="@string/context_menu_use_as_ringtone"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/favorite.xml b/res/menu/favorite.xml
new file mode 100644
index 0000000..baff20f
--- /dev/null
+++ b/res/menu/favorite.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_favorite"
+ android:icon="@drawable/ic_action_favorite"
+ android:orderInCategory="2"
+ android:showAsAction="ifRoom"
+ android:title="@string/add_to_favorites"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/overflow_library.xml b/res/menu/overflow_library.xml
deleted file mode 100644
index 7243c8a..0000000
--- a/res/menu/overflow_library.xml
+++ /dev/null
Binary files differ
diff --git a/res/menu/overflow_now_playing.xml b/res/menu/overflow_now_playing.xml
deleted file mode 100644
index 554c6bc..0000000
--- a/res/menu/overflow_now_playing.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/add_to_playlist"
- android:showAsAction="never"
- android:title="@string/add_to_playlist"/>
- <item
- android:id="@+id/eq"
- android:showAsAction="never"
- android:title="@string/eqalizer"/>
- <item
- android:id="@+id/play_store"
- android:showAsAction="never"
- android:title="@string/play_store"/>
- <item
- android:id="@+id/share"
- android:showAsAction="never"
- android:title="@string/share"/>
- <item
- android:id="@+id/settings"
- android:showAsAction="never"
- android:title="@string/settings"/>
-
-</menu>
\ No newline at end of file
diff --git a/res/menu/queue.xml b/res/menu/queue.xml
new file mode 100644
index 0000000..4836493
--- /dev/null
+++ b/res/menu/queue.xml
Binary files differ
diff --git a/res/menu/search.xml b/res/menu/search.xml
new file mode 100644
index 0000000..838e746
--- /dev/null
+++ b/res/menu/search.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_search"
+ android:actionViewClass="com.actionbarsherlock.widget.SearchView"
+ android:icon="@drawable/ic_action_search"
+ android:orderInCategory="1"
+ android:showAsAction="ifRoom|collapseActionView"
+ android:title="@string/menu_search"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/shuffle.xml b/res/menu/shuffle.xml
new file mode 100644
index 0000000..cef5f75
--- /dev/null
+++ b/res/menu/shuffle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_shuffle"
+ android:showAsAction="never"
+ android:title="@string/menu_shuffle"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/song_sort_by.xml b/res/menu/song_sort_by.xml
new file mode 100644
index 0000000..32ba679
--- /dev/null
+++ b/res/menu/song_sort_by.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_sort_by"
+ android:showAsAction="never"
+ android:title="@string/menu_sort_by">
+ <menu>
+ <item
+ android:id="@+id/menu_sort_by_az"
+ android:title="@string/sort_order_entry_az"/>
+ <item
+ android:id="@+id/menu_sort_by_za"
+ android:title="@string/sort_order_entry_za"/>
+ <item
+ android:id="@+id/menu_sort_by_year"
+ android:title="@string/sort_order_entry_year"/>
+ <item
+ android:id="@+id/menu_sort_by_artist"
+ android:title="@string/sort_order_entry_artist"/>
+ <item
+ android:id="@+id/menu_sort_by_album"
+ android:title="@string/sort_order_entry_album"/>
+ <item
+ android:id="@+id/menu_sort_by_duration"
+ android:title="@string/sort_order_entry_duration"/>
+ </menu>
+ </item>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/theme_shop.xml b/res/menu/theme_shop.xml
new file mode 100644
index 0000000..998a77c
--- /dev/null
+++ b/res/menu/theme_shop.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_shop"
+ android:icon="@drawable/ic_action_shop"
+ android:showAsAction="always"
+ android:title="@string/menu_shop"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/view_as.xml b/res/menu/view_as.xml
new file mode 100644
index 0000000..0d24860
--- /dev/null
+++ b/res/menu/view_as.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_view_as"
+ android:showAsAction="never"
+ android:title="@string/menu_view_as">
+ <menu>
+ <item
+ android:id="@+id/menu_view_as_simple"
+ android:title="@string/menu_simple"/>
+ <item
+ android:id="@+id/menu_view_as_detailed"
+ android:title="@string/menu_detailed"/>
+ <item
+ android:id="@+id/menu_view_as_grid"
+ android:title="@string/menu_grid"/>
+ </menu>
+ </item>
+
+</menu>
\ No newline at end of file
diff --git a/res/values-hdpi/config.xml b/res/values-hdpi/config.xml
deleted file mode 100644
index b727fb7..0000000
--- a/res/values-hdpi/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <!-- ListView album art size -->
- <integer name="listview_album_art">100</integer>
-
-</resources>
\ No newline at end of file
diff --git a/res/values-hdpi/dimens.xml b/res/values-hdpi/dimens.xml
deleted file mode 100644
index 4aae5b1..0000000
--- a/res/values-hdpi/dimens.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <!-- Half and half layout -->
- <dimen name="half_and_half_image_height">130dp</dimen>
-
- <!-- GridView items -->
- <dimen name="gridview_image_height">148dp</dimen>
- <dimen name="gridview_item_ccontainer_height">54dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000..843d9f3
--- /dev/null
+++ b/res/values-sw600dp/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <!-- List item detailed height -->
+ <dimen name="list_item_detailed_height">164.0dip</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-v11/config.xml b/res/values-v11/config.xml
new file mode 100644
index 0000000..ec37e0f
--- /dev/null
+++ b/res/values-v11/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <!-- Runnong Honeycomb or above -->
+ <bool name="has_honeycomb">true</bool>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-v11/dimens.xml b/res/values-v11/dimens.xml
new file mode 100644
index 0000000..9637cfd
--- /dev/null
+++ b/res/values-v11/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <dimen name="app_widget_padding">0.0dip</dimen>
+
+ <!-- List view fast scroll padding right -->
+ <dimen name="fast_scroll_padding_right">32.0dip</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-xhdpi/dimens.xml b/res/values-xhdpi/dimens.xml
deleted file mode 100644
index af3eaf7..0000000
--- a/res/values-xhdpi/dimens.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <!-- Half and half layout -->
- <dimen name="half_and_half_image_height">150dp</dimen>
-
- <!-- GridView items -->
- <dimen name="gridview_image_height">180dp</dimen>
- <dimen name="gridview_item_ccontainer_height">64dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..bbd1cbf
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <!-- Main TitlePageIndicator titles -->
+ <string-array name="page_titles">
+ <item>@string/page_playlists</item>
+ <item>@string/page_recent</item>
+ <item>@string/page_artists</item>
+ <item>@string/page_albums</item>
+ <item>@string/page_songs</item>
+ <item>@string/page_genres</item>
+ </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 0000000..33eb19e
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <declare-styleable name="ThemeableTextView">
+
+ <!-- Used to set the themeable resource name for the text view -->
+ <attr name="themeResource" format="string" />
+ </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 959d021..02bb26e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,13 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<resources>
- <!-- A transparent black -->
- <color name="transparent_black">#99000000</color>
-
- <!-- A semi-transparent dark Holo shade of blue -->
- <color name="holo_blue_dark">#ff0099cc</color>
-
- <!-- Transparent -->
+ <!-- See through -->
<color name="transparent">#00000000</color>
<!-- Black -->
@@ -16,7 +25,37 @@
<!-- White -->
<color name="white">#ffffffff</color>
- <!-- Quick Queue line seperator -->
- <color name="queue_callout_line">#99ffffff</color>
+ <!-- Transparent black -->
+ <color name="transparent_black">#99000000</color>
+
+ <!-- Transparent white -->
+ <color name="transparent_white">#ffcccccc</color>
+
+ <!-- Dark transparent color -->
+ <color name="list_item_background">#c1000000</color>
+
+ <!-- A darkish color used for the action bar -->
+ <color name="action_bar_color">#ff0d0d0d</color>
+
+ <!-- A light, Holo shade of blue -->
+ <color name="holo_blue_light">#ff33b5e5</color>
+
+ <!-- A light, transparent Holo shade of blue -->
+ <color name="holo_blue_light_transparent">#9933b5e5</color>
+
+ <!-- A light Holo shade of green -->
+ <color name="holo_green_light">#ff99cc00</color>
+
+ <!-- A light Holo shade of red -->
+ <color name="holo_red_light">#ffff4444</color>
+
+ <!-- A Holo shade of purple -->
+ <color name="holo_purple">#ffaa66cc</color>
+
+ <!-- A light Holo shade of orange -->
+ <color name="holo_orange_light">#ffffbb33</color>
+
+ <!-- A dark Holo shade of orange -->
+ <color name="holo_orange_dark">#ffff8800</color>
</resources>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index c3e8295..388765b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<resources>
- <!-- ViewPager margin width -->
- <integer name="viewpager_margin_width">30</integer>
+ <!-- Configures hardware acceleration -->
+ <bool name="config_hardwareAccelerated">true</bool>
- <!-- ListView album art size -->
- <integer name="listview_album_art">133</integer>
+ <!-- Configures a larger heap size -->
+ <bool name="config_largeHeap">true</bool>
- <!-- Now playing indicator animation time -->
- <integer name="peak">200</integer>
-
- <!-- Number of GridView coulumns -->
- <integer name="gridview_columns">2</integer>
-
- <!-- ListView padding when header is applied -->
- <integer name="listview_padding_left">16</integer>
- <integer name="listview_padding_right">32</integer>
+ <!-- Running Honeycomb or above -->
+ <bool name="has_honeycomb">false</bool>
</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index aeacf75..69f0059 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,124 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<resources>
<!-- Text sizes -->
- <dimen name="text_size_extra_micro">10sp</dimen>
- <dimen name="text_size_micro">12sp</dimen>
- <dimen name="text_size_small">14sp</dimen>
- <dimen name="text_size_medium">16sp</dimen>
- <dimen name="text_size_large">18sp</dimen>
+ <dimen name="text_size_extra_micro">10.0sp</dimen>
+ <dimen name="text_size_micro">12.0sp</dimen>
+ <dimen name="text_size_small">14.0sp</dimen>
+ <dimen name="text_size_medium">16.0sp</dimen>
+ <dimen name="text_size_large">18.0sp</dimen>
+ <dimen name="text_size_x_large">24.0sp</dimen>
+ <dimen name="text_size_dayum">36.0sp</dimen>
- <!-- Tabs -->
- <dimen name="tab_padding_top_bottom">15dp</dimen>
- <dimen name="tab_padding_left_right">40dp</dimen>
+ <!-- List and grid view padding -->
+ <dimen name="list_preferred_item_padding">10.0dip</dimen>
+ <!-- List view fast scroll padding left -->
+ <dimen name="fast_scroll_padding_left">8.0dip</dimen>
+ <!-- List view fast scroll padding right -->
+ <dimen name="fast_scroll_padding_right">0.0dip</dimen>
+ <!-- grid view vertical and horizontal spacing -->
+ <dimen name="grid_item_spacing">4.0dip</dimen>
+ <!-- List item detailed height -->
+ <dimen name="list_item_detailed_height">120.0dip</dimen>
+ <!-- Top margin of "line_two" -->
+ <dimen name="list_item_line_two_margin_top">8.0dip</dimen>
+ <!-- Left padding in the grid text -->
+ <dimen name="grid_item_padding_left">8.0dip</dimen>
+ <!-- Grid and list item normal height -->
+ <dimen name="item_normal_height">64.0dip</dimen>
- <!-- Bottom ActionBar -->
- <dimen name="bottom_action_bar_height">48dp</dimen>
- <dimen name="bottom_action_bar_item_width">56dp</dimen>
- <dimen name="bottom_action_bar_item_padding_left_right">12dp</dimen>
- <dimen name="bottom_action_bar_album_art_width_height">30dp</dimen>
- <dimen name="bottom_action_bar_divider_height">2dp</dimen>
- <dimen name="bottom_action_bar_info_padding_left">5dp</dimen>
+ <!-- Bottom Action Bar -->
+ <dimen name="bottom_action_bar_height">48.0dip</dimen>
+ <dimen name="bottom_action_bar_item_width">56.0dip</dimen>
+ <dimen name="bottom_action_bar_item_padding_left">12.0dip</dimen>
+ <dimen name="bottom_action_bar_item_padding_right">12.0dip</dimen>
+ <dimen name="bottom_action_bar_album_art_width">30.0dip</dimen>
+ <dimen name="bottom_action_bar_album_art_height">30.0dip</dimen>
+ <dimen name="bottom_action_bar_info_padding_left">5.0dip</dimen>
+ <dimen name="bottom_action_bar_button_container_width">165.0dip</dimen>
- <!-- ViewPager margin stroke width -->
- <dimen name="viewpager_margin_stroke_width">0.5dp</dimen>
+ <!-- Notification template -->
+ <dimen name="notification_big_icon_height">64.0dip</dimen>
+ <dimen name="notification_big_icon_width">64.0dip</dimen>
+ <dimen name="notification_info_container_padding_left">8.0dip</dimen>
+ <dimen name="notification_info_container_padding_bottom">4.0dip</dimen>
+ <dimen name="notification_action_padding">8.0dip</dimen>
+ <dimen name="notification_action_height">48.0dip</dimen>
+ <dimen name="notification_action_width">48.0dip</dimen>
- <!-- FastScroll padding -->
- <dimen name="fast_scroll_padding_right">32dp</dimen>
+ <!-- Notification template expanded -->
+ <dimen name="notification_expanded_height">128.0dip</dimen>
+ <dimen name="notification_expanded_buttons_divider_padding">12.0dip</dimen>
+ <dimen name="notification_expanded_button_height">48.0dip</dimen>
+ <dimen name="notification_expanded_button_padding">10.0dip</dimen>
+ <dimen name="notification_expanded_content_padding_top">8.0dip</dimen>
+ <dimen name="notification_expanded_collapse_padding">8.0dip</dimen>
- <!-- List separator -->
- <dimen name="list_separator_padding_left_right">8dp</dimen>
- <dimen name="list_separator_min_height">32dp</dimen>
- <dimen name="list_separator_container_padding_left">16dp</dimen>
-
- <!-- ListView items -->
- <dimen name="listview_item_height">64dp</dimen>
- <dimen name="listview_items_padding_left_top">9dp</dimen>
- <dimen name="listview_items_padding_right">85dp</dimen>
- <dimen name="listview_peak_meter_one_padding_right">80dp</dimen>
- <dimen name="listview_peak_meter_two_padding_right">70dp</dimen>
- <dimen name="listview_album_art">64dp</dimen>
-
- <!-- Quick Context Menu -->
- <dimen name="quick_context_padding_right">4dp</dimen>
- <dimen name="quick_context_line_height">30dp</dimen>
- <dimen name="quick_context_line_width">1dp</dimen>
- <dimen name="quick_context_margin_right">5dp</dimen>
-
- <!-- Nofication bar button -->
- <dimen name="status_bar_button_width_height">48dp</dimen>
- <dimen name="status_bar_album_art">64dp</dimen>
- <dimen name="status_bar_button_info_container_padding_left">11dp</dimen>
-
- <!-- Colorstrip -->
- <dimen name="colorstrip_height">4dp</dimen>
-
- <!-- Half and half layout -->
- <dimen name="half_and_half_text_padding">5dp</dimen>
- <dimen name="half_and_half_image_height">150dp</dimen>
- <dimen name="half_and_half_container_padding">3dp</dimen>
-
- <!-- ContextMenu header text padding -->
- <dimen name="header_text_padding">5dp</dimen>
- <dimen name="header_text_padding_left">15dp</dimen>
-
- <!-- GridView items -->
- <dimen name="gridview_image_width">180dp</dimen>
- <dimen name="gridview_image_height">180dp</dimen>
- <dimen name="gridview_item_ccontainer_height">64dp</dimen>
- <dimen name="gridview_item_ccontainer_padding_left">8dp</dimen>
- <dimen name="gridview_item_ccontainer_padding_right">80dp</dimen>
- <dimen name="peak_meter_one_padding_right">15dp</dimen>
- <dimen name="peak_meter_two_padding_right">5dp</dimen>
- <dimen name="peak_meter_padding_bottom">10dp</dimen>
- <dimen name="peak_meter_padding_top">8dp</dimen>
+ <!-- Height of the shadow asset under the photo -->
+ <dimen name="profile_photo_shadow_height">10.0dip</dimen>
+ <!-- Height of the text label in the carousel -->
+ <dimen name="profile_carousel_label_height">45.0dip</dimen>
+ <dimen name="profile_indicator_height">5.0dip</dimen>
+ <dimen name="profile_label_padding">16.0dip</dimen>
<!-- Audio player -->
- <dimen name="audio_player_info_container_padding">16dp</dimen>
- <dimen name="audio_player_artwork_padding">20dp</dimen>
- <dimen name="audio_player_controls_height">56dp</dimen>
- <dimen name="audio_player_seek_bar_padding">10dp</dimen>
- <dimen name="audio_player_button_container_padding">2dp</dimen>
+ <dimen name="audio_player_header_height">60.0dip</dimen>
+ <dimen name="audio_player_header_padding_left">16.0dip</dimen>
+ <dimen name="audio_player_header_padding_right">16.0dip</dimen>
+ <dimen name="audio_player_switch_padding">10.0dip</dimen>
+ <dimen name="audio_player_time_width">52.0dip</dimen>
+ <dimen name="audio_player_seek_bar_margin_bottom">2.0dip</dimen>
+ <dimen name="audio_player_controls_end_button_width">50.0dip</dimen>
+ <dimen name="audio_player_controls_end_button_height">50.0dip</dimen>
+ <dimen name="audio_player_controls_main_button_width">58.0dip</dimen>
+ <dimen name="audio_player_controls_main_button_height">58.0dip</dimen>
- <!-- Recent Applications parameters -->
- <!-- How far the thumbnail for a recent app appears from left edge -->
- <dimen name="status_bar_recents_thumbnail_left_margin">20dp</dimen>
- <!-- Width of application label text -->
- <dimen name="status_bar_recents_app_label_width">88dp</dimen>
- <!-- Left margin of application label text -->
- <dimen name="status_bar_recents_app_label_left_margin">0dp</dimen>
- <!-- Padding between recents items -->
- <dimen name="status_bar_recents_item_padding">0dp</dimen>
- <!-- Where to place the app icon over the thumbnail -->
- <dimen name="status_bar_recents_app_icon_left_margin">0dp</dimen>
- <dimen name="status_bar_recents_app_icon_top_margin">8dp</dimen>
- <!-- Recent Applications parameters -->
- <!-- Upper width limit for application icon -->
- <dimen name="status_bar_recents_app_icon_max_width">48dp</dimen>
- <!-- Upper height limit for application icon -->
- <dimen name="status_bar_recents_app_icon_max_height">48dp</dimen>
+ <!-- App Widgets -->
+ <dimen name="app_widget_large_min_width">250.0dip</dimen>
+ <dimen name="app_widget_large_min_height">128.0dip</dimen>
+ <dimen name="app_widget_scrollable_min_height">180.0dip</dimen>
+ <dimen name="app_widget_scrollable_min_resize_height">110.0dip</dimen>
+ <dimen name="app_widget_large_alternate_artwork_size">80.0dip</dimen>
+ <dimen name="app_widget_small_min_width">250.0dip</dimen>
+ <dimen name="app_widget_small_min_height">40.0dip</dimen>
+ <dimen name="app_widget_small_info_container_padding_left">8.0dip</dimen>
+ <dimen name="app_widget_small_info_container_padding_right">8.0dip</dimen>
+ <dimen name="app_widget_small_info_container_padding_top">5.0dip</dimen>
+ <dimen name="app_widget_small_artwork_size">48.0dip</dimen>
+ <dimen name="app_widget_small_button_padding">8.0dip</dimen>
+ <dimen name="app_widget_small_button_height">48.0dip</dimen>
+ <dimen name="app_widget_recents_action_bar_height">48.0dip</dimen>
+ <dimen name="app_widget_recents_action_bar_item_padding">8.0dip</dimen>
+ <dimen name="app_widget_tiny_height">70.0dip</dimen>
+ <dimen name="app_widget_tiny_width">70.0dip</dimen>
+ <dimen name="app_widget_padding">10.0dip</dimen>
- <!-- Size of application thumbnail -->
- <dimen name="status_bar_recents_thumbnail_width">164dp</dimen>
- <dimen name="status_bar_recents_thumbnail_height">145dp</dimen>
+ <!-- Shadow height -->
+ <dimen name="shadow_height">5.0dip</dimen>
- <!-- Size of application label text -->
- <dimen name="status_bar_recents_app_label_text_size">14dp</dimen>
- <!-- Size of application description text -->
- <dimen name="status_bar_recents_app_description_text_size">14dp</dimen>
- <!-- Size of fading edge for scroll effect -->
- <dimen name="status_bar_recents_fading_edge_length">20dp</dimen>
+ <!-- Colorstrip -->
+ <dimen name="colorstrip_height">2.0dip</dimen>
- <!-- AppWidgdt 1x1 -->
- <dimen name="one_by_one_height">62dp</dimen>
- <dimen name="one_by_one_width">72dp</dimen>
+ <!-- Drag and drop -->
+ <dimen name="drag_and_drop_handle">26.0dip</dimen>
- <!-- AppWidgdt 4x1 -->
- <dimen name="four_by_one_album_art_width">90dp</dimen>
-
- <!-- AppWidget 4x2 -->
- <dimen name="four_by_two_height">180dp</dimen>
- <dimen name="four_by_two_control_height">55dp</dimen>
- <dimen name="four_by_two_album_art_width">135dp</dimen>
+ <!-- Color scheme dialog -->
+ <dimen name="color_scheme_dialog_row_padding">8.0dip</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
new file mode 100644
index 0000000..6836d75
--- /dev/null
+++ b/res/values/donottranslate.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Do not translate. Duration format for duration < 1 hour -->
+ <string name="durationformatshort"><xliff:g id="format">%2$d:%5$02d</xliff:g></string>
+ <!-- Do not translate. Duration format for duration >= 1 hour -->
+ <string name="durationformatlong"><xliff:g id="format">%1$d:%3$02d:%5$02d</xliff:g></string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/fractions.xml b/res/values/fractions.xml
new file mode 100644
index 0000000..a1e37fa
--- /dev/null
+++ b/res/values/fractions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <item name="tab_width_screen_percentage" type="fraction">75.0%</item>
+ <item name="tab_height_screen_percentage" type="fraction">42.0%</item>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/plurals.xml b/res/values/plurals.xml
new file mode 100644
index 0000000..be184b5
--- /dev/null
+++ b/res/values/plurals.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Used to indicate the number of artists -->
+ <plurals name="Nartists">
+
+ <!-- Only one artist -->
+ <item quantity="one">1 artist</item>
+ <!-- More than one artist -->
+ <item quantity="other"><xliff:g id="count">%d</xliff:g> artists</item>
+ </plurals>
+
+ <!-- Used to indicate the number of albums for an artist -->
+ <plurals name="Nalbums">
+
+ <!-- Only one album -->
+ <item quantity="one">1 album</item>
+ <!-- More than one album -->
+ <item quantity="other"><xliff:g id="count">%d</xliff:g> albums</item>
+ </plurals>
+
+ <!-- Used to indicate the number of songs for an album -->
+ <plurals name="Nsongs">
+
+ <!-- Only one song -->
+ <item quantity="one">1 song</item>
+ <item quantity="other"><xliff:g id="count">%d</xliff:g> songs</item>
+ </plurals>
+
+ <!-- Used to indicate the number of genres -->
+ <plurals name="Ngenres">
+
+ <!-- Only one genre -->
+ <item quantity="one">1 genre</item>
+ <!-- More than one genre -->
+ <item quantity="other"><xliff:g id="count">%d</xliff:g> genres</item>
+ </plurals>
+
+ <!-- Toasts after adding song(s) to playlists -->
+ <plurals name="NNNtrackstoplaylist">
+
+ <!-- message shown when one song was added -->
+ <item quantity="one">1 song added to playlist.</item>
+ <!-- message shown when zero or more than one song was added -->
+ <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlist.</item>
+ </plurals>
+
+ <!-- Toasts after adding song(s) to queue -->
+ <plurals name="NNNtrackstoqueue">
+
+ <!-- message shown when one song was added -->
+ <item quantity="one">1 song added to the queue.</item>
+ <!-- message shown when zero or more than one song was added -->
+ <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to the queue.</item>
+ </plurals>
+
+ <!-- Toasts after adding song(s) to the favorites list -->
+ <plurals name="NNNtrackstofavorites">
+
+ <!-- message shown when one song was added -->
+ <item quantity="one">1 song added to Favorites.</item>
+ <!-- message shown when zero or more than one song was added -->
+ <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to Favorites.</item>
+ </plurals>
+
+ <!-- Toast confirming that song(s) was/were deleted. -->
+ <plurals name="NNNtracksdeleted">
+
+ <!-- delete confirmation message for 1 song -->
+ <item quantity="one">1 song was deleted.</item>
+ <!-- delete confirmation message for 0 or more than 1 songs -->
+ <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> songs were deleted.</item>
+ </plurals>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 525556d..5e32581 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,127 +1,190 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <!-- App name -->
- <string name="app_name">Apollo</string>
-
- <!-- Content descriptions for the Bottom Action Bar -->
- <string name="cd_favorite">Make this a favorite song</string>
- <string name="cd_search">Search through your music</string>
- <string name="cd_overflow">View more options</string>
- <string name="cd_bottom_action_bar_album_art">Album art for this song</string>
- <string name="cd_repeat">Repeat one or all</string>
- <string name="cd_previous">Skip backwards</string>
- <string name="cd_play">Play and pause</string>
- <string name="cd_next">Skip forwards</string>
- <string name="cd_shuffle">Shuffle tracks</string>
-
- <!-- AudioPlayer title -->
- <string name="nowplaying">Now Playing</string>
-
- <!-- Used to indicate the number of albums for an artist -->
- <plurals name="Nalbums">
-
- <!-- Number of albums is one -->
- <item quantity="one">1 album</item>
- <!-- Number of albums is more than one -->
- <item quantity="other"><xliff:g id="count">%d</xliff:g> albums</item>
- </plurals>
-
- <!-- Used to indicate the number of songs for an album -->
-
- <plurals name="Nsongs">
-
- <!-- Number of songs is one -->
- <item quantity="one">1 song</item>
- <item quantity="other"><xliff:g id="count">%d</xliff:g> songs</item>
- </plurals>
-
- <!-- Toasts after adding song(s) to playlists -->
- <plurals name="NNNtrackstoplaylist">
-
- <!-- message shown when one song was added -->
- <item quantity="one">1 song added to playlist</item>
- <!-- message shown when zero or more than one song was added -->
- <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlis.</item>
- </plurals>
-
- <!-- Headers -->
- <string name="album_header">ALBUM LIST</string>
- <string name="track_header">TRACK LIST</string>
-
- <!-- Options MenuItems -->
- <string name="settings">Settings</string>
- <string name="shuffle_all">Shuffle all</string>
- <string name="share">Share</string>
- <string name="play_store">Play Store</string>
-
- <!-- Set track as ringtone -->
- <string name="set_as_ringtone">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" set as ringtone</string>
-
- <!-- Do not translate. Duration format for duration < 1 hour -->
- <string name="durationformatshort" translatable="false"><xliff:g id="format">%2$d:%5$02d</xliff:g></string>
- <!-- Do not translate. Duration format for duration >= 1 hour -->
- <string name="durationformatlong" translatable="false"><xliff:g id="format">%1$d:%3$02d:%5$02d</xliff:g></string>
-
- <!-- Transient popup message shown after renaming a playlist -->
- <string name="rename_playlist">Rename playlist</string>
-
- <!-- Shuffle and repeat messages -->
- <string name="repeat_one">Repeat one</string>
- <string name="repeat_all">Repeat all</string>
- <string name="repeat_off">Repeat off</string>
- <string name="shuffle_off">Shuffle off</string>
- <string name="shuffle_on">Shuffle on</string>
-
- <!-- Share Intent -->
- <string name="now_listening_to">Now listening to:</string>
- <string name="by">by</string>
- <string name="share_track_using">Share track using</string>
-
- <!-- ContextMenu items -->
- <string name="play_all">Play all</string>
- <string name="add_to_playlist">Add to playlist</string>
- <string name="use_as_ringtone">Use as ringtone</string>
- <string name="delete_playlist">Delete playlist</string>
- <string name="search">Search</string>
- <string name="remove">Remove from playlist</string>
-
- <!-- App Widgets -->
- <string name="apollo_1x1">Apollo (1x1)</string>
- <string name="apollo_4x1">Apollo (4x1)</string>
- <string name="apollo_4x2">Apollo (4x2)</string>
-
- <!-- Unknown genre name -->
- <string name="unknown">Unknown</string>
-
- <!-- Settings -->
- <string name="about">About Apollo</string>
- <string name="eqalizer">Equalizer</string>
- <string name="header_interface">Interface</string>
- <string name="themes">Themes</string>
- <string name="apollo_themes">Select theme for Apollo</string>
- <string name="select_theme">Select your theme</string>
- <string name="version">Apollo Version</string>
-
- <!-- Settings keys -->
- <string name="key_themes">themepreview</string>
- <string name="key_themes_package">themePackageName</string>
- <string name="key_themes_preferences">themePrefences</string>
- <string name="key_build_version">build_version</string>
-
- <!-- Theme layout Buttons -->
- <string name="apply_theme">Apply theme</string>
- <string name="get_more_themes">Get more themes</string>
-
- <!-- Playlists menu -->
- <string name="favorite">Favorites</string>
- <string name="queue">Queue</string>
- <string name="new_playlist">New</string>
- <string name="new_playlist_name_template">Playlist <xliff:g id="number">%d</xliff:g></string>
- <string name="save">Save</string>
- <string name="overwrite">Overwrite</string>
-
- <!-- Something went wrong -->
- <string name="error">Error</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <string name="app_name">Apollo</string>
+
+ <!-- Page titles -->
+ <string name="page_recent">Recent</string>
+ <string name="page_artists">Artists</string>
+ <string name="page_albums">Albums</string>
+ <string name="page_songs">Songs</string>
+ <string name="page_playlists">Playlists</string>
+ <string name="page_genres">Genres</string>
+
+ <!-- Option menu items -->
+ <string name="menu_settings">Settings</string>
+ <string name="menu_search">Search</string>
+ <string name="menu_shuffle">Shuffle all</string>
+ <string name="menu_play_all">Play all</string>
+ <string name="menu_sort_by">Sort by</string>
+ <string name="menu_shop">Shop for themes</string>
+ <string name="menu_clear_recents">Clear recent</string>
+ <string name="menu_clear_queue">Clear queue</string>
+ <string name="menu_save_queue">Save queue</string>
+ <string name="menu_clear_favorites">Clear Favorites</string>
+ <string name="menu_share">Share</string>
+ <string name="menu_save_lyrics">Save lyrics</string>
+ <string name="menu_remove_lyrics">Delete lyrics</string>
+ <string name="menu_download_lyrics">Fetch lyrics</string>
+ <string name="menu_add_to_homescreen">Place on Home screen</string>
+ <string name="menu_equalizer">Equalizer</string>
+ <string name="menu_simple">Simple</string>
+ <string name="menu_detailed">Detailed</string>
+ <string name="menu_grid">Grid</string>
+ <string name="menu_view_as">View as</string>
+
+ <!-- Playlist items -->
+ <string name="add_to_playlist">Add to playlist</string>
+ <string name="add_to_favorites">Add to Favorites</string>
+ <string name="add_to_queue">Add to queue</string>
+ <string name="add_to_quickplay">Pin to Quickplay</string>
+ <string name="remove_from_favorites">Remove from Favorites</string>
+ <string name="remove_from_playlist">Remove from playlist</string>
+ <string name="remove_from_recent">Remove from recent</string>
+ <string name="remove_from_queue">Remove from queue</string>
+ <string name="remove_from_quickplay">Remove from Quickplay</string>
+
+ <!-- Sort orders -->
+ <string name="sort_order_entry_az">A-Z</string>
+ <string name="sort_order_entry_za">Z-A</string>
+ <string name="sort_order_entry_artist">Artist</string>
+ <string name="sort_order_entry_album">Album</string>
+ <string name="sort_order_entry_year">Year</string>
+ <string name="sort_order_entry_duration">Duration</string>
+ <string name="sort_order_entry_date_added">Date added</string>
+ <string name="sort_order_entry_track_list">Track list</string>
+ <string name="sort_order_entry_number_of_songs">Number of songs</string>
+ <string name="sort_order_entry_number_of_albums">Number of albums</string>
+
+ <!-- Default playlist names -->
+ <string name="playlist_favorites">Favorites</string>
+ <string name="playlist_last_added">Last added</string>
+
+ <!-- AlertDialog items -->
+ <string name="sort_order_title">Sort by</string>
+ <string name="new_playlist">New playlist</string>
+ <string name="save">Save</string>
+ <string name="cancel">Cancel</string>
+ <string name="overwrite">Overwrite</string>
+ <string name="new_playlist_name_template">Playlist <xliff:g id="number">%d</xliff:g></string>
+ <string name="create_playlist_prompt" msgid="942607395076646686">"Playlist name"</string>
+ <string name="cannot_be_undone">This cannot be undone</string>
+ <string name="delete_warning">This will permanently delete the cached image entries</string>
+ <string name="new_photo">Choose photo from Gallery</string>
+ <string name="google_search">Google search</string>
+ <string name="use_default">Use default photo</string>
+ <string name="old_photo">Use old photo</string>
+
+ <!-- Context menu items -->
+ <string name="context_menu_play_selection">Play</string>
+ <string name="context_menu_play_next">Play next</string>
+ <string name="context_menu_more_by_artist">More by artist</string>
+ <string name="context_menu_rename_playlist">Rename</string>
+ <string name="context_menu_delete">Delete</string>
+ <string name="context_menu_fetch_album_art">Fetch album art</string>
+ <string name="context_menu_fetch_artist_image">Fetch artist image</string>
+ <string name="context_menu_open_in_play_store">Open in Play Store</string>
+ <string name="context_menu_remove_from_recent">Remove from recent</string>
+ <string name="context_menu_remove_from_queue">Remove from queue</string>
+ <string name="context_menu_play_next">Play next</string>
+ <string name="context_menu_use_as_ringtone">Use as ringtone</string>
+
+ <!-- Content descriptions -->
+ <string name="accessibility_play">Play</string>
+ <string name="accessibility_pause">Pause</string>
+ <string name="accessibility_next">Next</string>
+ <string name="accessibility_prev">Previous</string>
+ <string name="accessibility_shuffle">Shuffle</string>
+ <string name="accessibility_shuffle_all">Shuffle all</string>
+ <string name="accessibility_repeat">Repeat</string>
+ <string name="accessibility_repeat_all">Repeat all</string>
+ <string name="accessibility_repeat_one">Repeat one</string>
+ <string name="accessibility_add_to_favorites">Add to favorites</string>
+ <string name="accessibility_remove_from_favorites">Remove from favorites</string>
+
+ <!-- Toast messages -->
+ <string name="removed_from_favorites">removed from Favorites</string>
+ <string name="removed_from_recent">removed from recent</string>
+ <string name="removed_from_playlist">removed from playlist</string>
+ <string name="added_to_favorites">added to Favorites</string>
+ <string name="pinned_to_home_screen">pinned to your Home screen</string>
+ <string name="could_not_be_pinned_to_home_screen">could not be pinned to your Home screen</string>
+ <string name="set_as_ringtone">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" set as ringtone</string>
+ <string name="playlist_renamed">Playlist renamed</string>
+ <string name="theme_set">set as the theme</string>
+ <string name="lyrics_saved">lyrics saved</string>
+ <string name="lyrics_deleted">lyrics deleted</string>
+
+ <!-- Settings -->
+ <string name="settings_ui_category">Interface</string>
+ <string name="settings_storage_category">Storage</string>
+ <string name="settings_data_category">Data</string>
+ <string name="settings_about_category">About</string>
+ <string name="settings_author_title">Author</string>
+ <string name="settings_about_apollo">About Apollo</string>
+ <string name="settings_special_thanks">Special thanks</string>
+ <string name="settings_cyanogenmod_title">CyanogenMod</string>
+ <string name="settings_self_title">Andrew Neal</string>
+ <string name="settings_lopez_title">A.J. Lopez</string>
+ <string name="settings_lopez_summary">Icon and Play Store banner design</string>
+ <string name="settings_color_scheme_title">Choose Apollo\'s default color scheme</string>
+ <string name="settings_color_scheme_summary">Changes the accent color in Apollo</string>
+ <string name="settings_theme_chooser_title">Theme chooser</string>
+ <string name="settings_delete_cache_title">Delete cache</string>
+ <string name="settings_delete_cache_summary">Remove all cached images</string>
+ <string name="settings_download_only_on_wifi_title">Download via Wi-Fi only</string>
+ <string name="settings_download_only_on_wifi_summary">To reduce carrier charges, don\'t download over mobile networks</string>
+ <string name="settings_download_missing_artwork_title">Download missing album art</string>
+ <string name="settings_download_artist_images_title">Download missing artist images</string>
+ <string name="settings_open_source_licenses">Open source licenses</string>
+ <string name="settings_use_lockscreen_controls">Use lockscreen controls</string>
+ <string name="settings_version_title">Version number</string>
+
+ <!-- Share Intent -->
+ <string name="now_listening_to">#NowPlaying</string>
+ <string name="by">by</string>
+ <string name="share_track_using">Share track using:</string>
+ <string name="hash_apollo">#Apollo</string>
+
+ <!-- ColorPicker -->
+ <string name="color_picker_title">Color scheme</string>
+ <string name="hex">#</string>
+ <string name="current_color">Current</string>
+ <string name="new_color">New</string>
+
+ <!-- App widget -->
+ <string name="app_widget_small">Apollo: 4x1</string>
+ <string name="app_widget_large">Apollo: 4x2</string>
+ <string name="app_widget_large_alt">Apollo: 4x2 (Alternate)</string>
+ <string name="app_widget_recent">Apollo: Recently listened</string>
+ <string name="app_widget_text_separator">-</string>
+
+ <!-- What keywords to use when shopping for Apollo themes -->
+ <string name="apollo_themes_shop_key">Apollo Themes</string>
+
+ <!-- Empty list / error messages -->
+ <string name="no_effects_for_you">The equalizer could not be opened.</string>
+ <string name="empty_music">To copy music from your computer to your device, use a USB cable.</string>
+ <string name="empty_last_added">Songs you\'ve added over the last month will be shown here.</string>
+ <string name="empty_search">No search results found</string>
+ <string name="empty_favorite">Songs you mark as favorites will be shown here.</string>
+ <string name="empty_recent">Albums you\'ve listened to will show up here. Try playing some music.</string>
+ <string name="no_lyrics">Lyrics for \"<xliff:g id="name">%s</xliff:g>\" could not be found</string>
+ <string name="try_fetch_lyrics">To fetch lyrics for \"<xliff:g id="name">%s</xliff:g>\" use \"Fetch lyrics\" in the menu.</string>
+
</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6ac2f46..b9fd264 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,186 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Custom tabs -->
- <style name="Tabs">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">@dimen/bottom_action_bar_height</item>
- <item name="android:background">@drawable/tab</item>
- <item name="android:gravity">center</item>
- <item name="android:paddingBottom">@dimen/tab_padding_top_bottom</item>
- <item name="android:paddingLeft">@dimen/tab_padding_left_right</item>
- <item name="android:paddingRight">@dimen/tab_padding_left_right</item>
- <item name="android:paddingTop">@dimen/tab_padding_top_bottom</item>
- <item name="android:textColor">@color/tab_text_color</item>
- <item name="android:textSize">@dimen/text_size_micro</item>
- <item name="android:textStyle">bold</item>
- <item name="android:focusable">true</item>
- <item name="android:focusableInTouchMode">false</item>
- <item name="android:selectAllOnFocus">false</item>
+ <!-- Main Holo -->
+ <style name="Apollo.Theme.Dark" parent="Theme.Sherlock">
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="windowContentOverlay">@null</item>
</style>
- <!-- ImageButton in the bottom bar -->
- <style name="BottomActionBarItem">
- <item name="android:layout_width">@dimen/bottom_action_bar_item_width</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:paddingLeft">@dimen/bottom_action_bar_item_padding_left_right</item>
- <item name="android:paddingRight">@dimen/bottom_action_bar_item_padding_left_right</item>
- <item name="android:background">@drawable/holo_selector</item>
+ <!-- Main Holo light -->
+ <style name="Apollo.Theme.Light" parent="Theme.Sherlock.Light">
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="windowContentOverlay">@null</item>
+ </style>
+
+ <!-- Shortcut Activity theme -->
+ <style name="Theme.Transparent" parent="Theme.Sherlock.NoActionBar">
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:windowBackground">@color/transparent</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:backgroundDimEnabled">false</item>
+ </style>
+
+ <!-- Notification bar event text -->
+ <style name="NotificationText">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:ellipsize">end</item>
+ <item name="android:fadingEdge">horizontal</item>
+ <item name="android:singleLine">true</item>
+ </style>
+
+ <!-- Notification bar actions -->
+ <style name="NotificationAction">
+ <item name="android:layout_width">@dimen/notification_action_width</item>
+ <item name="android:layout_height">@dimen/notification_action_height</item>
<item name="android:gravity">center|right</item>
+ <item name="android:scaleType">fitCenter</item>
+ <item name="android:padding">@dimen/notification_action_padding</item>
+ <item name="android:background">?android:selectableItemBackground</item>
</style>
- <!-- TextView in the bottom bar -->
+ <style name="NotificationAction.Previous" parent="@style/NotificationAction">
+ <item name="android:src">@drawable/btn_playback_previous</item>
+ <item name="android:visibility">gone</item>
+ <item name="android:contentDescription">@string/accessibility_prev</item>
+ </style>
+
+ <style name="NotificationAction.Play" parent="@style/NotificationAction">
+ <item name="android:src">@drawable/btn_playback_play</item>
+ <item name="android:contentDescription">@string/accessibility_play</item>
+ </style>
+
+ <style name="NotificationAction.Next" parent="@style/NotificationAction">
+ <item name="android:src">@drawable/btn_playback_next</item>
+ <item name="android:contentDescription">@string/accessibility_next</item>
+ </style>
+
+ <style name="NotificationAction.Collapse" parent="@style/NotificationAction">
+ <item name="android:src">@drawable/btn_notification_collapse</item>
+ </style>
+
+ <!-- Bottom Action Bar TextViews -->
<style name="BottomActionBarText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:ellipsize">end</item>
+ <item name="android:paddingLeft">5dp</item>
<item name="android:gravity">top|left|center</item>
<item name="android:singleLine">true</item>
+ <item name="android:textAllCaps">true</item>
<item name="android:textSize">@dimen/text_size_extra_micro</item>
- <item name="android:textAllCaps">true</item>
</style>
- <!-- List separator with a blue underline -->
- <style name="SeparatorTextViewStyle">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:minHeight">@dimen/list_separator_min_height</item>
- <item name="android:background">@drawable/list_section_divider_holo_custom</item>
- <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+ <style name="BottomActionBarLineOne" parent="@style/BottomActionBarText">
<item name="android:textStyle">bold</item>
- <item name="android:textColor">@color/holo_blue_dark</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:paddingRight">@dimen/list_separator_padding_left_right</item>
- <item name="android:visibility">gone</item>
- <item name="android:ellipsize">end</item>
- <item name="android:singleLine">true</item>
- <item name="android:textAllCaps">true</item>
- </style>
- <!-- Notification bar button -->
- <style name="StatusBarButton">
- <item name="android:layout_width">@dimen/status_bar_button_width_height</item>
- <item name="android:layout_height">@dimen/status_bar_button_width_height</item>
- <item name="android:layout_gravity">center|right</item>
- <item name="android:background">?android:listChoiceBackgroundIndicator</item>
</style>
- <!-- Notification bar text -->
- <style name="StatusBarText">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_gravity">left</item>
- <item name="android:ellipsize">marquee</item>
- <item name="android:scrollHorizontally">true</item>
- <item name="android:singleLine">true</item>
- </style>
+ <style name="BottomActionBarLineTwo" parent="@style/BottomActionBarText"></style>
- <!-- Half and half layout -->
- <style name="HalfText">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:background">@color/transparent_black</item>
- <item name="android:ellipsize">end</item>
- <item name="android:gravity">center</item>
- <item name="android:padding">@dimen/half_and_half_text_padding</item>
- <item name="android:singleLine">true</item>
- <item name="android:textColor">@color/white</item>
- <item name="android:textSize">@dimen/text_size_small</item>
- </style>
-
- <!-- ContextMenu header text -->
- <style name="HeaderText">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:ellipsize">end</item>
- <item name="android:gravity">center|left</item>
- <item name="android:paddingTop">@dimen/header_text_padding</item>
- <item name="android:paddingLeft">@dimen/header_text_padding_left</item>
- <item name="android:paddingBottom">@dimen/header_text_padding</item>
- <item name="android:paddingRight">@dimen/header_text_padding</item>
- <item name="android:singleLine">true</item>
- <item name="android:textColor">@color/white</item>
- <item name="android:textSize">@dimen/text_size_large</item>
- </style>
-
- <!-- TextView in shown over the images in the GridView -->
- <style name="GridViewTextItem">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:singleLine">true</item>
- <item name="android:ellipsize">end</item>
- <item name="android:shadowColor">@color/white</item>
- <item name="android:shadowRadius">1</item>
- <item name="android:textColor">@color/white</item>
- <item name="android:textSize">@dimen/text_size_medium</item>
- </style>
-
- <!-- Now playing indicator -->
- <style name="PeakMeter">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_alignParentRight">true</item>
- </style>
-
- <!-- TextView in the audio player -->
- <style name="AudioPlayerText">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:ellipsize">marquee</item>
- <item name="android:singleLine">true</item>
- <item name="android:focusable">true</item>
- <item name="android:focusableInTouchMode">true</item>
- <item name="android:lineSpacingMultiplier">1.2</item>
- <item name="android:scrollHorizontally">true</item>
- </style>
-
- <!-- ImageButton in the audio player controls -->
- <style name="AudioPlayerButton">
+ <!-- Bottom Action Bar Image Buttons -->
+ <style name="BottomActionBarItem">
+ <item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
- <item name="android:layout_weight">1</item>
- <item name="android:background">@drawable/holo_selector</item>
+ <item name="android:gravity">center|right</item>
+ <item name="android:paddingLeft">@dimen/bottom_action_bar_item_padding_left</item>
+ <item name="android:paddingRight">@dimen/bottom_action_bar_item_padding_right</item>
+ <item name="android:scaleType">centerInside</item>
</style>
- <!-- QuickQueue -->
- <style name="Theme.QuickQueue" parent="@android:style/Theme.Holo.Light">
- <item name="android:windowBackground">@color/transparent</item>
- <item name="android:colorBackgroundCacheHint">@null</item>
- <item name="android:windowFrame">@null</item>
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:windowAnimationStyle">@null</item>
- <item name="android:windowIsFloating">false</item>
- <item name="android:backgroundDimEnabled">true</item>
- <item name="android:windowIsTranslucent">true</item>
- <item name="android:windowNoTitle">true</item>
+ <style name="BottomActionBarItem.Previous" parent="@style/BottomActionBarItem">
+ <item name="android:contentDescription">@string/accessibility_prev</item>
</style>
- <!-- App Widget 4x2 -->
- <style name="FourByTwoMediaButton">
- <item name="android:layout_width">0dp</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:layout_weight">1</item>
- <item name="android:background">@drawable/holo_selector</item>
- <item name="android:scaleType">center</item>
+ <style name="BottomActionBarItem.Next" parent="@style/BottomActionBarItem">
+ <item name="android:contentDescription">@string/accessibility_next</item>
</style>
- <!-- Overflow Holo theme -->
- <style name="Apollo.Holo" parent="@android:style/Theme.Holo.Light">
- <item name="android:actionOverflowButtonStyle">@style/OverFlowHolo</item>
+ <style name="BottomActionBarItem.Play" parent="@style/BottomActionBarItem">
+ <item name="android:contentDescription">@string/accessibility_play</item>
</style>
- <!-- Overflow Holo.Light theme -->
- <style name="Apollo.Holo.Light" parent="@android:style/Theme.Holo.Light">
- <item name="android:actionOverflowButtonStyle">@style/OverFlowHolo.Light</item>
+ <style name="BottomActionBarItem.Shuffle" parent="@style/BottomActionBarItem">
+ <item name="android:contentDescription">@string/accessibility_shuffle</item>
</style>
- <!-- Overflow Holo.Dark -->
- <style name="OverFlowHolo" parent="@android:style/Widget.Holo.ActionButton.Overflow">
- <item name="android:src">@drawable/apollo_holo_dark_overflow</item>
- </style>
-
- <!-- Overflow Holo.Dark -->
- <style name="OverFlowHolo.Light" parent="@android:style/Widget.Holo.ActionButton.Overflow">
- <item name="android:src">@drawable/apollo_holo_light_overflow</item>
+ <style name="BottomActionBarItem.Repeat" parent="@style/BottomActionBarItem">
+ <item name="android:contentDescription">@string/accessibility_repeat</item>
</style>
</resources>
\ No newline at end of file
diff --git a/res/values/themeconfig.xml b/res/values/themeconfig.xml
new file mode 100644
index 0000000..bb5fb21
--- /dev/null
+++ b/res/values/themeconfig.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+
+ <!-- action bar color -->
+ <color name="action_bar">@color/action_bar_color</color>
+
+ <!-- The action bar title color -->
+ <color name="action_bar_title">@color/white</color>
+
+ <!-- The action bar sub title color -->
+ <color name="action_bar_subtitle">@color/transparent_white</color>
+
+ <!-- Lyrics color -->
+ <color name="lyrics">@color/white</color>
+
+ <!-- Adpater lines -->
+ <color name="line_one">@color/white</color>
+ <color name="line_two">@color/transparent_white</color>
+ <color name="line_three">@color/transparent_white</color>
+
+ <!-- Now playing -->
+ <color name="audio_player_current_time">@color/white</color>
+ <color name="audio_player_total_time">@color/white</color>
+ <color name="audio_player_line_one">@color/white</color>
+ <color name="audio_player_line_two">@color/transparent_white</color>
+ <color name="audio_player_pager_container">@color/action_bar_color</color>
+
+ <!-- Bottom action bar -->
+ <color name="bottom_action_bar">@color/action_bar_color</color>
+ <color name="bab_line_one">@color/white</color>
+ <color name="bab_line_two">@color/transparent_white</color>
+
+ <!-- Action bar items -->
+ <color name="favorite_normal">@color/transparent_white</color>
+ <color name="search_action">@color/transparent_white</color>
+ <color name="shop_action">@color/transparent_white</color>
+ <color name="pinn_to_action">@color/transparent_white</color>
+
+</resources>
\ No newline at end of file
diff --git a/res/xml-v14/app_widget_recents.xml b/res/xml-v14/app_widget_recents.xml
new file mode 100644
index 0000000..700b6d2
--- /dev/null
+++ b/res/xml-v14/app_widget_recents.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+ android:initialLayout="@layout/app_widget_recents"
+ android:minHeight="@dimen/app_widget_scrollable_min_height"
+ android:minResizeHeight="@dimen/app_widget_scrollable_min_resize_height"
+ android:minResizeWidth="@dimen/app_widget_large_min_width"
+ android:minWidth="@dimen/app_widget_large_min_width"
+ android:previewImage="@drawable/app_widget_recents"
+ android:resizeMode="vertical|horizontal"
+ android:updatePeriodMillis="0"
+ android:widgetCategory="keyguard|home_screen" />
diff --git a/res/xml-v14/settings.xml b/res/xml-v14/settings.xml
new file mode 100644
index 0000000..2ad14a8
--- /dev/null
+++ b/res/xml-v14/settings.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <!-- UI catetgory -->
+ <PreferenceCategory android:title="@string/settings_ui_category" >
+
+ <!-- Color scheme -->
+ <Preference
+ android:key="color_scheme"
+ android:summary="@string/settings_color_scheme_summary"
+ android:title="@string/settings_color_scheme_title" />
+ <!-- Theme chooser -->
+ <Preference
+ android:key="theme_chooser"
+ android:title="@string/settings_theme_chooser_title" />
+ <!-- Enable lockscreen controls -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="lockscreen_controls"
+ android:title="@string/settings_use_lockscreen_controls" />
+ </PreferenceCategory>
+ <!-- Data catetory -->
+ <PreferenceCategory android:title="@string/settings_data_category" >
+
+ <!-- Only on Wi-Fi -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="only_on_wifi"
+ android:summary="@string/settings_download_only_on_wifi_summary"
+ android:title="@string/settings_download_only_on_wifi_title" />
+ <!-- Missing artwork -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="album_images"
+ android:title="@string/settings_download_missing_artwork_title" />
+ <!-- Missing artist images -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="artist_images"
+ android:title="@string/settings_download_artist_images_title" />
+ </PreferenceCategory>
+ <!-- Storage catetory -->
+ <PreferenceCategory android:title="@string/settings_storage_category" >
+
+ <!-- Delete cache -->
+ <Preference
+ android:key="delete_cache"
+ android:summary="@string/settings_delete_cache_summary"
+ android:title="@string/settings_delete_cache_title" />
+ </PreferenceCategory>
+ <!-- About -->
+ <PreferenceCategory android:title="@string/settings_about_category" >
+ <PreferenceScreen android:title="@string/settings_about_apollo" >
+ <PreferenceCategory android:title="@string/settings_about_category" >
+ <Preference
+ android:summary="@string/settings_self_title"
+ android:title="@string/settings_author_title" />
+ <Preference
+ android:key="version"
+ android:title="@string/settings_version_title" />
+ <Preference
+ android:key="open_source"
+ android:title="@string/settings_open_source_licenses" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_special_thanks" >
+ <Preference
+ android:summary="@string/settings_lopez_summary"
+ android:title="@string/settings_lopez_title" />
+ <Preference android:title="@string/settings_cyanogenmod_title" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+ </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_widget_large.xml b/res/xml/app_widget_large.xml
new file mode 100644
index 0000000..4061634
--- /dev/null
+++ b/res/xml/app_widget_large.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+ android:initialLayout="@layout/app_widget_large"
+ android:minHeight="@dimen/app_widget_large_min_height"
+ android:minWidth="@dimen/app_widget_large_min_width"
+ android:previewImage="@drawable/app_widget_large"
+ android:updatePeriodMillis="0"
+ android:widgetCategory="keyguard|home_screen" />
diff --git a/res/xml/app_widget_large_alternate.xml b/res/xml/app_widget_large_alternate.xml
new file mode 100644
index 0000000..5b80b2c
--- /dev/null
+++ b/res/xml/app_widget_large_alternate.xml
Binary files differ
diff --git a/res/xml/app_widget_small.xml b/res/xml/app_widget_small.xml
new file mode 100644
index 0000000..4bcee5e
--- /dev/null
+++ b/res/xml/app_widget_small.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+ android:initialLayout="@layout/app_widget_small"
+ android:minHeight="@dimen/app_widget_small_min_height"
+ android:minWidth="@dimen/app_widget_small_min_width"
+ android:previewImage="@drawable/app_widget_small"
+ android:updatePeriodMillis="0"
+ android:widgetCategory="keyguard|home_screen" />
diff --git a/res/xml/appwidget1x1_info.xml b/res/xml/appwidget1x1_info.xml
deleted file mode 100644
index 680c1ef..0000000
--- a/res/xml/appwidget1x1_info.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:initialLayout="@layout/onebyone_app_widget"
- android:minHeight="40dp"
- android:minWidth="40dp"
- android:updatePeriodMillis="0" />
\ No newline at end of file
diff --git a/res/xml/appwidget4x1_info.xml b/res/xml/appwidget4x1_info.xml
deleted file mode 100644
index aad2bb0..0000000
--- a/res/xml/appwidget4x1_info.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:initialLayout="@layout/fourbyone_app_widget"
- android:minHeight="40dp"
- android:minWidth="260dp"
- android:updatePeriodMillis="0" />
diff --git a/res/xml/appwidget4x2_info.xml b/res/xml/appwidget4x2_info.xml
deleted file mode 100644
index 0605762..0000000
--- a/res/xml/appwidget4x2_info.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:initialLayout="@layout/fourbytwo_app_widget"
- android:minHeight="110dp"
- android:minWidth="250dp"
- android:updatePeriodMillis="0" />
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index c4f8174..ce451fb 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
- android:includeInGlobalSearch="true"
- android:label="@string/search"
- android:searchSuggestIntentAction="android.intent.action.VIEW"
- android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+ android:imeOptions="actionSearch"
+ android:label="@string/menu_search"
+ android:searchSuggestIntentAction="android.intent.action.SEARCH"
+ android:searchSuggestSelection=" ? "
+ android:searchSuggestThreshold="2"
+ android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" >
+
+</searchable>
\ No newline at end of file
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index fbd15fc..e2850a5 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,28 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
- <PreferenceCategory android:title="@string/header_interface" >
- <PreferenceScreen
- android:icon="@drawable/apollo_settings_themes"
- android:key="@string/key_themes_preferences"
- android:title="@string/themes" >
- <ListPreference
- android:key="@string/key_themes_package"
- android:summary="@string/apollo_themes"
- android:title="@string/select_theme" />
+ <!-- UI catetgory -->
+ <PreferenceCategory android:title="@string/settings_ui_category" >
- <com.andrew.apollo.preferences.ThemePreview
- android:key="@string/key_themes"
- android:layout="@layout/theme_preview" />
- </PreferenceScreen>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/about" >
+ <!-- Color scheme -->
<Preference
- style="?android:preferenceInformationStyle"
- android:enabled="false"
- android:key="@string/key_build_version"
- android:summary="1.0"
- android:title="@string/version" />
+ android:key="color_scheme"
+ android:summary="@string/settings_color_scheme_summary"
+ android:title="@string/settings_color_scheme_title" />
+ <!-- Theme chooser -->
+ <Preference
+ android:key="theme_chooser"
+ android:title="@string/settings_theme_chooser_title" />
+ </PreferenceCategory>
+ <!-- Data catetory -->
+ <PreferenceCategory android:title="@string/settings_data_category" >
+
+ <!-- Only on Wi-Fi -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="only_on_wifi"
+ android:summary="@string/settings_download_only_on_wifi_summary"
+ android:title="@string/settings_download_only_on_wifi_title" />
+ <!-- Missing artwork -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="album_images"
+ android:title="@string/settings_download_missing_artwork_title" />
+ <!-- Missing artist images -->
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="artist_images"
+ android:title="@string/settings_download_artist_images_title" />
+ </PreferenceCategory>
+ <!-- Storage catetory -->
+ <PreferenceCategory android:title="@string/settings_storage_category" >
+
+ <!-- Delete cache -->
+ <Preference
+ android:key="delete_cache"
+ android:summary="@string/settings_delete_cache_summary"
+ android:title="@string/settings_delete_cache_title" />
+ </PreferenceCategory>
+ <!-- About -->
+ <PreferenceCategory android:title="@string/settings_about_category" >
+ <PreferenceScreen android:title="@string/settings_about_apollo" >
+ <PreferenceCategory android:title="@string/settings_about_category" >
+ <Preference
+ android:summary="@string/settings_self_title"
+ android:title="@string/settings_author_title" />
+ <Preference
+ android:key="version"
+ android:title="@string/settings_version_title" />
+ <Preference
+ android:key="open_source"
+ android:title="@string/settings_open_source_licenses" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_special_thanks" >
+ <Preference
+ android:summary="@string/settings_lopez_summary"
+ android:title="@string/settings_lopez_title" />
+ <Preference android:title="@string/settings_cyanogenmod_title" />
+ </PreferenceCategory>
+ </PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>
\ No newline at end of file
