summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorlinus_lee <llee@cyngn.com>2014-08-28 19:43:43 -0700
committerlinus_lee <llee@cyngn.com>2014-11-20 11:58:47 -0800
commit08276a046ece9c2d25ee5db858bce822bfb0a292 (patch)
treebb676f1fe4bc7c5dec7c2d17fac7540dfa2ace27 /res
parentec7eb2e4ef7d143e49998ed88753d7c79a662f2f (diff)
downloadandroid_packages_apps_Eleven-08276a046ece9c2d25ee5db858bce822bfb0a292.tar.gz
android_packages_apps_Eleven-08276a046ece9c2d25ee5db858bce822bfb0a292.tar.bz2
android_packages_apps_Eleven-08276a046ece9c2d25ee5db858bce822bfb0a292.zip
Eleven: Add circular progress bar logic and hook into main view and queue view
This hooks up most of the circular progress bar logic but is pending design redlines to fill in the rest of the parts Change-Id: Ibeb0c724aae7ad8ddf6b216ce7a8b73464112c0e
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/btn_add_to_playlist.pngbin0 -> 221 bytes
-rw-r--r--res/drawable-hdpi/btn_header_collapse.pngbin0 -> 393 bytes
-rw-r--r--res/drawable-hdpi/btn_playback_icon.pngbin0 -> 451 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_next.pngbin1521 -> 692 bytes
-rwxr-xr-xres/drawable-hdpi/btn_playback_pause_big.pngbin0 -> 464 bytes
-rwxr-xr-xres/drawable-hdpi/btn_playback_pause_med.pngbin0 -> 242 bytes
-rwxr-xr-xres/drawable-hdpi/btn_playback_pause_small.pngbin0 -> 201 bytes
-rw-r--r--res/drawable-hdpi/btn_playback_play.pngbin1410 -> 641 bytes
-rwxr-xr-xres/drawable-hdpi/btn_playback_play_large.pngbin0 -> 403 bytes
-rwxr-xr-xres/drawable-hdpi/btn_playback_play_med.pngbin0 -> 309 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_previous.pngbin1503 -> 693 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_repeat.pngbin1763 -> 490 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_repeat_all.pngbin1024 -> 465 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_repeat_one.pngbin1215 -> 568 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_shuffle.pngbin1098 -> 362 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/btn_playback_shuffle_all.pngbin1201 -> 394 bytes
-rw-r--r--res/drawable-hdpi/btn_queue_icon.pngbin0 -> 442 bytes
-rw-r--r--res/drawable-hdpi/btn_switch_queue.pngbin435 -> 207 bytes
-rwxr-xr-xres/drawable-hdpi/button_playback_play_small.pngbin0 -> 252 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/default_artwork.pngbin4712 -> 3876 bytes
-rw-r--r--res/drawable-hdpi/drag_indicator.pngbin0 -> 218 bytes
-rw-r--r--res/drawable-hdpi/ic_action_search.pngbin3120 -> 552 bytes
-rw-r--r--res/drawable-hdpi/menu_button.pngbin0 -> 338 bytes
-rw-r--r--res/drawable-mdpi/btn_add_to_playlist.pngbin0 -> 172 bytes
-rw-r--r--res/drawable-mdpi/btn_header_collapse.pngbin0 -> 250 bytes
-rw-r--r--res/drawable-mdpi/btn_playback_icon.pngbin0 -> 330 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_next.pngbin1316 -> 527 bytes
-rwxr-xr-xres/drawable-mdpi/btn_playback_pause_big.pngbin0 -> 1235 bytes
-rwxr-xr-xres/drawable-mdpi/btn_playback_pause_med.pngbin0 -> 1219 bytes
-rwxr-xr-xres/drawable-mdpi/btn_playback_pause_small.pngbin0 -> 1216 bytes
-rw-r--r--res/drawable-mdpi/btn_playback_play.pngbin1248 -> 463 bytes
-rwxr-xr-xres/drawable-mdpi/btn_playback_play_large.pngbin0 -> 313 bytes
-rwxr-xr-xres/drawable-mdpi/btn_playback_play_med.pngbin0 -> 248 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_previous.pngbin1333 -> 534 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_repeat.pngbin1435 -> 344 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_repeat_all.pngbin655 -> 295 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_repeat_one.pngbin731 -> 382 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_shuffle.pngbin640 -> 277 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/btn_playback_shuffle_all.pngbin736 -> 257 bytes
-rw-r--r--res/drawable-mdpi/btn_queue_icon.pngbin0 -> 318 bytes
-rw-r--r--res/drawable-mdpi/btn_switch_queue.pngbin315 -> 174 bytes
-rwxr-xr-xres/drawable-mdpi/button_playback_play_small.pngbin0 -> 206 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/default_artwork.pngbin3382 -> 20566 bytes
-rw-r--r--res/drawable-mdpi/drag_indicator.pngbin0 -> 176 bytes
-rw-r--r--res/drawable-mdpi/ic_action_search.pngbin3030 -> 434 bytes
-rw-r--r--res/drawable-mdpi/menu_button.pngbin0 -> 245 bytes
-rw-r--r--res/drawable-xhdpi/btn_add_to_playlist.pngbin0 -> 207 bytes
-rw-r--r--res/drawable-xhdpi/btn_playback_icon.pngbin0 -> 515 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_next.pngbin1750 -> 816 bytes
-rwxr-xr-xres/drawable-xhdpi/btn_playback_pause_big.pngbin0 -> 1266 bytes
-rwxr-xr-xres/drawable-xhdpi/btn_playback_pause_med.pngbin0 -> 1235 bytes
-rwxr-xr-xres/drawable-xhdpi/btn_playback_pause_small.pngbin0 -> 1224 bytes
-rw-r--r--res/drawable-xhdpi/btn_playback_play.pngbin1620 -> 823 bytes
-rwxr-xr-xres/drawable-xhdpi/btn_playback_play_large.pngbin0 -> 470 bytes
-rwxr-xr-xres/drawable-xhdpi/btn_playback_play_med.pngbin0 -> 328 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_previous.pngbin1736 -> 811 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_repeat.pngbin2066 -> 565 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_repeat_all.pngbin1116 -> 570 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_repeat_one.pngbin1561 -> 665 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_shuffle.pngbin2283 -> 478 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/btn_playback_shuffle_all.pngbin1407 -> 486 bytes
-rw-r--r--res/drawable-xhdpi/btn_queue_icon.pngbin0 -> 493 bytes
-rw-r--r--res/drawable-xhdpi/btn_switch_queue.pngbin347 -> 213 bytes
-rwxr-xr-xres/drawable-xhdpi/button_playback_play_small.pngbin0 -> 331 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/default_artwork.pngbin5981 -> 5540 bytes
-rw-r--r--res/drawable-xhdpi/drag_indicator.pngbin254 -> 207 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_search.pngbin3199 -> 727 bytes
-rw-r--r--res/drawable-xhdpi/menu_button.pngbin259 -> 407 bytes
-rw-r--r--res/drawable-xxhdpi/btn_add_to_playlist.pngbin0 -> 247 bytes
-rw-r--r--res/drawable-xxhdpi/btn_header_collapse.pngbin0 -> 570 bytes
-rw-r--r--res/drawable-xxhdpi/btn_playback_icon.pngbin0 -> 694 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_next.pngbin0 -> 1192 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_pause_big.pngbin0 -> 1283 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_pause_med.pngbin0 -> 1254 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_pause_small.pngbin0 -> 1230 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_play_large.pngbin0 -> 656 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_play_med.pngbin0 -> 435 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_previous.pngbin0 -> 1192 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_repeat.pngbin0 -> 814 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_repeat_all.pngbin0 -> 829 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_repeat_one.pngbin0 -> 956 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_shuffle.pngbin0 -> 593 bytes
-rwxr-xr-xres/drawable-xxhdpi/btn_playback_shuffle_all.pngbin0 -> 573 bytes
-rw-r--r--res/drawable-xxhdpi/btn_queue_icon.pngbin0 -> 692 bytes
-rw-r--r--res/drawable-xxhdpi/btn_switch_queue.pngbin0 -> 280 bytes
-rwxr-xr-xres/drawable-xxhdpi/button_playback_play_small.pngbin0 -> 440 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xxhdpi/default_artwork.pngbin27899 -> 9053 bytes
-rw-r--r--res/drawable-xxhdpi/drag_indicator.pngbin0 -> 275 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_search.pngbin0 -> 1065 bytes
-rw-r--r--res/drawable-xxhdpi/menu_button.pngbin0 -> 586 bytes
-rw-r--r--res/drawable/circular_drawable.xml12
-rw-r--r--res/drawable/circular_drawable_background.xml12
-rw-r--r--res/layout/activity_base.xml6
-rw-r--r--res/layout/activity_player_fragment.xml193
-rw-r--r--res/layout/audio_player_controls.xml94
-rw-r--r--res/layout/header_bar.xml19
-rw-r--r--res/layout/list_item_song.xml23
-rw-r--r--res/layout/play_pause_progress_button.xml45
-rw-r--r--res/values/colors.xml9
-rw-r--r--res/values/dimens.xml48
-rw-r--r--res/values/styles.xml1
-rw-r--r--res/values/values.xml6
102 files changed, 271 insertions, 197 deletions
diff --git a/res/drawable-hdpi/btn_add_to_playlist.png b/res/drawable-hdpi/btn_add_to_playlist.png
new file mode 100644
index 0000000..604f123
--- /dev/null
+++ b/res/drawable-hdpi/btn_add_to_playlist.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_header_collapse.png b/res/drawable-hdpi/btn_header_collapse.png
new file mode 100644
index 0000000..73ff888
--- /dev/null
+++ b/res/drawable-hdpi/btn_header_collapse.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_icon.png b/res/drawable-hdpi/btn_playback_icon.png
new file mode 100644
index 0000000..2f29011
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_icon.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_next.png b/res/drawable-hdpi/btn_playback_next.png
index 738aae1..a4acc15 100644..100755
--- a/res/drawable-hdpi/btn_playback_next.png
+++ b/res/drawable-hdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_pause_big.png b/res/drawable-hdpi/btn_playback_pause_big.png
new file mode 100755
index 0000000..649d1fb
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_pause_big.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_pause_med.png b/res/drawable-hdpi/btn_playback_pause_med.png
new file mode 100755
index 0000000..ad546dd
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_pause_med.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_pause_small.png b/res/drawable-hdpi/btn_playback_pause_small.png
new file mode 100755
index 0000000..43e7721
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_pause_small.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_play.png b/res/drawable-hdpi/btn_playback_play.png
index df8a2ca..6d62fd2 100644
--- a/res/drawable-hdpi/btn_playback_play.png
+++ b/res/drawable-hdpi/btn_playback_play.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_play_large.png b/res/drawable-hdpi/btn_playback_play_large.png
new file mode 100755
index 0000000..4ac3b13
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_play_large.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_play_med.png b/res/drawable-hdpi/btn_playback_play_med.png
new file mode 100755
index 0000000..f42ceef
--- /dev/null
+++ b/res/drawable-hdpi/btn_playback_play_med.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_previous.png b/res/drawable-hdpi/btn_playback_previous.png
index ba6c5ad..3a36ce1 100644..100755
--- a/res/drawable-hdpi/btn_playback_previous.png
+++ 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
index fd84738..347daec 100644..100755
--- a/res/drawable-hdpi/btn_playback_repeat.png
+++ 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
index d665477..13e95db 100644..100755
--- a/res/drawable-hdpi/btn_playback_repeat_all.png
+++ 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
index 1a49b49..956c9ed 100644..100755
--- a/res/drawable-hdpi/btn_playback_repeat_one.png
+++ 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
index 6504781..066cf3f 100644..100755
--- a/res/drawable-hdpi/btn_playback_shuffle.png
+++ 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
index ea3cd12..b1c5c00 100644..100755
--- a/res/drawable-hdpi/btn_playback_shuffle_all.png
+++ b/res/drawable-hdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_queue_icon.png b/res/drawable-hdpi/btn_queue_icon.png
new file mode 100644
index 0000000..7eac70a
--- /dev/null
+++ b/res/drawable-hdpi/btn_queue_icon.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_switch_queue.png b/res/drawable-hdpi/btn_switch_queue.png
index 740e55b..e4aa20a 100644
--- a/res/drawable-hdpi/btn_switch_queue.png
+++ b/res/drawable-hdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-hdpi/button_playback_play_small.png b/res/drawable-hdpi/button_playback_play_small.png
new file mode 100755
index 0000000..09aaae7
--- /dev/null
+++ b/res/drawable-hdpi/button_playback_play_small.png
Binary files differ
diff --git a/res/drawable-hdpi/default_artwork.png b/res/drawable-hdpi/default_artwork.png
index 5151e89..18c2167 100644..100755
--- a/res/drawable-hdpi/default_artwork.png
+++ b/res/drawable-hdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-hdpi/drag_indicator.png b/res/drawable-hdpi/drag_indicator.png
new file mode 100644
index 0000000..891c247
--- /dev/null
+++ b/res/drawable-hdpi/drag_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
index 67de12d..a12393e 100644
--- a/res/drawable-hdpi/ic_action_search.png
+++ b/res/drawable-hdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-hdpi/menu_button.png b/res/drawable-hdpi/menu_button.png
new file mode 100644
index 0000000..c640606
--- /dev/null
+++ b/res/drawable-hdpi/menu_button.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_add_to_playlist.png b/res/drawable-mdpi/btn_add_to_playlist.png
new file mode 100644
index 0000000..61df825
--- /dev/null
+++ b/res/drawable-mdpi/btn_add_to_playlist.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_header_collapse.png b/res/drawable-mdpi/btn_header_collapse.png
new file mode 100644
index 0000000..f2d899c
--- /dev/null
+++ b/res/drawable-mdpi/btn_header_collapse.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_icon.png b/res/drawable-mdpi/btn_playback_icon.png
new file mode 100644
index 0000000..1520ff4
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_icon.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_next.png b/res/drawable-mdpi/btn_playback_next.png
index 28e8137..efc5b90 100644..100755
--- a/res/drawable-mdpi/btn_playback_next.png
+++ b/res/drawable-mdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_pause_big.png b/res/drawable-mdpi/btn_playback_pause_big.png
new file mode 100755
index 0000000..7920931
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_pause_big.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_pause_med.png b/res/drawable-mdpi/btn_playback_pause_med.png
new file mode 100755
index 0000000..4a3c031
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_pause_med.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_pause_small.png b/res/drawable-mdpi/btn_playback_pause_small.png
new file mode 100755
index 0000000..f8b6c21
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_pause_small.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_play.png b/res/drawable-mdpi/btn_playback_play.png
index 6a40cd5..80426b7 100644
--- a/res/drawable-mdpi/btn_playback_play.png
+++ b/res/drawable-mdpi/btn_playback_play.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_play_large.png b/res/drawable-mdpi/btn_playback_play_large.png
new file mode 100755
index 0000000..836677b
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_play_large.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_play_med.png b/res/drawable-mdpi/btn_playback_play_med.png
new file mode 100755
index 0000000..3272def
--- /dev/null
+++ b/res/drawable-mdpi/btn_playback_play_med.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_previous.png b/res/drawable-mdpi/btn_playback_previous.png
index 6c67842..4420bc9 100644..100755
--- a/res/drawable-mdpi/btn_playback_previous.png
+++ 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
index 685609c..3fc28fd 100644..100755
--- a/res/drawable-mdpi/btn_playback_repeat.png
+++ 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
index e708613..d9a3c87 100644..100755
--- a/res/drawable-mdpi/btn_playback_repeat_all.png
+++ 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
index 1c51450..f87db63 100644..100755
--- a/res/drawable-mdpi/btn_playback_repeat_one.png
+++ 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
index fbbffa5..8b437f4 100644..100755
--- a/res/drawable-mdpi/btn_playback_shuffle.png
+++ 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
index fc687d1..c9f3c26 100644..100755
--- a/res/drawable-mdpi/btn_playback_shuffle_all.png
+++ b/res/drawable-mdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_queue_icon.png b/res/drawable-mdpi/btn_queue_icon.png
new file mode 100644
index 0000000..c9f5a2d
--- /dev/null
+++ b/res/drawable-mdpi/btn_queue_icon.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_switch_queue.png b/res/drawable-mdpi/btn_switch_queue.png
index 206dd48..47ac1ed 100644
--- a/res/drawable-mdpi/btn_switch_queue.png
+++ b/res/drawable-mdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-mdpi/button_playback_play_small.png b/res/drawable-mdpi/button_playback_play_small.png
new file mode 100755
index 0000000..49070c5
--- /dev/null
+++ b/res/drawable-mdpi/button_playback_play_small.png
Binary files differ
diff --git a/res/drawable-mdpi/default_artwork.png b/res/drawable-mdpi/default_artwork.png
index fa32979..8958ba5 100644..100755
--- a/res/drawable-mdpi/default_artwork.png
+++ b/res/drawable-mdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-mdpi/drag_indicator.png b/res/drawable-mdpi/drag_indicator.png
new file mode 100644
index 0000000..66ef352
--- /dev/null
+++ b/res/drawable-mdpi/drag_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
index 134d549..a920e50 100644
--- a/res/drawable-mdpi/ic_action_search.png
+++ b/res/drawable-mdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-mdpi/menu_button.png b/res/drawable-mdpi/menu_button.png
new file mode 100644
index 0000000..9d63177
--- /dev/null
+++ b/res/drawable-mdpi/menu_button.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_add_to_playlist.png b/res/drawable-xhdpi/btn_add_to_playlist.png
new file mode 100644
index 0000000..63b3da8
--- /dev/null
+++ b/res/drawable-xhdpi/btn_add_to_playlist.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_icon.png b/res/drawable-xhdpi/btn_playback_icon.png
new file mode 100644
index 0000000..576a293
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_icon.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_next.png b/res/drawable-xhdpi/btn_playback_next.png
index fe6b558..f984713 100644..100755
--- a/res/drawable-xhdpi/btn_playback_next.png
+++ b/res/drawable-xhdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_pause_big.png b/res/drawable-xhdpi/btn_playback_pause_big.png
new file mode 100755
index 0000000..8dd321d
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_pause_big.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_pause_med.png b/res/drawable-xhdpi/btn_playback_pause_med.png
new file mode 100755
index 0000000..0982863
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_pause_med.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_pause_small.png b/res/drawable-xhdpi/btn_playback_pause_small.png
new file mode 100755
index 0000000..febec8f
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_pause_small.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_play.png b/res/drawable-xhdpi/btn_playback_play.png
index 5112499..ba567e5 100644
--- a/res/drawable-xhdpi/btn_playback_play.png
+++ b/res/drawable-xhdpi/btn_playback_play.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_play_large.png b/res/drawable-xhdpi/btn_playback_play_large.png
new file mode 100755
index 0000000..83ac04f
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_play_large.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_play_med.png b/res/drawable-xhdpi/btn_playback_play_med.png
new file mode 100755
index 0000000..a0c72d1
--- /dev/null
+++ b/res/drawable-xhdpi/btn_playback_play_med.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_previous.png b/res/drawable-xhdpi/btn_playback_previous.png
index 5be8b46..ea9255d 100644..100755
--- a/res/drawable-xhdpi/btn_playback_previous.png
+++ 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
index b72f10d..e9e64e1 100644..100755
--- a/res/drawable-xhdpi/btn_playback_repeat.png
+++ 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
index 963be39..de5d760 100644..100755
--- a/res/drawable-xhdpi/btn_playback_repeat_all.png
+++ 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
index 7c1b347..4cfb8c8 100644..100755
--- a/res/drawable-xhdpi/btn_playback_repeat_one.png
+++ 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
index b5cae4f..4e14569 100644..100755
--- a/res/drawable-xhdpi/btn_playback_shuffle.png
+++ 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
index ad17616..6067201 100644..100755
--- a/res/drawable-xhdpi/btn_playback_shuffle_all.png
+++ b/res/drawable-xhdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_queue_icon.png b/res/drawable-xhdpi/btn_queue_icon.png
new file mode 100644
index 0000000..a708040
--- /dev/null
+++ b/res/drawable-xhdpi/btn_queue_icon.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_switch_queue.png b/res/drawable-xhdpi/btn_switch_queue.png
index 37b292d..90e4529 100644
--- a/res/drawable-xhdpi/btn_switch_queue.png
+++ b/res/drawable-xhdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-xhdpi/button_playback_play_small.png b/res/drawable-xhdpi/button_playback_play_small.png
new file mode 100755
index 0000000..d78fc80
--- /dev/null
+++ b/res/drawable-xhdpi/button_playback_play_small.png
Binary files differ
diff --git a/res/drawable-xhdpi/default_artwork.png b/res/drawable-xhdpi/default_artwork.png
index e89637a..482afe4 100644..100755
--- a/res/drawable-xhdpi/default_artwork.png
+++ b/res/drawable-xhdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-xhdpi/drag_indicator.png b/res/drawable-xhdpi/drag_indicator.png
index 6f32fdf..509864f 100644
--- a/res/drawable-xhdpi/drag_indicator.png
+++ b/res/drawable-xhdpi/drag_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
index d699c6b..c631b1d 100644
--- a/res/drawable-xhdpi/ic_action_search.png
+++ b/res/drawable-xhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xhdpi/menu_button.png b/res/drawable-xhdpi/menu_button.png
index 7bfa3ec..67fdc8c 100644
--- a/res/drawable-xhdpi/menu_button.png
+++ b/res/drawable-xhdpi/menu_button.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_add_to_playlist.png b/res/drawable-xxhdpi/btn_add_to_playlist.png
new file mode 100644
index 0000000..ed39849
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_add_to_playlist.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_header_collapse.png b/res/drawable-xxhdpi/btn_header_collapse.png
new file mode 100644
index 0000000..7f97d5f
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_header_collapse.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_icon.png b/res/drawable-xxhdpi/btn_playback_icon.png
new file mode 100644
index 0000000..6381cc1
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_next.png b/res/drawable-xxhdpi/btn_playback_next.png
new file mode 100755
index 0000000..f4dfedd
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_next.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause_big.png b/res/drawable-xxhdpi/btn_playback_pause_big.png
new file mode 100755
index 0000000..015af14
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_pause_big.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause_med.png b/res/drawable-xxhdpi/btn_playback_pause_med.png
new file mode 100755
index 0000000..518ae7c
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_pause_med.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause_small.png b/res/drawable-xxhdpi/btn_playback_pause_small.png
new file mode 100755
index 0000000..efecc3a
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_pause_small.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_play_large.png b/res/drawable-xxhdpi/btn_playback_play_large.png
new file mode 100755
index 0000000..3a5252d
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_play_large.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_play_med.png b/res/drawable-xxhdpi/btn_playback_play_med.png
new file mode 100755
index 0000000..e7f3265
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_play_med.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_previous.png b/res/drawable-xxhdpi/btn_playback_previous.png
new file mode 100755
index 0000000..b244547
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_previous.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_repeat.png b/res/drawable-xxhdpi/btn_playback_repeat.png
new file mode 100755
index 0000000..0a5fb12
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_repeat.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_repeat_all.png b/res/drawable-xxhdpi/btn_playback_repeat_all.png
new file mode 100755
index 0000000..b570cd6
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_repeat_all.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_repeat_one.png b/res/drawable-xxhdpi/btn_playback_repeat_one.png
new file mode 100755
index 0000000..814a967
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_repeat_one.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_shuffle.png b/res/drawable-xxhdpi/btn_playback_shuffle.png
new file mode 100755
index 0000000..db40407
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_shuffle.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_shuffle_all.png b/res/drawable-xxhdpi/btn_playback_shuffle_all.png
new file mode 100755
index 0000000..fa8643e
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_playback_shuffle_all.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_queue_icon.png b/res/drawable-xxhdpi/btn_queue_icon.png
new file mode 100644
index 0000000..196b7d3
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_queue_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_switch_queue.png b/res/drawable-xxhdpi/btn_switch_queue.png
new file mode 100644
index 0000000..6092718
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_switch_queue.png
Binary files differ
diff --git a/res/drawable-xxhdpi/button_playback_play_small.png b/res/drawable-xxhdpi/button_playback_play_small.png
new file mode 100755
index 0000000..b06d86b
--- /dev/null
+++ b/res/drawable-xxhdpi/button_playback_play_small.png
Binary files differ
diff --git a/res/drawable-xxhdpi/default_artwork.png b/res/drawable-xxhdpi/default_artwork.png
index b78cc2a..3f4fa4c 100644..100755
--- a/res/drawable-xxhdpi/default_artwork.png
+++ b/res/drawable-xxhdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-xxhdpi/drag_indicator.png b/res/drawable-xxhdpi/drag_indicator.png
new file mode 100644
index 0000000..1b37242
--- /dev/null
+++ b/res/drawable-xxhdpi/drag_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 0000000..be447dc
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xxhdpi/menu_button.png b/res/drawable-xxhdpi/menu_button.png
new file mode 100644
index 0000000..055dfc2
--- /dev/null
+++ b/res/drawable-xxhdpi/menu_button.png
Binary files differ
diff --git a/res/drawable/circular_drawable.xml b/res/drawable/circular_drawable.xml
new file mode 100644
index 0000000..0b2c72d
--- /dev/null
+++ b/res/drawable/circular_drawable.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Cyanogen, Inc.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:innerRadiusRatio="@dimen/circular_progress_bar_inner_radius_ratio"
+ android:thicknessRatio="@dimen/circular_progress_bar_thickness_ratio"
+ android:shape="ring">
+ <solid android:color="@color/circular_progress_bar" />
+</shape> \ No newline at end of file
diff --git a/res/drawable/circular_drawable_background.xml b/res/drawable/circular_drawable_background.xml
new file mode 100644
index 0000000..05dadb5
--- /dev/null
+++ b/res/drawable/circular_drawable_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Cyanogen, Inc.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:innerRadiusRatio="@dimen/circular_progress_bar_inner_radius_ratio"
+ android:thicknessRatio="@dimen/circular_progress_bar_thickness_ratio"
+ android:shape="ring">
+ <solid android:color="@color/circular_progress_bar_background" />
+</shape>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 42ded6d..6c1ee5b 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -27,7 +27,8 @@
android:gravity="bottom"
sothree:panelHeight="@dimen/bottom_action_bar_height"
sothree:slidePanelOffset="@dimen/bottom_action_bar_height"
- sothree:dragView="@+id/firstPanelDragArea">
+ sothree:dragView="@+id/firstPanelDragArea"
+ sothree:shadowHeight="@dimen/sliding_panel_shadow_height">
<FrameLayout
android:id="@+id/activity_base_content"
@@ -43,7 +44,8 @@
android:gravity="bottom"
sothree:directOffset="true"
sothree:panelHeight="@dimen/sliding_panel_indicator_height"
- sothree:dragView="@+id/secondPanelDragArea">
+ sothree:dragView="@+id/secondPanelDragArea"
+ sothree:shadowHeight="@dimen/sliding_panel_shadow_height">
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index 5b7affa..27fb7b5 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -53,89 +53,144 @@
</RelativeLayout>
+ <!-- This is the add to playlist, track name and menu button -->
<LinearLayout
- android:id="@+id/audio_player_header"
android:layout_width="match_parent"
- android:layout_height="@dimen/audio_player_header_height"
+ android:layout_height="wrap_content"
android:baselineAligned="false"
- android:orientation="horizontal">
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:paddingBottom="@dimen/audio_player_header_padding_bottom">
+
+ <ImageView
+ android:id="@+id/action_button_add_to_playlist"
+ android:layout_width="@dimen/audio_player_controls_top_button_width"
+ android:layout_height="@dimen/audio_player_controls_top_button_height"
+ android:layout_weight="0"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_add_to_playlist" />
- <!-- TODO: Add + Icon -->
- <LinearLayout
+ <TextView
+ android:id="@+id/audio_player_track_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
android:layout_weight="1"
- android:orientation="vertical">
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:gravity="center_horizontal"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:paddingLeft="@dimen/audio_player_track_name_padding_side"
+ android:paddingRight="@dimen/audio_player_track_name_padding_side"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
+ android:textColor="@color/audio_player_text_color"
+ android:textSize="@dimen/audio_player_track_text_size"
+ android:textStyle="bold" />
- <TextView
- android:id="@+id/audio_player_track_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:ellipsize="end"
- android:singleLine="true"
- android:textSize="@dimen/text_size_medium"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/audio_player_artist_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:ellipsize="end"
- android:singleLine="true"
- android:textSize="@dimen/text_size_medium" />
- </LinearLayout>
- <!-- TODO: Add ... Icon -->
+ <ImageView
+ android:id="@+id/action_button_menu"
+ android:layout_width="@dimen/audio_player_controls_top_button_width"
+ android:layout_height="@dimen/audio_player_controls_top_button_height"
+ android:layout_weight="0"
+ android:scaleType="centerInside"
+ android:src="@drawable/menu_button" />
</LinearLayout>
<RelativeLayout
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <TextView
- android:id="@+id/audio_player_current_time"
- android:layout_width="@dimen/audio_player_time_width"
+ <FrameLayout
+ android:id="@+id/play_pause_container"
+ android:layout_width="wrap_content"
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" />
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@string/accessibility_play">
+ <include
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ layout="@layout/play_pause_progress_button"/>
+ </FrameLayout>
+
+ <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
+ <!-- This is the left side of the progress bar - it has the previous
+ and shuffle button and the current time text -->
+ <RelativeLayout
+ android:layout_width="@dimen/audio_player_controls_side_width"
+ android:layout_height="fill_parent"
+ android:layout_toLeftOf="@id/play_pause_container"
+ android:paddingTop="@dimen/audio_player_control_padding_top">
+ <com.cyngn.eleven.widgets.RepeatingImageButton
+ android:id="@+id/action_button_previous"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_previous" />
+
+ <TextView
+ android:id="@+id/audio_player_current_time"
+ android:layout_width="fill_parent"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:gravity="center_vertical"
+ android:layout_toRightOf="@id/action_button_previous"
+ android:paddingLeft="@dimen/audio_player_time_text_padding"
+ android:textColor="@color/audio_player_text_color"
+ android:textSize="@dimen/audio_player_time_text_size"
+ android:textStyle="bold"/>
+
+ <com.cyngn.eleven.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_below="@id/action_button_previous"
+ android:layout_alignLeft="@id/audio_player_current_time"
+ android:contentDescription="@string/accessibility_shuffle"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_shuffle" />
+ </RelativeLayout>
+
+ <!-- This is the right side of the progress bar - it has the next
+ and repeat button and the total time text -->
+ <RelativeLayout
+ android:layout_width="@dimen/audio_player_controls_side_width"
+ android:layout_height="fill_parent"
+ android:layout_toRightOf="@id/play_pause_container"
+ android:paddingTop="@dimen/audio_player_control_padding_top">
+ <com.cyngn.eleven.widgets.RepeatingImageButton
+ android:id="@+id/action_button_next"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentRight="true"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_next" />
+
+ <TextView
+ android:id="@+id/audio_player_total_time"
+ android:layout_width="fill_parent"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_toLeftOf="@id/action_button_next"
+ android:gravity="right|center_vertical"
+ android:paddingRight="@dimen/audio_player_time_text_padding"
+ android:textColor="@color/audio_player_text_color"
+ android:textSize="@dimen/audio_player_time_text_size"
+ android:textStyle="bold"/>
+
+ <com.cyngn.eleven.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_below="@id/action_button_next"
+ android:layout_alignRight="@id/audio_player_total_time"
+ android:contentDescription="@string/accessibility_repeat"
+ android:focusable="true"
+ android:scaleType="center"
+ android:src="@drawable/btn_playback_repeat" />
+
+ </RelativeLayout>
- <TextView
- 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" />
-
- <SeekBar
- 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>
</LinearLayout>
</FrameLayout> \ No newline at end of file
diff --git a/res/layout/audio_player_controls.xml b/res/layout/audio_player_controls.xml
deleted file mode 100644
index 40a7850..0000000
--- a/res/layout/audio_player_controls.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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.cyngn.eleven.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.cyngn.eleven.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.cyngn.eleven.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.cyngn.eleven.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.cyngn.eleven.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/header_bar.xml b/res/layout/header_bar.xml
index bbe2b27..6230573 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -14,7 +14,11 @@
android:id="@+id/header_bar_up"
android:layout_width="@dimen/header_bar_up_width"
android:layout_height="@dimen/header_bar_up_height"
+ android:layout_gravity="center_vertical"
android:layout_weight="0"
+ android:paddingLeft="@dimen/header_bar_button_padding_small"
+ android:paddingRight="@dimen/header_bar_button_padding_small"
+ android:scaleType="centerCrop"
android:src="@drawable/btn_header_collapse"/>
<TextView
@@ -28,11 +32,24 @@
android:textSize="@dimen/text_size_large" />
<ImageView
+ android:id="@+id/header_bar_custom_button"
+ android:layout_width="@dimen/header_bar_custom_button_width"
+ android:layout_height="@dimen/header_bar_custom_button_height"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="0"
+ android:paddingLeft="@dimen/header_bar_button_padding_small"
+ android:paddingRight="@dimen/header_bar_button_padding_large"
+ android:scaleType="centerCrop" />
+
+ <ImageView
android:id="@+id/header_bar_menu_button"
android:layout_width="@dimen/header_bar_menu_button_width"
android:layout_height="@dimen/header_bar_menu_button_height"
+ android:layout_gravity="center_vertical"
android:layout_weight="0"
- android:scaleType="centerInside"
+ android:paddingLeft="@dimen/header_bar_button_padding_small"
+ android:paddingRight="@dimen/header_bar_button_padding_large"
+ android:scaleType="centerCrop"
android:src="@drawable/menu_button_light"/>
</com.cyngn.eleven.ui.HeaderBar> \ No newline at end of file
diff --git a/res/layout/list_item_song.xml b/res/layout/list_item_song.xml
index d04abe3..c661d0c 100644
--- a/res/layout/list_item_song.xml
+++ b/res/layout/list_item_song.xml
@@ -13,7 +13,7 @@
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/action_button_play"
+ android:layout_toLeftOf="@+id/play_pause_container"
android:orientation="vertical">
<TextView
android:id="@+id/line_one"
@@ -34,17 +34,20 @@
android:layout_height="wrap_content" />
</LinearLayout>
- <com.cyngn.eleven.widgets.PlayPauseButton
- android:id="@+id/action_button_play"
- android:layout_width="@dimen/songlist_control_button_width"
- android:layout_height="@dimen/songlist_control_button_height"
+ <FrameLayout
+ android:id="@id/play_pause_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/line_one_right"
- android:contentDescription="@string/accessibility_play"
- android:focusable="true"
- android:scaleType="centerInside"
- android:src="@drawable/btn_playback_play"
- android:visibility="gone" />
+ android:paddingLeft="@dimen/list_item_progress_padding_left"
+ android:paddingRight="@dimen/list_item_progress_padding_right">
+ <include
+ android:layout_width="@dimen/list_item_progress_width"
+ android:layout_height="@dimen/list_item_progress_height"
+ android:layout_centerVertical="true"
+ layout="@layout/play_pause_progress_button"/>
+ </FrameLayout>
<TextView
android:id="@+id/line_one_right"
diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml
new file mode 100644
index 0000000..26db43f
--- /dev/null
+++ b/res/layout/play_pause_progress_button.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Cyanogen, Inc.
+-->
+<com.cyngn.eleven.widgets.PlayPauseProgressButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/playPauseProgressButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone">
+
+ <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
+ <com.cyngn.eleven.widgets.PlayPauseButton
+ android:id="@+id/action_button_play"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_play"
+ android:focusable="true"
+ android:scaleType="centerCrop"
+ android:src="@drawable/btn_playback_play_med" />
+
+ <ProgressBar
+ android:id="@+id/progressBarBackground"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clickable="false"
+ android:indeterminate="false"
+ android:max="100"
+ android:progress="100"
+ android:progressDrawable="@drawable/circular_drawable_background" />
+
+ <ProgressBar
+ android:id="@+id/circularProgressBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clickable="false"
+ android:indeterminate="false"
+ android:max="100"
+ android:progressDrawable="@drawable/circular_drawable" />
+
+
+</com.cyngn.eleven.widgets.PlayPauseProgressButton>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ee6fd2f..db7726b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -66,9 +66,6 @@
<color name="bottom_action_bar_text_color">@color/white</color>
- <!-- Color for the audio player fragment text -->
- <color name="audio_player_text_color">@color/default_text_color</color>
-
<!-- Color for the pop up menu -->
<color name="menu_divider_color">#4ca19d9e</color>
<color name="menu_text_color">@color/white</color>
@@ -85,4 +82,10 @@
<color name="tpi_selected_text_color">#bf3d4049</color>
+ <!-- Color for the text on the audio player -->
+ <color name="audio_player_text_color">#bfffffff</color>
+
+ <!-- Color for the Progress bar -->
+ <color name="circular_progress_bar_background">#bfababab</color>
+ <color name="circular_progress_bar">#ffffffff</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9eb4cb0..0e703ad 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -86,17 +86,24 @@
<dimen name="profile_indicator_height">5.0dip</dimen>
<dimen name="profile_label_padding">16.0dip</dimen>
- <!-- Audio player -->
- <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>
+ <!-- Audio player Buttons (play/pause/shuffle/repeat/next/previous)-->
+ <dimen name="audio_player_controls_end_button_width">30.0dip</dimen>
+ <dimen name="audio_player_controls_end_button_height">30.0dip</dimen>
+ <dimen name="audio_player_controls_main_button_width">80.0dip</dimen>
+ <dimen name="audio_player_controls_main_button_height">80.0dip</dimen>
+ <dimen name="audio_player_controls_top_button_width">26.0dip</dimen>
+ <dimen name="audio_player_controls_top_button_height">30.0dip</dimen>
+ <dimen name="audio_player_controls_side_width">83.0dip</dimen>
+ <dimen name="audio_player_control_padding_top">26.0dip</dimen>
+
+ <!-- Audio player track text settings-->
+ <dimen name="audio_player_track_name_padding_side">36.0dip</dimen>
+ <dimen name="audio_player_header_padding_bottom">15.0dip</dimen>
+ <dimen name="audio_player_track_text_size">14sp</dimen>
+
+ <!-- Audio player time text settings-->
+ <dimen name="audio_player_time_text_padding">6.0dip</dimen>
+ <dimen name="audio_player_time_text_size">12sp</dimen>
<!-- App Widgets -->
<dimen name="app_widget_large_min_width">250.0dip</dimen>
@@ -131,13 +138,18 @@
<dimen name="color_scheme_dialog_row_padding">8.0dip</dimen>
<!-- Sliding Panel -->
- <dimen name="sliding_panel_indicator_height">25.0dip</dimen>
+ <dimen name="sliding_panel_indicator_height">26.0dip</dimen>
+ <dimen name="sliding_panel_shadow_height">0.0dip</dimen>
<!-- Header Bar -->
- <dimen name="header_bar_up_width">50.0dip</dimen>
- <dimen name="header_bar_up_height">50.0dip</dimen>
+ <dimen name="header_bar_up_width">30.0dip</dimen>
+ <dimen name="header_bar_up_height">30.0dip</dimen>
<dimen name="header_bar_menu_button_width">30.0dip</dimen>
- <dimen name="header_bar_menu_button_height">50.0dip</dimen>
+ <dimen name="header_bar_menu_button_height">30.0dip</dimen>
+ <dimen name="header_bar_custom_button_width">30.0dip</dimen>
+ <dimen name="header_bar_custom_button_height">30.0dip</dimen>
+ <dimen name="header_bar_button_padding_small">5.0dip</dimen>
+ <dimen name="header_bar_button_padding_large">10.0dip</dimen>
<!-- Title Page Indicator Settings -->
<dimen name="tpi_height">50dp</dimen>
@@ -145,6 +157,8 @@
<dimen name="tpi_footer_indicator_height">6dp</dimen>
<dimen name="tpi_text_size">16sp</dimen>
- <dimen name="songlist_control_button_width">50.0dip</dimen>
- <dimen name="songlist_control_button_height">50.0dip</dimen>
+ <dimen name="list_item_progress_width">45.0dip</dimen>
+ <dimen name="list_item_progress_height">45.0dip</dimen>
+ <dimen name="list_item_progress_padding_left">10.0dip</dimen>
+ <dimen name="list_item_progress_padding_right">17.0dip</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 95a1307..df318b8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -89,7 +89,6 @@
<item name="android:textColor">@color/list_item_text_color</item>
<item name="android:textSize">@dimen/list_item_main_text_size</item>
<item name="android:textStyle">bold</item>
- <item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
</style>
diff --git a/res/values/values.xml b/res/values/values.xml
new file mode 100644
index 0000000..dfb892a
--- /dev/null
+++ b/res/values/values.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- Circular Progress Bar Sizes -->
+ <item format="float" type="dimen" name="circular_progress_bar_inner_radius_ratio">3</item>
+ <item format="float" type="dimen" name="circular_progress_bar_thickness_ratio">10</item>
+</resources> \ No newline at end of file