Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Play Next context, Jukebox fixes, more menus 

Settings and Help themed, UI enhancements
This commit is contained in:
Joshua Bahnsen 2013-05-01 23:53:33 -07:00
parent aaf3029b19
commit 13874e3c62
25 changed files with 740 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@ -65,7 +65,6 @@
a:launchMode="singleTask" />
<activity
a:name=".activity.HelpActivity"
a:label="@string/help.label"
a:launchMode="singleTask" />
<activity
a:name=".activity.LyricsActivity"

16
gen/com/handmark/pulltorefresh/library/R.java
View File

@ -9,19 +9,19 @@ package com.handmark.pulltorefresh.library;
public final class R {
public static final class id {
public static final int pullFromStart = 0x7f060001;
public static final int pull_to_refresh_progress = 0x7f06007e;
public static final int pull_to_refresh_progress = 0x7f06007f;
public static final int rotate = 0x7f060007;
public static final int both = 0x7f060003;
public static final int webview = 0x7f06000a;
public static final int pull_to_refresh_text = 0x7f06007f;
public static final int pull_to_refresh_text = 0x7f060080;
public static final int pullDownFromTop = 0x7f060005;
public static final int gridview = 0x7f060009;
public static final int pullUpFromBottom = 0x7f060006;
public static final int scrollview = 0x7f06000b;
public static final int pullFromEnd = 0x7f060002;
public static final int pull_to_refresh_image = 0x7f06007d;
public static final int pull_to_refresh_sub_text = 0x7f060080;
public static final int fl_inner = 0x7f06007c;
public static final int pull_to_refresh_image = 0x7f06007e;
public static final int pull_to_refresh_sub_text = 0x7f060081;
public static final int fl_inner = 0x7f06007d;
public static final int flip = 0x7f060008;
public static final int disabled = 0x7f060000;
public static final int manualOnly = 0x7f060004;
@ -67,10 +67,10 @@ public final class R {
public static final int PullToRefresh_ptrHeaderSubTextColor = 3;
}
public static final class drawable {
public static final int indicator_bg_top = 0x7f020043;
public static final int indicator_bg_bottom = 0x7f020042;
public static final int indicator_bg_top = 0x7f020045;
public static final int indicator_bg_bottom = 0x7f020044;
public static final int default_ptr_flip = 0x7f02000c;
public static final int indicator_arrow = 0x7f020041;
public static final int indicator_arrow = 0x7f020043;
public static final int default_ptr_rotate = 0x7f02000d;
}
public static final class attr {

522
gen/com/thejoshwa/ultrasonic/androidapp/R.java
View File

@ -44,17 +44,21 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
*/
public static final int add_to_queue=0x7f010023;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int backward=0x7f010027;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int browse=0x7f010024;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int downloaded=0x7f010033;
public static final int downloaded=0x7f010035;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int downloading=0x7f010034;
public static final int downloading=0x7f010036;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
@ -66,11 +70,11 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int help=0x7f010027;
public static final int help=0x7f010029;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int home=0x7f010028;
public static final int home=0x7f01002a;
/** Drawable used as indicator for the active view.
<p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
@ -164,51 +168,51 @@ containing a value of this type.
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_next=0x7f010036;
public static final int media_next=0x7f010038;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_pause=0x7f010037;
public static final int media_pause=0x7f010039;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_play=0x7f01003c;
public static final int media_play=0x7f01003e;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_play_next=0x7f01003d;
public static final int media_play_next=0x7f01003f;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_play_small=0x7f01003e;
public static final int media_play_small=0x7f010040;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_previous=0x7f010035;
public static final int media_previous=0x7f010037;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_repeat_all=0x7f010038;
public static final int media_repeat_all=0x7f01003a;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_repeat_off=0x7f010039;
public static final int media_repeat_off=0x7f01003b;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_repeat_single=0x7f01003a;
public static final int media_repeat_single=0x7f01003c;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_shuffle=0x7f01003b;
public static final int media_shuffle=0x7f01003d;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_stop=0x7f01003f;
public static final int media_stop=0x7f010041;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_toggle=0x7f010040;
public static final int media_toggle=0x7f010042;
/** Reference to a style for the menu drawer.
<p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
@ -217,11 +221,11 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int pin=0x7f010029;
public static final int pin=0x7f01002b;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int playlists=0x7f01002b;
public static final int playlists=0x7f01002d;
/** BELOW HERE ARE DEPRECEATED. DO NOT USE.
<p>May be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
@ -359,19 +363,19 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int remove_all=0x7f01002c;
public static final int remove_all=0x7f01002e;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int save=0x7f01002d;
public static final int save=0x7f01002f;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int screen_on_off=0x7f01002e;
public static final int screen_on_off=0x7f010030;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int search=0x7f01002f;
public static final int search=0x7f010031;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
@ -379,15 +383,15 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int select_folder=0x7f010030;
public static final int select_folder=0x7f010032;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int settings=0x7f010031;
public static final int settings=0x7f010033;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int share=0x7f010032;
public static final int share=0x7f010034;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
@ -399,7 +403,11 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int unpin=0x7f01002a;
public static final int stop=0x7f010028;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int unpin=0x7f01002c;
}
public static final class color {
public static final int appwidget_text=0x7f090004;
@ -418,6 +426,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int mediaControlForeground=0x7f090002;
public static final int notificationArtist=0x7f090005;
public static final int notificationTitle=0x7f090006;
public static final int opaque=0x7f090010;
public static final int transparent=0x7f09000b;
public static final int white=0x7f090009;
}
@ -452,144 +461,148 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int ic_menu_about_light=0x7f020014;
public static final int ic_menu_add_to_queue_dark=0x7f020015;
public static final int ic_menu_add_to_queue_light=0x7f020016;
public static final int ic_menu_browse_dark=0x7f020017;
public static final int ic_menu_browse_light=0x7f020018;
public static final int ic_menu_exit_dark=0x7f020019;
public static final int ic_menu_exit_light=0x7f02001a;
public static final int ic_menu_forward_dark=0x7f02001b;
public static final int ic_menu_forward_light=0x7f02001c;
public static final int ic_menu_help_dark=0x7f02001d;
public static final int ic_menu_help_light=0x7f02001e;
public static final int ic_menu_home_dark=0x7f02001f;
public static final int ic_menu_home_light=0x7f020020;
public static final int ic_menu_pin=0x7f020021;
public static final int ic_menu_playlists_dark=0x7f020022;
public static final int ic_menu_playlists_light=0x7f020023;
public static final int ic_menu_remove_all_dark=0x7f020024;
public static final int ic_menu_remove_all_light=0x7f020025;
public static final int ic_menu_save_dark=0x7f020026;
public static final int ic_menu_save_light=0x7f020027;
public static final int ic_menu_screen_on_off_dark=0x7f020028;
public static final int ic_menu_screen_on_off_light=0x7f020029;
public static final int ic_menu_search_dark=0x7f02002a;
public static final int ic_menu_search_light=0x7f02002b;
public static final int ic_menu_select_all_dark=0x7f02002c;
public static final int ic_menu_select_all_light=0x7f02002d;
public static final int ic_menu_select_folder_dark=0x7f02002e;
public static final int ic_menu_select_folder_light=0x7f02002f;
public static final int ic_menu_settings_dark=0x7f020030;
public static final int ic_menu_settings_light=0x7f020031;
public static final int ic_menu_share_dark=0x7f020032;
public static final int ic_menu_share_light=0x7f020033;
public static final int ic_menu_unpin_dark=0x7f020034;
public static final int ic_menu_unpin_light=0x7f020035;
public static final int ic_star_full_dark=0x7f020036;
public static final int ic_star_full_light=0x7f020037;
public static final int ic_star_hollow_dark=0x7f020038;
public static final int ic_star_hollow_light=0x7f020039;
public static final int ic_stat_downloaded_dark=0x7f02003a;
public static final int ic_stat_downloaded_light=0x7f02003b;
public static final int ic_stat_downloading_dark=0x7f02003c;
public static final int ic_stat_downloading_light=0x7f02003d;
public static final int ic_stat_play_dark=0x7f02003e;
public static final int ic_stat_play_light=0x7f02003f;
public static final int ic_stat_ultrasonic=0x7f020040;
public static final int indicator_arrow=0x7f020041;
public static final int indicator_bg_bottom=0x7f020042;
public static final int indicator_bg_top=0x7f020043;
public static final int list_background=0x7f020044;
public static final int list_focused_holo=0x7f020045;
public static final int list_longpressed_holo=0x7f020046;
public static final int list_pressed_holo_dark=0x7f020047;
public static final int list_pressed_holo_light=0x7f020048;
public static final int list_selector_background_transition_holo_dark=0x7f020049;
public static final int list_selector_background_transition_holo_light=0x7f02004a;
public static final int list_selector_disabled_holo_dark=0x7f02004b;
public static final int list_selector_disabled_holo_light=0x7f02004c;
public static final int list_selector_holo_dark=0x7f02004d;
public static final int list_selector_holo_light=0x7f02004e;
public static final int main_header_icon=0x7f02004f;
public static final int md__category_background=0x7f020050;
public static final int md__list_focused_holo=0x7f020051;
public static final int md__list_longpressed_holo=0x7f020052;
public static final int md__list_pressed_holo_dark=0x7f020053;
public static final int md__list_selector_background_transition_holo_dark=0x7f020054;
public static final int md__list_selector_disabled_holo_dark=0x7f020055;
public static final int md__list_selector_holo_dark=0x7f020056;
public static final int media_backward_normal=0x7f020057;
public static final int media_backward_normal_dark=0x7f020058;
public static final int media_backward_normal_light=0x7f020059;
public static final int media_forward_normal=0x7f02005a;
public static final int media_forward_normal_dark=0x7f02005b;
public static final int media_forward_normal_light=0x7f02005c;
public static final int media_pause_normal=0x7f02005d;
public static final int media_pause_normal_dark=0x7f02005e;
public static final int media_pause_normal_light=0x7f02005f;
public static final int media_play_next=0x7f020060;
public static final int media_play_next_dark=0x7f020061;
public static final int media_play_next_light=0x7f020062;
public static final int media_play_now_dark=0x7f020063;
public static final int media_play_now_light=0x7f020064;
public static final int media_repeat_all=0x7f020065;
public static final int media_repeat_off=0x7f020066;
public static final int media_repeat_off_dark=0x7f020067;
public static final int media_repeat_off_light=0x7f020068;
public static final int media_repeat_single=0x7f020069;
public static final int media_shuffle_normal=0x7f02006a;
public static final int media_shuffle_normal_dark=0x7f02006b;
public static final int media_shuffle_normal_light=0x7f02006c;
public static final int media_start_normal=0x7f02006d;
public static final int media_start_normal_dark=0x7f02006e;
public static final int media_start_normal_light=0x7f02006f;
public static final int media_start_pressed=0x7f020070;
public static final int media_stop_normal=0x7f020071;
public static final int media_stop_normal_dark=0x7f020072;
public static final int media_stop_normal_light=0x7f020073;
public static final int media_toggle_list_normal=0x7f020074;
public static final int media_toggle_list_normal_dark=0x7f020075;
public static final int media_toggle_list_normal_light=0x7f020076;
public static final int menu_arrow=0x7f020077;
public static final int menu_arrow_bottom=0x7f020078;
public static final int menu_arrow_right=0x7f020079;
public static final int menu_arrow_top=0x7f02007a;
public static final int menubar_button_disabled=0x7f02007b;
public static final int menubar_button_normal=0x7f02007c;
public static final int notify_panel_notification_icon_bg=0x7f02007d;
public static final int pinstripe_tile=0x7f02007e;
public static final int preview=0x7f02007f;
public static final int preview_two=0x7f020080;
public static final int progress_bg_holo_dark=0x7f020081;
public static final int progress_horizontal_holo_dark=0x7f020082;
public static final int progress_primary_holo_dark=0x7f020083;
public static final int progress_secondary_holo_dark=0x7f020084;
public static final int select_album_play_all=0x7f020085;
public static final int select_album_play_all_normal=0x7f020086;
public static final int select_album_play_all_pressed=0x7f020087;
public static final int status_bg=0x7f020088;
public static final int title_bar_shadow=0x7f020089;
public static final int unknown_album=0x7f02008a;
public static final int unknown_album_large=0x7f02008b;
public static final int ic_menu_backward_dark=0x7f020017;
public static final int ic_menu_backward_light=0x7f020018;
public static final int ic_menu_browse_dark=0x7f020019;
public static final int ic_menu_browse_light=0x7f02001a;
public static final int ic_menu_exit_dark=0x7f02001b;
public static final int ic_menu_exit_light=0x7f02001c;
public static final int ic_menu_forward_dark=0x7f02001d;
public static final int ic_menu_forward_light=0x7f02001e;
public static final int ic_menu_help_dark=0x7f02001f;
public static final int ic_menu_help_light=0x7f020020;
public static final int ic_menu_home_dark=0x7f020021;
public static final int ic_menu_home_light=0x7f020022;
public static final int ic_menu_pin=0x7f020023;
public static final int ic_menu_playlists_dark=0x7f020024;
public static final int ic_menu_playlists_light=0x7f020025;
public static final int ic_menu_remove_all_dark=0x7f020026;
public static final int ic_menu_remove_all_light=0x7f020027;
public static final int ic_menu_save_dark=0x7f020028;
public static final int ic_menu_save_light=0x7f020029;
public static final int ic_menu_screen_on_off_dark=0x7f02002a;
public static final int ic_menu_screen_on_off_light=0x7f02002b;
public static final int ic_menu_search_dark=0x7f02002c;
public static final int ic_menu_search_light=0x7f02002d;
public static final int ic_menu_select_all_dark=0x7f02002e;
public static final int ic_menu_select_all_light=0x7f02002f;
public static final int ic_menu_select_folder_dark=0x7f020030;
public static final int ic_menu_select_folder_light=0x7f020031;
public static final int ic_menu_settings_dark=0x7f020032;
public static final int ic_menu_settings_light=0x7f020033;
public static final int ic_menu_share_dark=0x7f020034;
public static final int ic_menu_share_light=0x7f020035;
public static final int ic_menu_unpin_dark=0x7f020036;
public static final int ic_menu_unpin_light=0x7f020037;
public static final int ic_star_full_dark=0x7f020038;
public static final int ic_star_full_light=0x7f020039;
public static final int ic_star_hollow_dark=0x7f02003a;
public static final int ic_star_hollow_light=0x7f02003b;
public static final int ic_stat_downloaded_dark=0x7f02003c;
public static final int ic_stat_downloaded_light=0x7f02003d;
public static final int ic_stat_downloading_dark=0x7f02003e;
public static final int ic_stat_downloading_light=0x7f02003f;
public static final int ic_stat_play_dark=0x7f020040;
public static final int ic_stat_play_light=0x7f020041;
public static final int ic_stat_ultrasonic=0x7f020042;
public static final int indicator_arrow=0x7f020043;
public static final int indicator_bg_bottom=0x7f020044;
public static final int indicator_bg_top=0x7f020045;
public static final int list_background=0x7f020046;
public static final int list_focused_holo=0x7f020047;
public static final int list_longpressed_holo=0x7f020048;
public static final int list_pressed_holo_dark=0x7f020049;
public static final int list_pressed_holo_light=0x7f02004a;
public static final int list_selector_background_transition_holo_dark=0x7f02004b;
public static final int list_selector_background_transition_holo_light=0x7f02004c;
public static final int list_selector_disabled_holo_dark=0x7f02004d;
public static final int list_selector_disabled_holo_light=0x7f02004e;
public static final int list_selector_holo_dark=0x7f02004f;
public static final int list_selector_holo_light=0x7f020050;
public static final int main_header_icon=0x7f020051;
public static final int md__category_background=0x7f020052;
public static final int md__list_focused_holo=0x7f020053;
public static final int md__list_longpressed_holo=0x7f020054;
public static final int md__list_pressed_holo_dark=0x7f020055;
public static final int md__list_selector_background_transition_holo_dark=0x7f020056;
public static final int md__list_selector_disabled_holo_dark=0x7f020057;
public static final int md__list_selector_holo_dark=0x7f020058;
public static final int media_backward_normal=0x7f020059;
public static final int media_backward_normal_dark=0x7f02005a;
public static final int media_backward_normal_light=0x7f02005b;
public static final int media_forward_normal=0x7f02005c;
public static final int media_forward_normal_dark=0x7f02005d;
public static final int media_forward_normal_light=0x7f02005e;
public static final int media_pause_normal=0x7f02005f;
public static final int media_pause_normal_dark=0x7f020060;
public static final int media_pause_normal_light=0x7f020061;
public static final int media_play_next=0x7f020062;
public static final int media_play_next_dark=0x7f020063;
public static final int media_play_next_light=0x7f020064;
public static final int media_play_now_dark=0x7f020065;
public static final int media_play_now_light=0x7f020066;
public static final int media_repeat_all=0x7f020067;
public static final int media_repeat_off=0x7f020068;
public static final int media_repeat_off_dark=0x7f020069;
public static final int media_repeat_off_light=0x7f02006a;
public static final int media_repeat_single=0x7f02006b;
public static final int media_shuffle_normal=0x7f02006c;
public static final int media_shuffle_normal_dark=0x7f02006d;
public static final int media_shuffle_normal_light=0x7f02006e;
public static final int media_start_normal=0x7f02006f;
public static final int media_start_normal_dark=0x7f020070;
public static final int media_start_normal_light=0x7f020071;
public static final int media_start_pressed=0x7f020072;
public static final int media_stop_normal=0x7f020073;
public static final int media_stop_normal_dark=0x7f020074;
public static final int media_stop_normal_light=0x7f020075;
public static final int media_toggle_list_normal=0x7f020076;
public static final int media_toggle_list_normal_dark=0x7f020077;
public static final int media_toggle_list_normal_light=0x7f020078;
public static final int menu_arrow=0x7f020079;
public static final int menu_arrow_bottom=0x7f02007a;
public static final int menu_arrow_right=0x7f02007b;
public static final int menu_arrow_top=0x7f02007c;
public static final int menubar_button_disabled=0x7f02007d;
public static final int menubar_button_normal=0x7f02007e;
public static final int notify_panel_notification_icon_bg=0x7f02007f;
public static final int pinstripe_tile=0x7f020080;
public static final int preview=0x7f020081;
public static final int preview_two=0x7f020082;
public static final int progress_bg_holo_dark=0x7f020083;
public static final int progress_horizontal_holo_dark=0x7f020084;
public static final int progress_primary_holo_dark=0x7f020085;
public static final int progress_secondary_holo_dark=0x7f020086;
public static final int select_album_play_all=0x7f020087;
public static final int select_album_play_all_normal=0x7f020088;
public static final int select_album_play_all_pressed=0x7f020089;
public static final int status_bg=0x7f02008a;
public static final int title_bar_shadow=0x7f02008b;
public static final int unknown_album=0x7f02008c;
public static final int unknown_album_large=0x7f02008d;
}
public static final class id {
public static final int album=0x7f060073;
public static final int album=0x7f060074;
public static final int album_artist=0x7f06001d;
public static final int album_coverart=0x7f06001b;
public static final int album_menu_pin=0x7f0600b2;
public static final int album_menu_play_last=0x7f0600b1;
public static final int album_menu_play_now=0x7f0600b0;
public static final int album_menu_pin=0x7f0600b4;
public static final int album_menu_play_last=0x7f0600b3;
public static final int album_menu_play_next=0x7f0600b2;
public static final int album_menu_play_now=0x7f0600b1;
public static final int album_star=0x7f06001e;
public static final int album_title=0x7f06001c;
public static final int appwidget_coverart=0x7f06001f;
public static final int appwidget_top=0x7f060021;
public static final int artist=0x7f060023;
public static final int artist_menu_pin=0x7f0600b5;
public static final int artist_menu_play_last=0x7f0600b4;
public static final int artist_menu_play_now=0x7f0600b3;
public static final int artist_menu_pin=0x7f0600b8;
public static final int artist_menu_play_last=0x7f0600b7;
public static final int artist_menu_play_next=0x7f0600b6;
public static final int artist_menu_play_now=0x7f0600b5;
public static final int both=0x7f060003;
public static final int control_next=0x7f060026;
public static final int control_play=0x7f060025;
public static final int control_previous=0x7f060024;
public static final int control_stop=0x7f060074;
public static final int control_stop=0x7f060075;
public static final int disabled=0x7f060000;
public static final int download_album=0x7f06003b;
public static final int download_album_art_image=0x7f060035;
@ -599,8 +612,8 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int download_control_layout=0x7f060027;
public static final int download_duration=0x7f060039;
public static final int download_empty=0x7f06003c;
public static final int download_equalizer=0x7f0600a5;
public static final int download_jukebox=0x7f0600a7;
public static final int download_equalizer=0x7f0600a6;
public static final int download_jukebox=0x7f0600a8;
public static final int download_list=0x7f06003d;
public static final int download_next=0x7f06002e;
public static final int download_pause=0x7f06002c;
@ -616,7 +629,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int download_status=0x7f060031;
public static final int download_stop=0x7f06002d;
public static final int download_toggle_list=0x7f060028;
public static final int download_visualizer=0x7f0600a6;
public static final int download_visualizer=0x7f0600a7;
public static final int download_visualizer_view_layout=0x7f060036;
public static final int equalizer_bar=0x7f060044;
public static final int equalizer_frequency=0x7f060042;
@ -624,41 +637,42 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int equalizer_enabled=0x7f06003f;
public static final int equalizer_layout=0x7f060040;
public static final int equalizer_preset=0x7f060041;
public static final int fl_inner=0x7f06007c;
public static final int fl_inner=0x7f06007d;
public static final int flip=0x7f060008;
public static final int gridview=0x7f060009;
public static final int help_back=0x7f060046;
public static final int help_buttons=0x7f060045;
public static final int help_close=0x7f060047;
public static final int help_contents=0x7f060048;
public static final int jukebox_volume_progress_bar=0x7f06004a;
public static final int help_contents=0x7f060049;
public static final int help_forward=0x7f060048;
public static final int help_stop=0x7f060047;
public static final int jukebox_volume_progress_bar=0x7f06004b;
public static final int linearLayout1=0x7f060020;
public static final int lyrics_artist=0x7f06004c;
public static final int lyrics_scrollview=0x7f06004b;
public static final int lyrics_text=0x7f06004e;
public static final int lyrics_title=0x7f06004d;
public static final int main_select_server_1=0x7f060052;
public static final int main_select_server_2=0x7f060053;
public static final int main_albums=0x7f06005b;
public static final int main_albums_alphaByArtist=0x7f060063;
public static final int main_albums_alphaByName=0x7f060062;
public static final int main_albums_button=0x7f060056;
public static final int main_albums_frequent=0x7f06005e;
public static final int main_albums_highest=0x7f06005f;
public static final int main_albums_newest=0x7f06005c;
public static final int main_albums_random=0x7f060060;
public static final int main_albums_recent=0x7f06005d;
public static final int main_albums_starred=0x7f060061;
public static final int main_artists_button=0x7f060055;
public static final int main_dummy=0x7f060050;
public static final int main_genres_button=0x7f060057;
public static final int main_list=0x7f06004f;
public static final int main_music=0x7f060054;
public static final int main_select_server=0x7f060051;
public static final int main_shuffle=0x7f0600a4;
public static final int main_songs=0x7f060058;
public static final int main_songs_button=0x7f060059;
public static final int main_songs_starred=0x7f06005a;
public static final int lyrics_artist=0x7f06004d;
public static final int lyrics_scrollview=0x7f06004c;
public static final int lyrics_text=0x7f06004f;
public static final int lyrics_title=0x7f06004e;
public static final int main_select_server_1=0x7f060053;
public static final int main_select_server_2=0x7f060054;
public static final int main_albums=0x7f06005c;
public static final int main_albums_alphaByArtist=0x7f060064;
public static final int main_albums_alphaByName=0x7f060063;
public static final int main_albums_button=0x7f060057;
public static final int main_albums_frequent=0x7f06005f;
public static final int main_albums_highest=0x7f060060;
public static final int main_albums_newest=0x7f06005d;
public static final int main_albums_random=0x7f060061;
public static final int main_albums_recent=0x7f06005e;
public static final int main_albums_starred=0x7f060062;
public static final int main_artists_button=0x7f060056;
public static final int main_dummy=0x7f060051;
public static final int main_genres_button=0x7f060058;
public static final int main_list=0x7f060050;
public static final int main_music=0x7f060055;
public static final int main_select_server=0x7f060052;
public static final int main_shuffle=0x7f0600a5;
public static final int main_songs=0x7f060059;
public static final int main_songs_button=0x7f06005a;
public static final int main_songs_starred=0x7f06005b;
public static final int manualOnly=0x7f060004;
/** Used with View#setTag(int) to specify a position for the active view.
*/
@ -678,92 +692,92 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** The ID of the menu container.
*/
public static final int md__menu=0x7f06000f;
public static final int menu_about=0x7f06006d;
public static final int menu_about=0x7f06006e;
public static final int menu_album=0x7f060012;
public static final int menu_browse=0x7f060067;
public static final int menu_common=0x7f06006b;
public static final int menu_exit=0x7f06006e;
public static final int menu_home=0x7f060066;
public static final int menu_lyrics=0x7f0600ac;
public static final int menu_main=0x7f060064;
public static final int menu_navigation=0x7f060065;
public static final int menu_now_playing=0x7f06006a;
public static final int menu_playlists=0x7f060069;
public static final int menu_remove=0x7f0600ad;
public static final int menu_remove_all=0x7f0600a9;
public static final int menu_save_playlist=0x7f0600a8;
public static final int menu_screen_on_off=0x7f0600aa;
public static final int menu_search=0x7f060068;
public static final int menu_settings=0x7f06006c;
public static final int menu_show_album=0x7f0600ab;
public static final int menu_shuffle=0x7f0600ae;
public static final int notification_image=0x7f060070;
public static final int now_playing=0x7f060075;
public static final int now_playing_artist=0x7f060078;
public static final int now_playing_control_play=0x7f060079;
public static final int now_playing_image=0x7f060076;
public static final int now_playing_trackname=0x7f060077;
public static final int play_video_contents=0x7f06007a;
public static final int progress_message=0x7f06007b;
public static final int menu_browse=0x7f060068;
public static final int menu_common=0x7f06006c;
public static final int menu_exit=0x7f06006f;
public static final int menu_home=0x7f060067;
public static final int menu_lyrics=0x7f0600ad;
public static final int menu_main=0x7f060065;
public static final int menu_navigation=0x7f060066;
public static final int menu_now_playing=0x7f06006b;
public static final int menu_playlists=0x7f06006a;
public static final int menu_remove=0x7f0600ae;
public static final int menu_remove_all=0x7f0600aa;
public static final int menu_save_playlist=0x7f0600a9;
public static final int menu_screen_on_off=0x7f0600ab;
public static final int menu_search=0x7f060069;
public static final int menu_settings=0x7f06006d;
public static final int menu_show_album=0x7f0600ac;
public static final int menu_shuffle=0x7f0600af;
public static final int notification_image=0x7f060071;
public static final int now_playing=0x7f060076;
public static final int now_playing_artist=0x7f060079;
public static final int now_playing_control_play=0x7f06007a;
public static final int now_playing_image=0x7f060077;
public static final int now_playing_trackname=0x7f060078;
public static final int play_video_contents=0x7f06007b;
public static final int progress_message=0x7f06007c;
public static final int pullDownFromTop=0x7f060005;
public static final int pullFromEnd=0x7f060002;
public static final int pullFromStart=0x7f060001;
public static final int pullUpFromBottom=0x7f060006;
public static final int pull_to_refresh_image=0x7f06007d;
public static final int pull_to_refresh_progress=0x7f06007e;
public static final int pull_to_refresh_sub_text=0x7f060080;
public static final int pull_to_refresh_text=0x7f06007f;
public static final int pull_to_refresh_image=0x7f06007e;
public static final int pull_to_refresh_progress=0x7f06007f;
public static final int pull_to_refresh_sub_text=0x7f060081;
public static final int pull_to_refresh_text=0x7f060080;
public static final int rotate=0x7f060007;
public static final int save_playlist_name=0x7f060082;
public static final int save_playlist_root=0x7f060081;
public static final int save_playlist_name=0x7f060083;
public static final int save_playlist_root=0x7f060082;
public static final int scrollview=0x7f06000b;
public static final int search_albums=0x7f060086;
public static final int search_artists=0x7f060085;
public static final int search_list=0x7f060083;
public static final int search_more_albums=0x7f060089;
public static final int search_more_artists=0x7f060088;
public static final int search_more_songs=0x7f06008a;
public static final int search_search=0x7f060084;
public static final int search_songs=0x7f060087;
public static final int select_album_art=0x7f06008d;
public static final int select_album_artist=0x7f06008f;
public static final int search_albums=0x7f060087;
public static final int search_artists=0x7f060086;
public static final int search_list=0x7f060084;
public static final int search_more_albums=0x7f06008a;
public static final int search_more_artists=0x7f060089;
public static final int search_more_songs=0x7f06008b;
public static final int search_search=0x7f060085;
public static final int search_songs=0x7f060088;
public static final int select_album_art=0x7f06008e;
public static final int select_album_artist=0x7f060090;
public static final int select_album_delete=0x7f060019;
public static final int select_album_duration=0x7f060092;
public static final int select_album_empty=0x7f06008b;
public static final int select_album_entries=0x7f06008c;
public static final int select_album_genre=0x7f060090;
public static final int select_album_duration=0x7f060093;
public static final int select_album_empty=0x7f06008c;
public static final int select_album_entries=0x7f06008d;
public static final int select_album_genre=0x7f060091;
public static final int select_album_more=0x7f06001a;
public static final int select_album_pin=0x7f060017;
public static final int select_album_play_all=0x7f0600af;
public static final int select_album_play_all=0x7f0600b0;
public static final int select_album_play_last=0x7f060016;
public static final int select_album_play_next=0x7f060015;
public static final int select_album_play_now=0x7f060014;
public static final int select_album_select=0x7f060013;
public static final int select_album_song_count=0x7f060091;
public static final int select_album_title=0x7f06008e;
public static final int select_album_song_count=0x7f060092;
public static final int select_album_title=0x7f06008f;
public static final int select_album_unpin=0x7f060018;
public static final int select_artist_folder=0x7f060094;
public static final int select_artist_folder_1=0x7f060095;
public static final int select_artist_folder_2=0x7f060096;
public static final int select_artist_list=0x7f060093;
public static final int select_genre_empty=0x7f060097;
public static final int select_genre_list=0x7f060098;
public static final int select_playlist_empty=0x7f060099;
public static final int select_playlist_list=0x7f06009a;
public static final int song_artist=0x7f06009f;
public static final int song_check=0x7f06009b;
public static final int song_duration=0x7f0600a0;
public static final int song_star=0x7f0600a1;
public static final int song_status=0x7f06009e;
public static final int song_title=0x7f06009d;
public static final int song_track=0x7f06009c;
public static final int status_icon=0x7f060071;
public static final int statusbar=0x7f06006f;
public static final int tab_progress=0x7f0600a2;
public static final int tab_progress_message=0x7f0600a3;
public static final int select_artist_folder=0x7f060095;
public static final int select_artist_folder_1=0x7f060096;
public static final int select_artist_folder_2=0x7f060097;
public static final int select_artist_list=0x7f060094;
public static final int select_genre_empty=0x7f060098;
public static final int select_genre_list=0x7f060099;
public static final int select_playlist_empty=0x7f06009a;
public static final int select_playlist_list=0x7f06009b;
public static final int song_artist=0x7f0600a0;
public static final int song_check=0x7f06009c;
public static final int song_duration=0x7f0600a1;
public static final int song_star=0x7f0600a2;
public static final int song_status=0x7f06009f;
public static final int song_title=0x7f06009e;
public static final int song_track=0x7f06009d;
public static final int status_icon=0x7f060072;
public static final int statusbar=0x7f060070;
public static final int tab_progress=0x7f0600a3;
public static final int tab_progress_message=0x7f0600a4;
public static final int title=0x7f060022;
public static final int toast_layout_root=0x7f060049;
public static final int trackname=0x7f060072;
public static final int toast_layout_root=0x7f06004a;
public static final int trackname=0x7f060073;
public static final int webview=0x7f06000a;
}
public static final class integer {

BIN
res/drawable-xhdpi/ic_menu_backward_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res/drawable-xhdpi/ic_menu_backward_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

21
res/layout/appwidget4x1.xml
View File

@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="@drawable/appwidget_bg"
a:layout_height="wrap_content"
a:background="@color/opaque"
a:orientation="horizontal" >
<ImageView
a:id="@+id/appwidget_coverart"
a:layout_width="81dip"
a:layout_height="fill_parent"
a:background="@drawable/list_selector_holo_dark"
a:background="@drawable/list_selector_holo_dark"
a:clickable="true"
a:focusable="true"
a:scaleType="fitXY"
a:src="@drawable/appwidget_art_default" />
a:src="@drawable/ic_launcher" />
<LinearLayout
a:id="@+id/linearLayout1"
@ -25,7 +24,7 @@
a:id="@+id/appwidget_top"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:background="@drawable/list_selector_holo_dark"
a:background="@drawable/list_selector_holo_dark"
a:clickable="true"
a:focusable="true"
a:orientation="vertical" >
@ -72,8 +71,8 @@
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark"
a:scaleType="center"
a:src="@drawable/ic_appwidget_music_previous" />
a:scaleType="center"
a:src="@drawable/media_backward_normal_dark" />
<ImageButton
a:id="@+id/control_play"
@ -81,8 +80,8 @@
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark"
a:scaleType="center"
a:src="@drawable/ic_appwidget_music_play" />
a:scaleType="center"
a:src="@drawable/media_start_normal_dark" />
<ImageButton
a:id="@+id/control_next"
@ -91,7 +90,7 @@
a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark"
a:scaleType="center"
a:src="@drawable/ic_appwidget_music_next" />
a:src="@drawable/media_forward_normal_dark" />
</LinearLayout>
</LinearLayout>

79
res/layout/help.xml
View File

@ -1,39 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout a:id="@+id/help_buttons"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:layout_alignParentBottom="true"
a:padding="4dip"
a:gravity="center_horizontal"
a:background="@drawable/menubar_button_normal">
<Button a:id="@+id/help_back"
a:text="@string/help.back"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:layout_marginRight="5dip"
a:paddingLeft="25dip"
a:paddingRight="25dip"/>
<Button a:id="@+id/help_close"
a:text="@string/help.close"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:layout_marginLeft="5dip"
a:paddingLeft="25dip"
a:paddingRight="25dip"/>
</LinearLayout>
<WebView
a:id="@+id/help_contents"
a:layout_width="fill_parent"
a:layout_height="match_parent"
a:layout_above="@id/help_buttons"
a:fadingEdge="vertical"
a:fadingEdgeLength="12dip" />
</RelativeLayout>
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout a:id="@+id/help_buttons"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:padding="4dip"
a:gravity="center_horizontal" >
<ImageView a:id="@+id/help_back"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:src="?attr/backward"
a:layout_weight="1" />
<ImageView a:id="@+id/help_stop"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:src="?attr/stop"
a:layout_weight="1" />
<ImageView a:id="@+id/help_forward"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:src="?attr/forward"
a:layout_weight="1" />
</LinearLayout>
<WebView
a:id="@+id/help_contents"
a:layout_width="fill_parent"
a:layout_height="match_parent"
a:layout_below="@id/help_buttons"
a:fadingEdge="vertical"
a:fadingEdgeLength="12dip" />
</RelativeLayout>

7
res/layout/jukebox_volume.xml
View File

@ -18,12 +18,11 @@
a:paddingRight="32dp"
a:paddingBottom="12dp"
/>
<ProgressBar a:id="@+id/jukebox_volume_progress_bar"
style="@android:style/Widget.ProgressBar.Horizontal"
style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:paddingBottom="3dp"
/>
a:paddingBottom="3dp" />
</LinearLayout>

41
res/menu/select_album_context.xml
View File

@ -1,19 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item
a:id="@+id/album_menu_play_now"
a:title="@string/common.play_now"
/>
<item
a:id="@+id/album_menu_play_last"
a:title="@string/common.play_last"
/>
<item
a:id="@+id/album_menu_pin"
a:title="@string/common.pin"
/>
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item
a:id="@+id/album_menu_play_now"
a:title="@string/common.play_now"
/>
<item
a:id="@+id/album_menu_play_next"
a:title="@string/common.play_next"
/>
<item
a:id="@+id/album_menu_play_last"
a:title="@string/common.play_last"
/>
<item
a:id="@+id/album_menu_pin"
a:title="@string/common.pin"
/>
</menu>

41
res/menu/select_artist_context.xml
View File

@ -1,19 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item
a:id="@+id/artist_menu_play_now"
a:title="@string/common.play_now"
/>
<item
a:id="@+id/artist_menu_play_last"
a:title="@string/common.play_last"
/>
<item
a:id="@+id/artist_menu_pin"
a:title="@string/common.pin"
/>
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item
a:id="@+id/artist_menu_play_now"
a:title="@string/common.play_now"
/>
<item
a:id="@+id/artist_menu_play_next"
a:title="@string/common.play_next"
/>
<item
a:id="@+id/artist_menu_play_last"
a:title="@string/common.play_last"
/>
<item
a:id="@+id/artist_menu_pin"
a:title="@string/common.pin"
/>
</menu>

1
res/values/colors.xml
View File

@ -15,5 +15,6 @@
<color name="cyan">#ff0099cc</color>
<color name="ics_opaque">#8033b5e5</color>
<color name="md__transparent">#00000000</color>
<color name="opaque">#B0000000</color>
<color name="md__defaultBackground">#FF555555</color>
</resources>

2
res/values/styles.xml
View File

@ -54,6 +54,8 @@
<attr name="browse" format="reference"/>
<attr name="exit" format="reference"/>
<attr name="forward" format="reference"/>
<attr name="backward" format="reference"/>
<attr name="stop" format="reference"/>
<attr name="help" format="reference"/>
<attr name="home" format="reference"/>
<attr name="pin" format="reference"/>

4
res/values/themes.xml
View File

@ -9,7 +9,9 @@
<item name="add_to_queue">@drawable/ic_menu_add_to_queue_dark</item>
<item name="browse">@drawable/ic_menu_browse_dark</item>
<item name="exit">@drawable/ic_menu_exit_dark</item>
<item name="backward">@drawable/ic_menu_backward_dark</item>
<item name="forward">@drawable/ic_menu_forward_dark</item>
<item name="stop">@drawable/ic_menu_exit_dark</item>
<item name="help">@drawable/ic_menu_help_dark</item>
<item name="home">@drawable/ic_menu_home_dark</item>
<item name="pin">@drawable/ic_menu_pin</item>
@ -46,7 +48,9 @@
<item name="add_to_queue">@drawable/ic_menu_add_to_queue_light</item>
<item name="browse">@drawable/ic_menu_browse_light</item>
<item name="exit">@drawable/ic_menu_exit_light</item>
<item name="backward">@drawable/ic_menu_backward_light</item>
<item name="forward">@drawable/ic_menu_forward_light</item>
<item name="stop">@drawable/ic_menu_exit_light</item>
<item name="help">@drawable/ic_menu_help_light</item>
<item name="home">@drawable/ic_menu_home_light</item>
<item name="pin">@drawable/ic_menu_pin</item>

2
res/xml/settings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
a:title="@string/settings.title" >
a:title="@string/common.appname" >
<PreferenceCategory a:title="@string/settings.servers_title" >
<PreferenceScreen a:key="server1" >

5
src/com/thejoshwa/ultrasonic/androidapp/activity/GenericActivity.java Normal file
View File

@ -0,0 +1,5 @@
package com.thejoshwa.ultrasonic.androidapp.activity;
public class GenericActivity {
}

180
src/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java
View File

@ -19,17 +19,27 @@
package com.thejoshwa.ultrasonic.androidapp.activity;
import net.simonvt.menudrawer.MenuDrawer;
import net.simonvt.menudrawer.Position;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import com.thejoshwa.ultrasonic.androidapp.R;
import com.thejoshwa.ultrasonic.androidapp.util.Constants;
import com.thejoshwa.ultrasonic.androidapp.util.Util;
/**
@ -37,42 +47,99 @@ import com.thejoshwa.ultrasonic.androidapp.util.Util;
*
* @author Sindre Mehus
*/
public final class HelpActivity extends Activity {
public final class HelpActivity extends Activity implements OnClickListener {
private static final String TAG = HelpActivity.class.getSimpleName();
private WebView webView;
private Button backButton;
private ImageView backButton;
private ImageView stopButton;
private ImageView forwardButton;
private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer";
private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId";
private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition";
public MenuDrawer menuDrawer;
private int activePosition = 1;
private int menuActiveViewId;
View searchMenuItem = null;
View playlistsMenuItem = null;
View menuMain = null;
@Override
protected void onCreate(Bundle bundle) {
applyTheme();
super.onCreate(bundle);
getWindow().requestFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setContentView(R.layout.help);
if (bundle != null) {
activePosition = bundle.getInt(STATE_ACTIVE_POSITION);
menuActiveViewId = bundle.getInt(STATE_ACTIVE_VIEW_ID);
}
menuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_WINDOW, Position.LEFT);
menuDrawer.setMenuView(R.layout.menu_main);
searchMenuItem = findViewById(R.id.menu_search);
playlistsMenuItem = findViewById(R.id.menu_playlists);
findViewById(R.id.menu_home).setOnClickListener(this);
findViewById(R.id.menu_browse).setOnClickListener(this);
searchMenuItem.setOnClickListener(this);
playlistsMenuItem.setOnClickListener(this);
findViewById(R.id.menu_now_playing).setOnClickListener(this);
findViewById(R.id.menu_settings).setOnClickListener(this);
findViewById(R.id.menu_about).setOnClickListener(this);
findViewById(R.id.menu_exit).setOnClickListener(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
getActionBar().setDisplayHomeAsUpEnabled(true);
}
View aboutMenuItem = findViewById(R.id.menu_about);
menuDrawer.setActiveView(aboutMenuItem);
TextView activeView = (TextView)findViewById(menuActiveViewId);
if (activeView != null) {
menuDrawer.setActiveView(activeView);
}
webView = (WebView) findViewById(R.id.help_contents);
webView.getSettings().setJavaScriptEnabled(true);
webView.setWebViewClient(new HelpClient());
if (bundle != null) {
webView.restoreState(bundle);
} else {
webView.loadUrl(getResources().getString(R.string.help_url));
}
backButton = (Button) findViewById(R.id.help_back);
backButton = (ImageView) findViewById(R.id.help_back);
backButton.setOnClickListener(new Button.OnClickListener() {
@Override
public void onClick(View view) {
webView.goBack();
}
});
Button doneButton = (Button) findViewById(R.id.help_close);
doneButton.setOnClickListener(new Button.OnClickListener() {
stopButton = (ImageView) findViewById(R.id.help_stop);
stopButton.setOnClickListener(new Button.OnClickListener() {
@Override
public void onClick(View view) {
finish();
webView.stopLoading();
setProgressBarIndeterminateVisibility(false);
}
});
forwardButton = (ImageView) findViewById(R.id.help_forward);
forwardButton.setOnClickListener(new Button.OnClickListener() {
@Override
public void onClick(View view) {
webView.goForward();
}
});
}
@Override
@ -83,6 +150,10 @@ public final class HelpActivity extends Activity {
@Override
protected void onSaveInstanceState(Bundle state) {
webView.saveState(state);
super.onSaveInstanceState(state);
state.putParcelable(STATE_MENUDRAWER, menuDrawer.saveState());
state.putInt(STATE_ACTIVE_VIEW_ID, menuActiveViewId);
state.putInt(STATE_ACTIVE_POSITION, activePosition);
}
@Override
@ -95,12 +166,100 @@ public final class HelpActivity extends Activity {
}
return super.onKeyDown(keyCode, event);
}
private void applyTheme() {
String theme = Util.getTheme(this);
if ("dark".equalsIgnoreCase(theme) || "fullscreen".equalsIgnoreCase(theme)) {
setTheme(R.style.UltraSonicTheme);
} else if ("light".equalsIgnoreCase(theme) || "fullscreenlight".equalsIgnoreCase(theme)) {
setTheme(R.style.UltraSonicTheme_Light);
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
menuDrawer.toggleMenu();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void onRestoreInstanceState(Bundle inState) {
super.onRestoreInstanceState(inState);
menuDrawer.restoreState(inState.getParcelable(STATE_MENUDRAWER));
}
@Override
public void onBackPressed() {
final int drawerState = menuDrawer.getDrawerState();
if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
menuDrawer.closeMenu();
return;
}
finish();
super.onBackPressed();
}
@Override
public void onClick(View v) {
menuActiveViewId = v.getId();
Intent intent;
switch (menuActiveViewId) {
case R.id.menu_home:
intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_browse:
intent = new Intent(this, SelectArtistActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_search:
intent = new Intent(this, SearchActivity.class);
intent.putExtra(Constants.INTENT_EXTRA_REQUEST_SEARCH, true);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_playlists:
intent = new Intent(this, SelectPlaylistActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_now_playing:
Util.startActivityWithoutTransition(this, DownloadActivity.class);
break;
case R.id.menu_settings:
Util.startActivityWithoutTransition(this, SettingsActivity.class);
break;
case R.id.menu_about:
Util.startActivityWithoutTransition(this, HelpActivity.class);
break;
case R.id.menu_exit:
intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true);
Util.startActivityWithoutTransition(this, intent);
break;
}
menuDrawer.closeMenu();
}
private final class HelpClient extends WebViewClient {
@Override
public void onLoadResource(WebView webView, String url) {
setProgressBarIndeterminateVisibility(true);
setTitle(getResources().getString(R.string.help_loading));
//setTitle(getResources().getString(R.string.help_loading));
super.onLoadResource(webView, url);
}
@ -115,8 +274,11 @@ public final class HelpActivity extends Activity {
Log.e(TAG, e.getMessage(), e);
}
setTitle(view.getTitle() + " (" + versionName + ")");
String title = view.getTitle() + " (" + versionName + ")";
getActionBar().setSubtitle(title);
backButton.setEnabled(view.canGoBack());
forwardButton.setEnabled(view.canGoForward());
}
@Override

9
src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java
View File

@ -190,13 +190,16 @@ public class SearchActivity extends SubsonicTabActivity {
switch (menuItem.getItemId()) {
case R.id.album_menu_play_now:
downloadRecursively(id, false, false, true);
downloadRecursively(id, false, false, true, false);
break;
case R.id.album_menu_play_next:
downloadRecursively(id, false, true, false, true);
break;
case R.id.album_menu_play_last:
downloadRecursively(id, false, true, false);
downloadRecursively(id, false, true, false, false);
break;
case R.id.album_menu_pin:
downloadRecursively(id, true, true, false);
downloadRecursively(id, true, true, false, false);
break;
default:
return super.onContextItemSelected(menuItem);

11
src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
View File

@ -246,7 +246,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
String id = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ID);
if (hasSubFolders && id != null) {
downloadRecursively(id, false, false, true);
downloadRecursively(id, false, false, true, false);
} else {
selectAll(true, false);
download(false, false, true, false);
@ -282,13 +282,16 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
songs.add((MusicDirectory.Entry) albumListView.getItemAtPosition(info.position));
switch (menuItem.getItemId()) {
case R.id.album_menu_play_now:
downloadRecursively(entry.getId(), false, false, true);
downloadRecursively(entry.getId(), false, false, true, false);
break;
case R.id.album_menu_play_next:
downloadRecursively(entry.getId(), false, false, true, true);
break;
case R.id.album_menu_play_last:
downloadRecursively(entry.getId(), false, true, false);
downloadRecursively(entry.getId(), false, true, false, false);
break;
case R.id.album_menu_pin:
downloadRecursively(entry.getId(), true, true, false);
downloadRecursively(entry.getId(), true, true, false, false);
break;
case R.id.select_album_play_all:
playAll();

9
src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java
View File

@ -214,13 +214,16 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
if (artist != null) {
switch (menuItem.getItemId()) {
case R.id.artist_menu_play_now:
downloadRecursively(artist.getId(), false, false, true);
downloadRecursively(artist.getId(), false, false, true, false);
break;
case R.id.artist_menu_play_next:
downloadRecursively(artist.getId(), false, false, true, true);
break;
case R.id.artist_menu_play_last:
downloadRecursively(artist.getId(), false, true, false);
downloadRecursively(artist.getId(), false, true, false, false);
break;
case R.id.artist_menu_pin:
downloadRecursively(artist.getId(), true, true, false);
downloadRecursively(artist.getId(), true, true, false, false);
break;
default:
return super.onContextItemSelected(menuItem);

153
src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java
View File

@ -18,7 +18,9 @@
*/
package com.thejoshwa.ultrasonic.androidapp.activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
@ -28,7 +30,10 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.provider.SearchRecentSuggestions;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import com.thejoshwa.ultrasonic.androidapp.R;
import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider;
@ -47,7 +52,10 @@ import java.net.URL;
import java.util.LinkedHashMap;
import java.util.Map;
public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
import net.simonvt.menudrawer.MenuDrawer;
import net.simonvt.menudrawer.Position;
public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener, OnClickListener {
private static final String TAG = SettingsActivity.class.getSimpleName();
private final Map<String, ServerSettings> serverSettings = new LinkedHashMap<String, ServerSettings>();
@ -68,11 +76,56 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
private ListPreference defaultArtists;
private CheckBoxPreference mediaButtonsEnabled;
private CheckBoxPreference lockScreenEnabled;
private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer";
private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId";
private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition";
public MenuDrawer menuDrawer;
private int activePosition = 1;
private int menuActiveViewId;
View searchMenuItem = null;
View playlistsMenuItem = null;
View menuMain = null;
@Override
public void onCreate(Bundle savedInstanceState) {
applyTheme();
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.settings);
if (savedInstanceState != null) {
activePosition = savedInstanceState.getInt(STATE_ACTIVE_POSITION);
menuActiveViewId = savedInstanceState.getInt(STATE_ACTIVE_VIEW_ID);
}
menuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_WINDOW, Position.LEFT);
menuDrawer.setMenuView(R.layout.menu_main);
searchMenuItem = findViewById(R.id.menu_search);
playlistsMenuItem = findViewById(R.id.menu_playlists);
findViewById(R.id.menu_home).setOnClickListener(this);
findViewById(R.id.menu_browse).setOnClickListener(this);
searchMenuItem.setOnClickListener(this);
playlistsMenuItem.setOnClickListener(this);
findViewById(R.id.menu_now_playing).setOnClickListener(this);
findViewById(R.id.menu_settings).setOnClickListener(this);
findViewById(R.id.menu_about).setOnClickListener(this);
findViewById(R.id.menu_exit).setOnClickListener(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
getActionBar().setDisplayHomeAsUpEnabled(true);
}
View browseMenuItem = findViewById(R.id.menu_settings);
menuDrawer.setActiveView(browseMenuItem);
TextView activeView = (TextView)findViewById(menuActiveViewId);
if (activeView != null) {
menuDrawer.setActiveView(activeView);
}
theme = (ListPreference) findPreference(Constants.PREFERENCES_KEY_THEME);
maxBitrateWifi = (ListPreference) findPreference(Constants.PREFERENCES_KEY_MAX_BITRATE_WIFI);
@ -132,9 +185,21 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
SharedPreferences prefs = Util.getPreferences(this);
prefs.registerOnSharedPreferenceChangeListener(this);
getActionBar().setSubtitle(R.string.menu_settings);
update();
}
private void applyTheme() {
String theme = Util.getTheme(this);
if ("dark".equalsIgnoreCase(theme) || "fullscreen".equalsIgnoreCase(theme)) {
setTheme(R.style.UltraSonicTheme);
} else if ("light".equalsIgnoreCase(theme) || "fullscreenlight".equalsIgnoreCase(theme)) {
setTheme(R.style.UltraSonicTheme_Light);
}
}
@Override
protected void onDestroy() {
@ -164,7 +229,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
if (testingConnection) {
return;
}
theme.setSummary(theme.getEntry());
maxBitrateWifi.setSummary(maxBitrateWifi.getEntry());
maxBitrateMobile.setSummary(maxBitrateMobile.getEntry());
@ -333,4 +398,88 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
screen.setTitle(serverName.getText());
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
menuDrawer.toggleMenu();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void onRestoreInstanceState(Bundle inState) {
super.onRestoreInstanceState(inState);
menuDrawer.restoreState(inState.getParcelable(STATE_MENUDRAWER));
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putParcelable(STATE_MENUDRAWER, menuDrawer.saveState());
outState.putInt(STATE_ACTIVE_VIEW_ID, menuActiveViewId);
outState.putInt(STATE_ACTIVE_POSITION, activePosition);
}
@Override
public void onBackPressed() {
final int drawerState = menuDrawer.getDrawerState();
if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
menuDrawer.closeMenu();
return;
}
super.onBackPressed();
}
@Override
public void onClick(View v) {
menuActiveViewId = v.getId();
Intent intent;
switch (menuActiveViewId) {
case R.id.menu_home:
intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_browse:
intent = new Intent(this, SelectArtistActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_search:
intent = new Intent(this, SearchActivity.class);
intent.putExtra(Constants.INTENT_EXTRA_REQUEST_SEARCH, true);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_playlists:
intent = new Intent(this, SelectPlaylistActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Util.startActivityWithoutTransition(this, intent);
break;
case R.id.menu_now_playing:
Util.startActivityWithoutTransition(this, DownloadActivity.class);
break;
case R.id.menu_settings:
Util.startActivityWithoutTransition(this, SettingsActivity.class);
break;
case R.id.menu_about:
Util.startActivityWithoutTransition(this, HelpActivity.class);
break;
case R.id.menu_exit:
intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true);
Util.startActivityWithoutTransition(this, intent);
break;
}
menuDrawer.closeMenu();
}
}

9
src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java
View File

@ -75,7 +75,7 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{
private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId";
private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition";
protected MenuDrawer menuDrawer;
public MenuDrawer menuDrawer;
private int activePosition = 1;
private int menuActiveViewId;
private View nowPlaying = null;
@ -144,6 +144,7 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{
@Override
protected void onResume() {
super.onResume();
applyTheme();
instance = this;
if (!nowPlayingHidden) {
@ -386,7 +387,7 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{
return IMAGE_LOADER;
}
protected void downloadRecursively(final String id, final boolean save, final boolean append, final boolean autoplay) {
protected void downloadRecursively(final String id, final boolean save, final boolean append, final boolean autoplay, final boolean playNext) {
ModalBackgroundTask<List<MusicDirectory.Entry>> task = new ModalBackgroundTask<List<MusicDirectory.Entry>>(this, false) {
private static final int MAX_SONGS = 500;
@ -420,11 +421,11 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{
protected void done(List<MusicDirectory.Entry> songs) {
DownloadService downloadService = getDownloadService();
if (!songs.isEmpty() && downloadService != null) {
if (!append) {
if (!append && !playNext) {
downloadService.clear();
}
warnIfNetworkOrStorageUnavailable();
downloadService.download(songs, save, autoplay, false);
downloadService.download(songs, save, autoplay, playNext);
Util.startActivityWithoutTransition(SubsonicTabActivity.this, DownloadActivity.class);
}
}

4
src/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java
View File

@ -148,9 +148,9 @@ public class UltraSonicAppWidgetProvider4x1 extends AppWidgetProvider {
// Set correct drawable for pause state
if (playing) {
views.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_pause);
views.setImageViewResource(R.id.control_play, R.drawable.media_pause_normal_dark);
} else {
views.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_play);
views.setImageViewResource(R.id.control_play, R.drawable.media_start_normal_dark);
}
// Set the cover art

2
src/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java
View File

@ -188,7 +188,7 @@ public class JukeboxService {
}
public synchronized void adjustVolume(boolean up) {
float delta = up ? 0.1f : -0.1f;
float delta = up ? 0.05f : -0.05f;
gain += delta;
gain = Math.max(gain, 0.0f);
gain = Math.min(gain, 1.0f);

2
src/com/thejoshwa/ultrasonic/androidapp/util/SongView.java
View File

@ -174,7 +174,7 @@ public class SongView extends LinearLayout implements Checkable {
Drawable rightImage = null;
if (completeFile.exists()) {
leftImage = downloadFile.isSaved() ? Util.getDrawableFromAttribute(getContext(), R.attr.save) : Util.getDrawableFromAttribute(getContext(), R.attr.downloaded);
leftImage = downloadFile.isSaved() ? Util.getDrawableFromAttribute(getContext(), R.attr.unpin) : Util.getDrawableFromAttribute(getContext(), R.attr.downloaded);
}
if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFile.exists()) {

4
src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
View File

@ -668,9 +668,9 @@ public class Util extends DownloadActivity {
}
if (playerState == PlayerState.PAUSED) {
notification.contentView.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_play);
notification.contentView.setImageViewResource(R.id.control_play, R.drawable.media_start_normal_dark);
} else if (playerState == PlayerState.STARTED) {
notification.contentView.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_pause);
notification.contentView.setImageViewResource(R.id.control_play, R.drawable.media_pause_normal_dark);
}
// Send the notification and put the service in the foreground.