From ecb660f766e3f6c188a2dfb51bcff7cf4cdf0aad Mon Sep 17 00:00:00 2001 From: Joshua Bahnsen Date: Sat, 25 May 2013 23:46:37 -0700 Subject: [PATCH] Add download option --- AndroidManifest.xml | 4 +- gen/com/handmark/pulltorefresh/library/R.java | 10 +- .../thejoshwa/ultrasonic/androidapp/R.java | 1035 +++++++++-------- res/layout/album_buttons.xml | 8 + res/menu/main.xml | 15 +- res/menu/nowplaying.xml | 30 +- res/menu/nowplaying_context.xml | 41 +- res/menu/select_album.xml | 18 +- res/menu/select_album_context.xml | 36 +- res/menu/select_artist_context.xml | 37 +- res/menu/select_playlist_context.xml | 5 +- res/menu/select_song_context.xml | 36 +- res/values-fr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values/strings.xml | 7 +- .../androidapp/activity/SearchActivity.java | 16 +- .../activity/SelectAlbumActivity.java | 31 +- .../activity/SelectArtistActivity.java | 3 + .../activity/SelectPlaylistActivity.java | 3 + .../activity/SubsonicTabActivity.java | 4 +- 20 files changed, 678 insertions(+), 665 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 95ac770d..bd411308 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + a:versionCode="24" + a:versionName="1.1.0.20" > diff --git a/gen/com/handmark/pulltorefresh/library/R.java b/gen/com/handmark/pulltorefresh/library/R.java index 10b1d4b4..976f390c 100644 --- a/gen/com/handmark/pulltorefresh/library/R.java +++ b/gen/com/handmark/pulltorefresh/library/R.java @@ -51,7 +51,7 @@ public final class R { public static final class id { public static final int both = 0x7f060003; public static final int disabled = 0x7f060000; - public static final int fl_inner = 0x7f060089; + public static final int fl_inner = 0x7f06008a; public static final int flip = 0x7f060008; public static final int gridview = 0x7f060009; public static final int manualOnly = 0x7f060004; @@ -59,10 +59,10 @@ public final class R { 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 = 0x7f06008a; - public static final int pull_to_refresh_progress = 0x7f06008b; - public static final int pull_to_refresh_sub_text = 0x7f06008d; - public static final int pull_to_refresh_text = 0x7f06008c; + public static final int pull_to_refresh_image = 0x7f06008b; + public static final int pull_to_refresh_progress = 0x7f06008c; + public static final int pull_to_refresh_sub_text = 0x7f06008e; + public static final int pull_to_refresh_text = 0x7f06008d; public static final int rotate = 0x7f060007; public static final int scrollview = 0x7f06000b; public static final int webview = 0x7f06000a; diff --git a/gen/com/thejoshwa/ultrasonic/androidapp/R.java b/gen/com/thejoshwa/ultrasonic/androidapp/R.java index caf03875..2cd7e408 100644 --- a/gen/com/thejoshwa/ultrasonic/androidapp/R.java +++ b/gen/com/thejoshwa/ultrasonic/androidapp/R.java @@ -602,115 +602,117 @@ or to a theme attribute in the form "?[package:][type:]na public static final int unknown_album_large=0x7f020094; } public static final class id { - public static final int album=0x7f060027; - public static final int album_artist=0x7f06001d; - public static final int album_coverart=0x7f06001b; - public static final int album_menu_pin=0x7f0600c6; - public static final int album_menu_play_last=0x7f0600c5; - public static final int album_menu_play_next=0x7f0600c4; - public static final int album_menu_play_now=0x7f0600c3; - public static final int album_menu_unpin=0x7f0600c7; - 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=0x7f0600cb; - public static final int artist_menu_play_last=0x7f0600ca; - public static final int artist_menu_play_next=0x7f0600c9; - public static final int artist_menu_play_now=0x7f0600c8; - public static final int artist_menu_unpin=0x7f0600cc; + public static final int album=0x7f060028; + public static final int album_artist=0x7f06001e; + public static final int album_coverart=0x7f06001c; + public static final int album_menu_download=0x7f0600c9; + public static final int album_menu_pin=0x7f0600c7; + public static final int album_menu_play_last=0x7f0600c6; + public static final int album_menu_play_next=0x7f0600c5; + public static final int album_menu_play_now=0x7f0600c4; + public static final int album_menu_unpin=0x7f0600c8; + public static final int album_star=0x7f06001f; + public static final int album_title=0x7f06001d; + public static final int appwidget_coverart=0x7f060020; + public static final int appwidget_top=0x7f060022; + public static final int artist=0x7f060024; + public static final int artist_menu_download=0x7f0600cf; + public static final int artist_menu_pin=0x7f0600cd; + public static final int artist_menu_play_last=0x7f0600cc; + public static final int artist_menu_play_next=0x7f0600cb; + public static final int artist_menu_play_now=0x7f0600ca; + public static final int artist_menu_unpin=0x7f0600ce; public static final int both=0x7f060003; - public static final int chat_edittext=0x7f060029; - public static final int chat_entries=0x7f060028; - public static final int chat_message=0x7f06002e; - public static final int chat_message_layout=0x7f06002c; - public static final int chat_send=0x7f06002a; - public static final int chat_time=0x7f06002d; - public static final int chat_username=0x7f06002b; - 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=0x7f06007f; + public static final int chat_edittext=0x7f06002a; + public static final int chat_entries=0x7f060029; + public static final int chat_message=0x7f06002f; + public static final int chat_message_layout=0x7f06002d; + public static final int chat_send=0x7f06002b; + public static final int chat_time=0x7f06002e; + public static final int chat_username=0x7f06002c; + public static final int control_next=0x7f060027; + public static final int control_play=0x7f060026; + public static final int control_previous=0x7f060025; + public static final int control_stop=0x7f060080; public static final int disabled=0x7f060000; - public static final int download_album=0x7f06003d; - public static final int download_album_art_image=0x7f060033; - public static final int download_album_art_layout=0x7f060032; - public static final int download_artist=0x7f06003c; - public static final int download_button_bar_flipper=0x7f060035; - public static final int download_control_layout=0x7f06002f; - public static final int download_duration=0x7f06003a; - public static final int download_empty=0x7f06003e; - public static final int download_equalizer=0x7f0600b8; - public static final int download_items=0x7f060037; - public static final int download_jukebox=0x7f0600ba; - public static final int download_list=0x7f06003f; - public static final int download_next=0x7f06006d; - public static final int download_pause=0x7f06006b; - public static final int download_playlist_flipper=0x7f060031; - public static final int download_position=0x7f060038; - public static final int download_previous=0x7f060069; - public static final int download_progress_bar=0x7f060040; - public static final int download_repeat=0x7f06006e; - public static final int download_shuffle=0x7f060068; - public static final int download_song_title=0x7f060036; - public static final int download_star=0x7f06006f; - public static final int download_start=0x7f06006a; - public static final int download_status=0x7f060030; - public static final int download_stop=0x7f06006c; - public static final int download_toggle_list=0x7f060067; - public static final int download_total_duration=0x7f06003b; - public static final int download_track=0x7f060039; - public static final int download_visualizer=0x7f0600b9; - public static final int download_visualizer_view_layout=0x7f060034; - public static final int equalizer_bar=0x7f060046; - public static final int equalizer_frequency=0x7f060044; - public static final int equalizer_level=0x7f060045; - public static final int equalizer_enabled=0x7f060041; - public static final int equalizer_layout=0x7f060042; - public static final int equalizer_preset=0x7f060043; - public static final int fl_inner=0x7f060089; + public static final int download_album=0x7f06003e; + public static final int download_album_art_image=0x7f060034; + public static final int download_album_art_layout=0x7f060033; + public static final int download_artist=0x7f06003d; + public static final int download_button_bar_flipper=0x7f060036; + public static final int download_control_layout=0x7f060030; + public static final int download_duration=0x7f06003b; + public static final int download_empty=0x7f06003f; + public static final int download_equalizer=0x7f0600b9; + public static final int download_items=0x7f060038; + public static final int download_jukebox=0x7f0600bb; + public static final int download_list=0x7f060040; + public static final int download_next=0x7f06006e; + public static final int download_pause=0x7f06006c; + public static final int download_playlist_flipper=0x7f060032; + public static final int download_position=0x7f060039; + public static final int download_previous=0x7f06006a; + public static final int download_progress_bar=0x7f060041; + public static final int download_repeat=0x7f06006f; + public static final int download_shuffle=0x7f060069; + public static final int download_song_title=0x7f060037; + public static final int download_star=0x7f060070; + public static final int download_start=0x7f06006b; + public static final int download_status=0x7f060031; + public static final int download_stop=0x7f06006d; + public static final int download_toggle_list=0x7f060068; + public static final int download_total_duration=0x7f06003c; + public static final int download_track=0x7f06003a; + public static final int download_visualizer=0x7f0600ba; + public static final int download_visualizer_view_layout=0x7f060035; + public static final int equalizer_bar=0x7f060047; + public static final int equalizer_frequency=0x7f060045; + public static final int equalizer_level=0x7f060046; + public static final int equalizer_enabled=0x7f060042; + public static final int equalizer_layout=0x7f060043; + public static final int equalizer_preset=0x7f060044; + public static final int fl_inner=0x7f06008a; public static final int flip=0x7f060008; - public static final int get_playlist_comment=0x7f0600b4; - public static final int get_playlist_comment_label=0x7f0600b3; - public static final int get_playlist_name=0x7f0600b2; - public static final int get_playlist_name_label=0x7f0600b1; - public static final int get_playlist_public=0x7f0600b6; - public static final int get_playlist_public_label=0x7f0600b5; + public static final int get_playlist_comment=0x7f0600b5; + public static final int get_playlist_comment_label=0x7f0600b4; + public static final int get_playlist_name=0x7f0600b3; + public static final int get_playlist_name_label=0x7f0600b2; + public static final int get_playlist_public=0x7f0600b7; + public static final int get_playlist_public_label=0x7f0600b6; public static final int gridview=0x7f060009; - public static final int help_back=0x7f060048; - public static final int help_buttons=0x7f060047; - public static final int help_contents=0x7f06004b; - public static final int help_forward=0x7f06004a; - public static final int help_stop=0x7f060049; - public static final int jukebox_volume_progress_bar=0x7f06004d; - public static final int linearLayout1=0x7f060020; - public static final int lyrics_artist=0x7f06004f; - public static final int lyrics_scrollview=0x7f06004e; - public static final int lyrics_text=0x7f060051; - public static final int lyrics_title=0x7f060050; - public static final int main_select_server_1=0x7f060055; - public static final int main_select_server_2=0x7f060056; - public static final int main_albums=0x7f06005e; - public static final int main_albums_alphaByArtist=0x7f060066; - public static final int main_albums_alphaByName=0x7f060065; - public static final int main_albums_button=0x7f060059; - public static final int main_albums_frequent=0x7f060061; - public static final int main_albums_highest=0x7f060062; - public static final int main_albums_newest=0x7f06005f; - public static final int main_albums_random=0x7f060063; - public static final int main_albums_recent=0x7f060060; - public static final int main_albums_starred=0x7f060064; - public static final int main_artists_button=0x7f060058; - public static final int main_dummy=0x7f060053; - public static final int main_genres_button=0x7f06005a; - public static final int main_list=0x7f060052; - public static final int main_music=0x7f060057; - public static final int main_select_server=0x7f060054; - public static final int main_shuffle=0x7f0600b7; - public static final int main_songs=0x7f06005b; - public static final int main_songs_button=0x7f06005c; - public static final int main_songs_starred=0x7f06005d; + public static final int help_back=0x7f060049; + public static final int help_buttons=0x7f060048; + public static final int help_contents=0x7f06004c; + public static final int help_forward=0x7f06004b; + public static final int help_stop=0x7f06004a; + public static final int jukebox_volume_progress_bar=0x7f06004e; + public static final int linearLayout1=0x7f060021; + public static final int lyrics_artist=0x7f060050; + public static final int lyrics_scrollview=0x7f06004f; + public static final int lyrics_text=0x7f060052; + public static final int lyrics_title=0x7f060051; + public static final int main_select_server_1=0x7f060056; + public static final int main_select_server_2=0x7f060057; + public static final int main_albums=0x7f06005f; + public static final int main_albums_alphaByArtist=0x7f060067; + public static final int main_albums_alphaByName=0x7f060066; + public static final int main_albums_button=0x7f06005a; + public static final int main_albums_frequent=0x7f060062; + public static final int main_albums_highest=0x7f060063; + public static final int main_albums_newest=0x7f060060; + public static final int main_albums_random=0x7f060064; + public static final int main_albums_recent=0x7f060061; + public static final int main_albums_starred=0x7f060065; + public static final int main_artists_button=0x7f060059; + public static final int main_dummy=0x7f060054; + public static final int main_genres_button=0x7f06005b; + public static final int main_list=0x7f060053; + public static final int main_music=0x7f060058; + public static final int main_select_server=0x7f060055; + public static final int main_shuffle=0x7f0600b8; + public static final int main_songs=0x7f06005c; + public static final int main_songs_button=0x7f06005d; + public static final int main_songs_starred=0x7f06005e; public static final int manualOnly=0x7f060004; /** Used with View#setTag(int) to specify a position for the active view. */ @@ -730,106 +732,109 @@ or to a theme attribute in the form "?[package:][type:]na /** The ID of the menu container. */ public static final int md__menu=0x7f06000f; - public static final int menu_about=0x7f06007a; + public static final int menu_about=0x7f06007b; public static final int menu_album=0x7f060012; - public static final int menu_browse=0x7f060073; - public static final int menu_chat=0x7f060076; - public static final int menu_common=0x7f060078; - public static final int menu_exit=0x7f06007b; - public static final int menu_home=0x7f060072; - public static final int menu_lyrics=0x7f0600bf; - public static final int menu_main=0x7f060070; - public static final int menu_navigation=0x7f060071; - public static final int menu_now_playing=0x7f060077; - public static final int menu_playlists=0x7f060075; - public static final int menu_remove=0x7f0600c0; - public static final int menu_remove_all=0x7f0600bc; - public static final int menu_save_playlist=0x7f0600bb; - public static final int menu_screen_on_off=0x7f0600bd; - public static final int menu_search=0x7f060074; - public static final int menu_settings=0x7f060079; - public static final int menu_show_album=0x7f0600be; - public static final int menu_shuffle=0x7f0600c1; - public static final int notification_image=0x7f06007d; - public static final int now_playing=0x7f060080; - public static final int now_playing_artist=0x7f060084; - public static final int now_playing_control_play=0x7f060085; - public static final int now_playing_image=0x7f060082; - public static final int now_playing_trackname=0x7f060083; - public static final int now_playing_view=0x7f060081; - public static final int play_video_contents=0x7f060086; - public static final int playlist_info=0x7f0600cd; - public static final int playlist_menu_delete=0x7f0600d3; - public static final int playlist_menu_pin=0x7f0600d0; - public static final int playlist_menu_play_now=0x7f0600ce; - public static final int playlist_menu_play_shuffled=0x7f0600cf; - public static final int playlist_menu_unpin=0x7f0600d1; - public static final int playlist_name=0x7f060087; - public static final int playlist_update_info=0x7f0600d2; - public static final int progress_message=0x7f060088; + public static final int menu_browse=0x7f060074; + public static final int menu_chat=0x7f060077; + public static final int menu_common=0x7f060079; + public static final int menu_exit=0x7f06007c; + public static final int menu_home=0x7f060073; + public static final int menu_lyrics=0x7f0600c0; + public static final int menu_main=0x7f060071; + public static final int menu_navigation=0x7f060072; + public static final int menu_now_playing=0x7f060078; + public static final int menu_playlists=0x7f060076; + public static final int menu_remove=0x7f0600c1; + public static final int menu_remove_all=0x7f0600bd; + public static final int menu_save_playlist=0x7f0600bc; + public static final int menu_screen_on_off=0x7f0600be; + public static final int menu_search=0x7f060075; + public static final int menu_settings=0x7f06007a; + public static final int menu_show_album=0x7f0600bf; + public static final int menu_shuffle=0x7f0600c2; + public static final int notification_image=0x7f06007e; + public static final int now_playing=0x7f060081; + public static final int now_playing_artist=0x7f060085; + public static final int now_playing_control_play=0x7f060086; + public static final int now_playing_image=0x7f060083; + public static final int now_playing_trackname=0x7f060084; + public static final int now_playing_view=0x7f060082; + public static final int play_video_contents=0x7f060087; + public static final int playlist_info=0x7f0600d0; + public static final int playlist_menu_delete=0x7f0600d7; + public static final int playlist_menu_download=0x7f0600d5; + public static final int playlist_menu_pin=0x7f0600d3; + public static final int playlist_menu_play_now=0x7f0600d1; + public static final int playlist_menu_play_shuffled=0x7f0600d2; + public static final int playlist_menu_unpin=0x7f0600d4; + public static final int playlist_name=0x7f060088; + public static final int playlist_update_info=0x7f0600d6; + public static final int progress_message=0x7f060089; 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=0x7f06008a; - public static final int pull_to_refresh_progress=0x7f06008b; - public static final int pull_to_refresh_sub_text=0x7f06008d; - public static final int pull_to_refresh_text=0x7f06008c; + public static final int pull_to_refresh_image=0x7f06008b; + public static final int pull_to_refresh_progress=0x7f06008c; + public static final int pull_to_refresh_sub_text=0x7f06008e; + public static final int pull_to_refresh_text=0x7f06008d; public static final int rotate=0x7f060007; - public static final int save_playlist_name=0x7f06008f; - public static final int save_playlist_root=0x7f06008e; + public static final int save_playlist_name=0x7f060090; + public static final int save_playlist_root=0x7f06008f; public static final int scrollview=0x7f06000b; - public static final int search_albums=0x7f060093; - public static final int search_artists=0x7f060092; - public static final int search_list=0x7f060090; - public static final int search_more_albums=0x7f060096; - public static final int search_more_artists=0x7f060095; - public static final int search_more_songs=0x7f060097; - public static final int search_search=0x7f060091; - public static final int search_songs=0x7f060094; - public static final int select_album_art=0x7f06009a; - public static final int select_album_artist=0x7f06009c; - public static final int select_album_delete=0x7f060019; - public static final int select_album_duration=0x7f06009f; - public static final int select_album_empty=0x7f060098; - public static final int select_album_entries=0x7f060099; - public static final int select_album_genre=0x7f06009d; - public static final int select_album_more=0x7f06001a; + public static final int search_albums=0x7f060094; + public static final int search_artists=0x7f060093; + public static final int search_list=0x7f060091; + public static final int search_more_albums=0x7f060097; + public static final int search_more_artists=0x7f060096; + public static final int search_more_songs=0x7f060098; + public static final int search_search=0x7f060092; + public static final int search_songs=0x7f060095; + public static final int select_album_art=0x7f06009b; + public static final int select_album_artist=0x7f06009d; + public static final int select_album_delete=0x7f06001a; + public static final int select_album_download=0x7f060019; + public static final int select_album_duration=0x7f0600a0; + public static final int select_album_empty=0x7f060099; + public static final int select_album_entries=0x7f06009a; + public static final int select_album_genre=0x7f06009e; + public static final int select_album_more=0x7f06001b; public static final int select_album_pin=0x7f060017; - public static final int select_album_play_all=0x7f0600c2; + public static final int select_album_play_all=0x7f0600c3; 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=0x7f06009e; - public static final int select_album_title=0x7f06009b; + public static final int select_album_song_count=0x7f06009f; + public static final int select_album_title=0x7f06009c; public static final int select_album_unpin=0x7f060018; - public static final int select_artist_folder=0x7f0600a1; - public static final int select_artist_folder_1=0x7f0600a2; - public static final int select_artist_folder_2=0x7f0600a3; - public static final int select_artist_list=0x7f0600a0; - public static final int select_genre_empty=0x7f0600a4; - public static final int select_genre_list=0x7f0600a5; - public static final int select_playlist_empty=0x7f0600a6; - public static final int select_playlist_list=0x7f0600a7; - public static final int song_artist=0x7f0600ac; - public static final int song_check=0x7f0600a8; - public static final int song_duration=0x7f0600ad; - public static final int song_menu_pin=0x7f0600d7; - public static final int song_menu_play_last=0x7f0600d6; - public static final int song_menu_play_next=0x7f0600d5; - public static final int song_menu_play_now=0x7f0600d4; - public static final int song_menu_unpin=0x7f0600d8; - public static final int song_star=0x7f0600ae; - public static final int song_status=0x7f0600ab; - public static final int song_title=0x7f0600aa; - public static final int song_track=0x7f0600a9; - public static final int statusbar=0x7f06007c; - public static final int tab_progress=0x7f0600af; - public static final int tab_progress_message=0x7f0600b0; - public static final int title=0x7f060022; - public static final int toast_layout_root=0x7f06004c; - public static final int trackname=0x7f06007e; + public static final int select_artist_folder=0x7f0600a2; + public static final int select_artist_folder_1=0x7f0600a3; + public static final int select_artist_folder_2=0x7f0600a4; + public static final int select_artist_list=0x7f0600a1; + public static final int select_genre_empty=0x7f0600a5; + public static final int select_genre_list=0x7f0600a6; + public static final int select_playlist_empty=0x7f0600a7; + public static final int select_playlist_list=0x7f0600a8; + public static final int song_artist=0x7f0600ad; + public static final int song_check=0x7f0600a9; + public static final int song_duration=0x7f0600ae; + public static final int song_menu_download=0x7f0600dd; + public static final int song_menu_pin=0x7f0600db; + public static final int song_menu_play_last=0x7f0600da; + public static final int song_menu_play_next=0x7f0600d9; + public static final int song_menu_play_now=0x7f0600d8; + public static final int song_menu_unpin=0x7f0600dc; + public static final int song_star=0x7f0600af; + public static final int song_status=0x7f0600ac; + public static final int song_title=0x7f0600ab; + public static final int song_track=0x7f0600aa; + public static final int statusbar=0x7f06007d; + public static final int tab_progress=0x7f0600b0; + public static final int tab_progress_message=0x7f0600b1; + public static final int title=0x7f060023; + public static final int toast_layout_root=0x7f06004d; + public static final int trackname=0x7f06007f; public static final int webview=0x7f06000a; } public static final class integer { @@ -895,143 +900,145 @@ or to a theme attribute in the form "?[package:][type:]na public static final int select_song_context=0x7f0e0008; } public static final class plurals { - public static final int select_album_donate_dialog_n_trial_days_left=0x7f0d0005; + public static final int select_album_donate_dialog_n_trial_days_left=0x7f0d0006; public static final int select_album_n_songs=0x7f0d0000; - public static final int select_album_n_songs_added=0x7f0d0003; - public static final int select_album_n_songs_downloading=0x7f0d0001; - public static final int select_album_n_songs_play_next=0x7f0d0004; - public static final int select_album_n_songs_unpinned=0x7f0d0002; + public static final int select_album_n_songs_added=0x7f0d0004; + public static final int select_album_n_songs_downloaded=0x7f0d0002; + public static final int select_album_n_songs_pinned=0x7f0d0001; + public static final int select_album_n_songs_play_next=0x7f0d0005; + public static final int select_album_n_songs_unpinned=0x7f0d0003; } public static final class string { - public static final int background_task_loading=0x7f08012f; - public static final int background_task_network_error=0x7f080131; - public static final int background_task_no_network=0x7f080130; - public static final int background_task_not_found=0x7f080132; - public static final int background_task_parse_error=0x7f080133; - public static final int background_task_wait=0x7f08012e; - public static final int button_bar_browse=0x7f08001a; - public static final int button_bar_chat=0x7f08001c; - public static final int button_bar_home=0x7f080019; - public static final int button_bar_now_playing=0x7f08001e; - public static final int button_bar_playlists=0x7f08001d; - public static final int button_bar_search=0x7f08001b; - public static final int chat_send_a_message=0x7f08014b; + public static final int background_task_loading=0x7f080130; + public static final int background_task_network_error=0x7f080132; + public static final int background_task_no_network=0x7f080131; + public static final int background_task_not_found=0x7f080133; + public static final int background_task_parse_error=0x7f080134; + public static final int background_task_wait=0x7f08012f; + public static final int button_bar_browse=0x7f08001b; + public static final int button_bar_chat=0x7f08001d; + public static final int button_bar_home=0x7f08001a; + public static final int button_bar_now_playing=0x7f08001f; + public static final int button_bar_playlists=0x7f08001e; + public static final int button_bar_search=0x7f08001c; + public static final int chat_send_a_message=0x7f08014c; public static final int common_appname=0x7f080006; public static final int common_cancel=0x7f080009; - public static final int common_comment=0x7f080016; - public static final int common_confirm=0x7f080014; - public static final int common_delete=0x7f08000f; - public static final int common_info=0x7f080012; - public static final int common_multiple_genres=0x7f080011; - public static final int common_name=0x7f080015; + public static final int common_comment=0x7f080017; + public static final int common_confirm=0x7f080015; + public static final int common_delete=0x7f080010; + public static final int common_download=0x7f08000f; + public static final int common_info=0x7f080013; + public static final int common_multiple_genres=0x7f080012; + public static final int common_name=0x7f080016; public static final int common_ok=0x7f080007; public static final int common_pin=0x7f08000d; public static final int common_play_last=0x7f08000c; public static final int common_play_next=0x7f08000b; public static final int common_play_now=0x7f08000a; - public static final int common_play_shuffled=0x7f080013; - public static final int common_public=0x7f080017; + public static final int common_play_shuffled=0x7f080014; + public static final int common_public=0x7f080018; public static final int common_save=0x7f080008; - public static final int common_show_artist=0x7f080018; + public static final int common_show_artist=0x7f080019; public static final int common_unpin=0x7f08000e; - public static final int common_various_artists=0x7f080010; - public static final int delete_playlist=0x7f08008f; - public static final int download_empty=0x7f08006b; - public static final int download_jukebox_not_authorized=0x7f08008a; - public static final int download_jukebox_off=0x7f080086; - public static final int download_jukebox_offline=0x7f080089; - public static final int download_jukebox_on=0x7f080085; - public static final int download_jukebox_server_too_old=0x7f080088; - public static final int download_jukebox_volume=0x7f080087; - public static final int download_menu_equalizer=0x7f080077; - public static final int download_menu_jukebox=0x7f080079; - public static final int download_menu_lyrics=0x7f080070; - public static final int download_menu_remove=0x7f080071; - public static final int download_menu_remove_all=0x7f080072; - public static final int download_menu_save=0x7f080076; - public static final int download_menu_screen_off=0x7f080074; - public static final int download_menu_screen_on=0x7f080073; - public static final int download_menu_show_album=0x7f08006f; - public static final int download_menu_shuffle=0x7f080075; - public static final int download_menu_shuffle_notification=0x7f08007a; - public static final int download_menu_visualizer=0x7f080078; - public static final int download_playerstate_buffering=0x7f08006d; - public static final int download_playerstate_downloading=0x7f08006c; - public static final int download_playerstate_playing_shuffle=0x7f08006e; - public static final int download_playlist_done=0x7f08007e; - public static final int download_playlist_error=0x7f08007f; - public static final int download_playlist_name=0x7f08007c; - public static final int download_playlist_saving=0x7f08007d; - public static final int download_playlist_title=0x7f08007b; - public static final int download_repeat_all=0x7f080081; - public static final int download_repeat_off=0x7f080080; - public static final int download_repeat_single=0x7f080082; - public static final int download_visualizer_off=0x7f080084; - public static final int download_visualizer_on=0x7f080083; - public static final int equalizer_enabled=0x7f080140; - public static final int equalizer_label=0x7f08013f; - public static final int equalizer_preset=0x7f080141; - public static final int error_label=0x7f080093; - public static final int help_back=0x7f080048; - public static final int help_close=0x7f080049; - public static final int help_label=0x7f080046; - public static final int help_loading=0x7f08004b; - public static final int help_title=0x7f080047; - public static final int help_url=0x7f08004a; - public static final int lyrics_nomatch=0x7f080092; - public static final int main_albums_alphaByArtist=0x7f080031; - public static final int main_albums_alphaByName=0x7f080030; - public static final int main_albums_frequent=0x7f08002c; - public static final int main_albums_highest=0x7f08002d; - public static final int main_albums_newest=0x7f08002a; - public static final int main_albums_random=0x7f08002e; - public static final int main_albums_recent=0x7f08002b; - public static final int main_albums_starred=0x7f08002f; - public static final int main_albums_title=0x7f080029; - public static final int main_artists_title=0x7f080027; - public static final int main_genres_title=0x7f080028; - public static final int main_music=0x7f080036; - public static final int main_offline=0x7f080025; - public static final int main_select_all_genres=0x7f080023; - public static final int main_select_genre=0x7f080022; - public static final int main_select_server=0x7f080021; - public static final int main_settings=0x7f080026; - public static final int main_shuffle=0x7f080024; - public static final int main_songs_genre=0x7f080035; - public static final int main_songs_random=0x7f080034; - public static final int main_songs_starred=0x7f080033; - public static final int main_songs_title=0x7f080032; - public static final int main_welcome_text=0x7f080020; - public static final int main_welcome_title=0x7f08001f; - public static final int menu_about=0x7f08003a; - public static final int menu_add_playlist=0x7f08003e; - public static final int menu_common=0x7f08003d; - public static final int menu_deleted_playlist=0x7f080040; - public static final int menu_deleted_playlist_error=0x7f080041; - public static final int menu_exit=0x7f080037; - public static final int menu_help=0x7f080039; - public static final int menu_navigation=0x7f08003c; - public static final int menu_remove_playlist=0x7f08003f; - public static final int menu_search=0x7f08003b; - public static final int menu_settings=0x7f080038; - public static final int music_library_label=0x7f080057; - public static final int music_library_label_offline=0x7f080058; - public static final int music_service_retry=0x7f08012d; - public static final int parser_artist_count=0x7f08013b; - public static final int parser_not_authenticated=0x7f080139; - public static final int parser_not_authorized=0x7f08013a; - public static final int parser_reading=0x7f080135; - public static final int parser_reading_done=0x7f080136; - public static final int parser_upgrade_client=0x7f080137; - public static final int parser_upgrade_server=0x7f080138; - public static final int play_video_loading=0x7f08004c; - public static final int play_video_noplugin=0x7f08004d; - public static final int playlist_label=0x7f080042; - public static final int playlist_update_info=0x7f080043; - public static final int playlist_updated_info=0x7f080044; - public static final int playlist_updated_info_error=0x7f080045; - public static final int playlist_error=0x7f08008b; - public static final int progress_wait=0x7f080056; + public static final int common_various_artists=0x7f080011; + public static final int delete_playlist=0x7f080090; + public static final int download_empty=0x7f08006c; + public static final int download_jukebox_not_authorized=0x7f08008b; + public static final int download_jukebox_off=0x7f080087; + public static final int download_jukebox_offline=0x7f08008a; + public static final int download_jukebox_on=0x7f080086; + public static final int download_jukebox_server_too_old=0x7f080089; + public static final int download_jukebox_volume=0x7f080088; + public static final int download_menu_equalizer=0x7f080078; + public static final int download_menu_jukebox=0x7f08007a; + public static final int download_menu_lyrics=0x7f080071; + public static final int download_menu_remove=0x7f080072; + public static final int download_menu_remove_all=0x7f080073; + public static final int download_menu_save=0x7f080077; + public static final int download_menu_screen_off=0x7f080075; + public static final int download_menu_screen_on=0x7f080074; + public static final int download_menu_show_album=0x7f080070; + public static final int download_menu_shuffle=0x7f080076; + public static final int download_menu_shuffle_notification=0x7f08007b; + public static final int download_menu_visualizer=0x7f080079; + public static final int download_playerstate_buffering=0x7f08006e; + public static final int download_playerstate_downloading=0x7f08006d; + public static final int download_playerstate_playing_shuffle=0x7f08006f; + public static final int download_playlist_done=0x7f08007f; + public static final int download_playlist_error=0x7f080080; + public static final int download_playlist_name=0x7f08007d; + public static final int download_playlist_saving=0x7f08007e; + public static final int download_playlist_title=0x7f08007c; + public static final int download_repeat_all=0x7f080082; + public static final int download_repeat_off=0x7f080081; + public static final int download_repeat_single=0x7f080083; + public static final int download_visualizer_off=0x7f080085; + public static final int download_visualizer_on=0x7f080084; + public static final int equalizer_enabled=0x7f080141; + public static final int equalizer_label=0x7f080140; + public static final int equalizer_preset=0x7f080142; + public static final int error_label=0x7f080094; + public static final int help_back=0x7f080049; + public static final int help_close=0x7f08004a; + public static final int help_label=0x7f080047; + public static final int help_loading=0x7f08004c; + public static final int help_title=0x7f080048; + public static final int help_url=0x7f08004b; + public static final int lyrics_nomatch=0x7f080093; + public static final int main_albums_alphaByArtist=0x7f080032; + public static final int main_albums_alphaByName=0x7f080031; + public static final int main_albums_frequent=0x7f08002d; + public static final int main_albums_highest=0x7f08002e; + public static final int main_albums_newest=0x7f08002b; + public static final int main_albums_random=0x7f08002f; + public static final int main_albums_recent=0x7f08002c; + public static final int main_albums_starred=0x7f080030; + public static final int main_albums_title=0x7f08002a; + public static final int main_artists_title=0x7f080028; + public static final int main_genres_title=0x7f080029; + public static final int main_music=0x7f080037; + public static final int main_offline=0x7f080026; + public static final int main_select_all_genres=0x7f080024; + public static final int main_select_genre=0x7f080023; + public static final int main_select_server=0x7f080022; + public static final int main_settings=0x7f080027; + public static final int main_shuffle=0x7f080025; + public static final int main_songs_genre=0x7f080036; + public static final int main_songs_random=0x7f080035; + public static final int main_songs_starred=0x7f080034; + public static final int main_songs_title=0x7f080033; + public static final int main_welcome_text=0x7f080021; + public static final int main_welcome_title=0x7f080020; + public static final int menu_about=0x7f08003b; + public static final int menu_add_playlist=0x7f08003f; + public static final int menu_common=0x7f08003e; + public static final int menu_deleted_playlist=0x7f080041; + public static final int menu_deleted_playlist_error=0x7f080042; + public static final int menu_exit=0x7f080038; + public static final int menu_help=0x7f08003a; + public static final int menu_navigation=0x7f08003d; + public static final int menu_remove_playlist=0x7f080040; + public static final int menu_search=0x7f08003c; + public static final int menu_settings=0x7f080039; + public static final int music_library_label=0x7f080058; + public static final int music_library_label_offline=0x7f080059; + public static final int music_service_retry=0x7f08012e; + public static final int parser_artist_count=0x7f08013c; + public static final int parser_not_authenticated=0x7f08013a; + public static final int parser_not_authorized=0x7f08013b; + public static final int parser_reading=0x7f080136; + public static final int parser_reading_done=0x7f080137; + public static final int parser_upgrade_client=0x7f080138; + public static final int parser_upgrade_server=0x7f080139; + public static final int play_video_loading=0x7f08004d; + public static final int play_video_noplugin=0x7f08004e; + public static final int playlist_label=0x7f080043; + public static final int playlist_update_info=0x7f080044; + public static final int playlist_updated_info=0x7f080045; + public static final int playlist_updated_info_error=0x7f080046; + public static final int playlist_error=0x7f08008c; + public static final int progress_wait=0x7f080057; /** Just use standard Pull Down String when pulling up. These can be set for languages which require it Just use standard Pull Down String when pulling up. These can be set for languages which require it */ @@ -1041,203 +1048,203 @@ or to a theme attribute in the form "?[package:][type:]na public static final int pull_to_refresh_pull_label=0x7f080000; public static final int pull_to_refresh_refreshing_label=0x7f080002; public static final int pull_to_refresh_release_label=0x7f080001; - public static final int removed_playlist=0x7f08008e; - public static final int search_albums=0x7f080053; - public static final int search_artists=0x7f080052; - public static final int search_label=0x7f08004e; - public static final int search_more=0x7f080055; - public static final int search_no_match=0x7f080051; - public static final int search_search=0x7f080050; - public static final int search_songs=0x7f080054; - public static final int search_title=0x7f08004f; - public static final int select_album_donate_dialog_0_trial_days_left=0x7f080067; - public static final int select_album_donate_dialog_later=0x7f080066; - public static final int select_album_donate_dialog_message=0x7f080064; - public static final int select_album_donate_dialog_now=0x7f080065; - public static final int select_album_empty=0x7f080059; - public static final int select_album_more=0x7f08005d; - public static final int select_album_n_selected=0x7f08005b; - public static final int select_album_n_unselected=0x7f08005c; - public static final int select_album_no_network=0x7f080062; - public static final int select_album_no_sdcard=0x7f080061; - public static final int select_album_not_licensed=0x7f080063; - public static final int select_album_offline=0x7f08005e; - public static final int select_album_play_all=0x7f080060; - public static final int select_album_searching=0x7f08005f; - public static final int select_album_select=0x7f08005a; - public static final int select_artist_all_folders=0x7f08013e; - public static final int select_artist_empty=0x7f080068; - public static final int select_artist_folder=0x7f08013d; - public static final int select_artist_refresh=0x7f08013c; - public static final int select_genre_empty=0x7f080069; - public static final int select_playlist_empty=0x7f08006a; - public static final int service_connecting=0x7f080134; - public static final int settings_appearance_title=0x7f0800af; - public static final int settings_buffer_length=0x7f0800e8; - public static final int settings_buffer_length_0=0x7f0800ea; - public static final int settings_buffer_length_1=0x7f0800eb; - public static final int settings_buffer_length_10=0x7f0800ef; - public static final int settings_buffer_length_12=0x7f0800f0; - public static final int settings_buffer_length_120=0x7f0800f5; - public static final int settings_buffer_length_15=0x7f0800f1; - public static final int settings_buffer_length_2=0x7f0800ec; - public static final int settings_buffer_length_20=0x7f0800f2; - public static final int settings_buffer_length_30=0x7f0800f3; - public static final int settings_buffer_length_5=0x7f0800ed; - public static final int settings_buffer_length_60=0x7f0800f4; - public static final int settings_buffer_length_8=0x7f0800ee; - public static final int settings_cache_location=0x7f0800a7; - public static final int settings_cache_location_error=0x7f0800a8; - public static final int settings_cache_size=0x7f0800a6; - public static final int settings_cache_size_100=0x7f0800cf; - public static final int settings_cache_size_1000=0x7f0800d2; - public static final int settings_cache_size_10000=0x7f0800d5; - public static final int settings_cache_size_200=0x7f0800d0; - public static final int settings_cache_size_2000=0x7f0800d3; - public static final int settings_cache_size_20000=0x7f0800d6; - public static final int settings_cache_size_500=0x7f0800d1; - public static final int settings_cache_size_5000=0x7f0800d4; - public static final int settings_cache_size_unlimited=0x7f0800d7; - public static final int settings_cache_title=0x7f0800a3; - public static final int settings_chat_refresh=0x7f0800a2; - public static final int settings_clear_search_history=0x7f0800d8; - public static final int settings_connection_failure=0x7f0800ac; - public static final int settings_default_albums=0x7f080125; - public static final int settings_default_artists=0x7f080124; - public static final int settings_default_songs=0x7f080126; - public static final int settings_directory_cache_time=0x7f0800a5; - public static final int settings_directory_cache_time_0=0x7f0800f6; - public static final int settings_directory_cache_time_1=0x7f0800f7; - public static final int settings_directory_cache_time_10=0x7f0800fa; - public static final int settings_directory_cache_time_2=0x7f0800f8; - public static final int settings_directory_cache_time_30=0x7f0800fb; - public static final int settings_directory_cache_time_5=0x7f0800f9; - public static final int settings_directory_cache_time_60=0x7f0800fc; - public static final int settings_display_bitrate=0x7f0800c3; - public static final int settings_display_bitrate_summary=0x7f0800c4; - public static final int settings_download_transition=0x7f08010d; - public static final int settings_download_transition_summary=0x7f08010e; - public static final int settings_gapless_playback=0x7f08010f; - public static final int settings_gapless_playback_summary=0x7f080110; - public static final int settings_hide_media_summary=0x7f0800e2; - public static final int settings_hide_media_title=0x7f0800e1; - public static final int settings_hide_media_toast=0x7f0800e3; - public static final int settings_increment_time=0x7f080127; - public static final int settings_invalid_url=0x7f0800ad; - public static final int settings_invalid_username=0x7f0800ae; - public static final int settings_max_albums=0x7f080113; - public static final int settings_max_artists=0x7f080122; - public static final int settings_max_bitrate_112=0x7f0800ba; - public static final int settings_max_bitrate_128=0x7f0800bb; - public static final int settings_max_bitrate_160=0x7f0800bc; - public static final int settings_max_bitrate_192=0x7f0800bd; - public static final int settings_max_bitrate_256=0x7f0800be; - public static final int settings_max_bitrate_32=0x7f0800b6; - public static final int settings_max_bitrate_320=0x7f0800bf; - public static final int settings_max_bitrate_64=0x7f0800b7; - public static final int settings_max_bitrate_80=0x7f0800b8; - public static final int settings_max_bitrate_96=0x7f0800b9; - public static final int settings_max_bitrate_mobile=0x7f0800b5; - public static final int settings_max_bitrate_unlimited=0x7f0800c0; - public static final int settings_max_bitrate_wifi=0x7f0800b4; - public static final int settings_max_songs=0x7f080123; - public static final int settings_media_button_summary=0x7f0800e5; - public static final int settings_media_button_title=0x7f0800e4; - public static final int settings_network_timeout=0x7f0800e9; - public static final int settings_network_timeout_105000=0x7f080103; - public static final int settings_network_timeout_120000=0x7f080104; - public static final int settings_network_timeout_15000=0x7f0800fd; - public static final int settings_network_timeout_30000=0x7f0800fe; - public static final int settings_network_timeout_45000=0x7f0800ff; - public static final int settings_network_timeout_60000=0x7f080100; - public static final int settings_network_timeout_75000=0x7f080101; - public static final int settings_network_timeout_90000=0x7f080102; - public static final int settings_network_title=0x7f0800b3; - public static final int settings_other_title=0x7f0800da; - public static final int settings_playback_control_title=0x7f0800dc; - public static final int settings_preload=0x7f0800a4; - public static final int settings_preload_1=0x7f0800c9; - public static final int settings_preload_10=0x7f0800cd; - public static final int settings_preload_2=0x7f0800ca; - public static final int settings_preload_3=0x7f0800cb; - public static final int settings_preload_5=0x7f0800cc; - public static final int settings_preload_unlimited=0x7f0800ce; - public static final int settings_screen_lit_summary=0x7f0800e7; - public static final int settings_screen_lit_title=0x7f0800e6; - public static final int settings_scrobble_summary=0x7f0800de; - public static final int settings_scrobble_title=0x7f0800dd; - public static final int settings_search_1=0x7f080114; - public static final int settings_search_10=0x7f080117; - public static final int settings_search_100=0x7f08011f; - public static final int settings_search_15=0x7f080118; - public static final int settings_search_20=0x7f080119; - public static final int settings_search_25=0x7f08011a; - public static final int settings_search_250=0x7f080120; - public static final int settings_search_3=0x7f080115; - public static final int settings_search_30=0x7f08011b; - public static final int settings_search_40=0x7f08011c; - public static final int settings_search_5=0x7f080116; - public static final int settings_search_50=0x7f08011d; - public static final int settings_search_500=0x7f080121; - public static final int settings_search_75=0x7f08011e; - public static final int settings_search_history_cleared=0x7f0800d9; - public static final int settings_search_title=0x7f0800db; - public static final int settings_server_add_server=0x7f08009c; - public static final int settings_server_address=0x7f08009f; - public static final int settings_server_name=0x7f08009b; - public static final int settings_server_number=0x7f08009d; - public static final int settings_server_password=0x7f0800a1; - public static final int settings_server_remove_server=0x7f08009e; - public static final int settings_server_scaling_summary=0x7f0800e0; - public static final int settings_server_scaling_title=0x7f0800df; - public static final int settings_server_unused=0x7f080097; - public static final int settings_server_unused1=0x7f080098; - public static final int settings_server_unused2=0x7f080099; - public static final int settings_server_unused3=0x7f08009a; - public static final int settings_server_username=0x7f0800a0; - public static final int settings_servers_title=0x7f080096; - public static final int settings_show_lockscreen_controls=0x7f080109; - public static final int settings_show_lockscreen_controls_summary=0x7f08010a; - public static final int settings_show_notification=0x7f080105; - public static final int settings_show_notification_always=0x7f080107; - public static final int settings_show_notification_always_summary=0x7f080108; - public static final int settings_show_notification_summary=0x7f080106; - public static final int settings_show_now_playing=0x7f080111; - public static final int settings_show_now_playing_summary=0x7f080112; - public static final int settings_show_track_number=0x7f0800c7; - public static final int settings_show_track_number_summary=0x7f0800c8; - public static final int settings_test_connection_title=0x7f080095; - public static final int settings_testing_connection=0x7f0800a9; - public static final int settings_testing_ok=0x7f0800aa; - public static final int settings_testing_unlicensed=0x7f0800ab; - public static final int settings_theme_dark=0x7f0800b2; - public static final int settings_theme_light=0x7f0800b1; - public static final int settings_theme_title=0x7f0800b0; - public static final int settings_title=0x7f080094; - public static final int settings_use_folder_for_album_artist=0x7f0800c5; - public static final int settings_use_folder_for_album_artist_summary=0x7f0800c6; - public static final int settings_use_id3=0x7f080128; - public static final int settings_use_id3_summary=0x7f080129; - public static final int settings_use_stream_proxy=0x7f08010b; - public static final int settings_use_stream_proxy_summary=0x7f08010c; - public static final int settings_wifi_required_summary=0x7f0800c2; - public static final int settings_wifi_required_title=0x7f0800c1; - public static final int shuffle_endYear=0x7f08012b; - public static final int shuffle_genre=0x7f08012c; - public static final int shuffle_startYear=0x7f08012a; - public static final int song_details_all=0x7f080090; - public static final int song_details_kbps=0x7f080091; - public static final int updated_playlist=0x7f08008c; - public static final int updated_playlist_error=0x7f08008d; - public static final int util_bytes_format_byte=0x7f080148; - public static final int util_bytes_format_gigabyte=0x7f080145; - public static final int util_bytes_format_kilobyte=0x7f080147; - public static final int util_bytes_format_megabyte=0x7f080146; - public static final int util_no_time=0x7f080149; - public static final int util_zero_time=0x7f08014a; - public static final int widget_initial_text=0x7f080142; - public static final int widget_sdcard_busy=0x7f080143; - public static final int widget_sdcard_missing=0x7f080144; + public static final int removed_playlist=0x7f08008f; + public static final int search_albums=0x7f080054; + public static final int search_artists=0x7f080053; + public static final int search_label=0x7f08004f; + public static final int search_more=0x7f080056; + public static final int search_no_match=0x7f080052; + public static final int search_search=0x7f080051; + public static final int search_songs=0x7f080055; + public static final int search_title=0x7f080050; + public static final int select_album_donate_dialog_0_trial_days_left=0x7f080068; + public static final int select_album_donate_dialog_later=0x7f080067; + public static final int select_album_donate_dialog_message=0x7f080065; + public static final int select_album_donate_dialog_now=0x7f080066; + public static final int select_album_empty=0x7f08005a; + public static final int select_album_more=0x7f08005e; + public static final int select_album_n_selected=0x7f08005c; + public static final int select_album_n_unselected=0x7f08005d; + public static final int select_album_no_network=0x7f080063; + public static final int select_album_no_sdcard=0x7f080062; + public static final int select_album_not_licensed=0x7f080064; + public static final int select_album_offline=0x7f08005f; + public static final int select_album_play_all=0x7f080061; + public static final int select_album_searching=0x7f080060; + public static final int select_album_select=0x7f08005b; + public static final int select_artist_all_folders=0x7f08013f; + public static final int select_artist_empty=0x7f080069; + public static final int select_artist_folder=0x7f08013e; + public static final int select_artist_refresh=0x7f08013d; + public static final int select_genre_empty=0x7f08006a; + public static final int select_playlist_empty=0x7f08006b; + public static final int service_connecting=0x7f080135; + public static final int settings_appearance_title=0x7f0800b0; + public static final int settings_buffer_length=0x7f0800e9; + public static final int settings_buffer_length_0=0x7f0800eb; + public static final int settings_buffer_length_1=0x7f0800ec; + public static final int settings_buffer_length_10=0x7f0800f0; + public static final int settings_buffer_length_12=0x7f0800f1; + public static final int settings_buffer_length_120=0x7f0800f6; + public static final int settings_buffer_length_15=0x7f0800f2; + public static final int settings_buffer_length_2=0x7f0800ed; + public static final int settings_buffer_length_20=0x7f0800f3; + public static final int settings_buffer_length_30=0x7f0800f4; + public static final int settings_buffer_length_5=0x7f0800ee; + public static final int settings_buffer_length_60=0x7f0800f5; + public static final int settings_buffer_length_8=0x7f0800ef; + public static final int settings_cache_location=0x7f0800a8; + public static final int settings_cache_location_error=0x7f0800a9; + public static final int settings_cache_size=0x7f0800a7; + public static final int settings_cache_size_100=0x7f0800d0; + public static final int settings_cache_size_1000=0x7f0800d3; + public static final int settings_cache_size_10000=0x7f0800d6; + public static final int settings_cache_size_200=0x7f0800d1; + public static final int settings_cache_size_2000=0x7f0800d4; + public static final int settings_cache_size_20000=0x7f0800d7; + public static final int settings_cache_size_500=0x7f0800d2; + public static final int settings_cache_size_5000=0x7f0800d5; + public static final int settings_cache_size_unlimited=0x7f0800d8; + public static final int settings_cache_title=0x7f0800a4; + public static final int settings_chat_refresh=0x7f0800a3; + public static final int settings_clear_search_history=0x7f0800d9; + public static final int settings_connection_failure=0x7f0800ad; + public static final int settings_default_albums=0x7f080126; + public static final int settings_default_artists=0x7f080125; + public static final int settings_default_songs=0x7f080127; + public static final int settings_directory_cache_time=0x7f0800a6; + public static final int settings_directory_cache_time_0=0x7f0800f7; + public static final int settings_directory_cache_time_1=0x7f0800f8; + public static final int settings_directory_cache_time_10=0x7f0800fb; + public static final int settings_directory_cache_time_2=0x7f0800f9; + public static final int settings_directory_cache_time_30=0x7f0800fc; + public static final int settings_directory_cache_time_5=0x7f0800fa; + public static final int settings_directory_cache_time_60=0x7f0800fd; + public static final int settings_display_bitrate=0x7f0800c4; + public static final int settings_display_bitrate_summary=0x7f0800c5; + public static final int settings_download_transition=0x7f08010e; + public static final int settings_download_transition_summary=0x7f08010f; + public static final int settings_gapless_playback=0x7f080110; + public static final int settings_gapless_playback_summary=0x7f080111; + public static final int settings_hide_media_summary=0x7f0800e3; + public static final int settings_hide_media_title=0x7f0800e2; + public static final int settings_hide_media_toast=0x7f0800e4; + public static final int settings_increment_time=0x7f080128; + public static final int settings_invalid_url=0x7f0800ae; + public static final int settings_invalid_username=0x7f0800af; + public static final int settings_max_albums=0x7f080114; + public static final int settings_max_artists=0x7f080123; + public static final int settings_max_bitrate_112=0x7f0800bb; + public static final int settings_max_bitrate_128=0x7f0800bc; + public static final int settings_max_bitrate_160=0x7f0800bd; + public static final int settings_max_bitrate_192=0x7f0800be; + public static final int settings_max_bitrate_256=0x7f0800bf; + public static final int settings_max_bitrate_32=0x7f0800b7; + public static final int settings_max_bitrate_320=0x7f0800c0; + public static final int settings_max_bitrate_64=0x7f0800b8; + public static final int settings_max_bitrate_80=0x7f0800b9; + public static final int settings_max_bitrate_96=0x7f0800ba; + public static final int settings_max_bitrate_mobile=0x7f0800b6; + public static final int settings_max_bitrate_unlimited=0x7f0800c1; + public static final int settings_max_bitrate_wifi=0x7f0800b5; + public static final int settings_max_songs=0x7f080124; + public static final int settings_media_button_summary=0x7f0800e6; + public static final int settings_media_button_title=0x7f0800e5; + public static final int settings_network_timeout=0x7f0800ea; + public static final int settings_network_timeout_105000=0x7f080104; + public static final int settings_network_timeout_120000=0x7f080105; + public static final int settings_network_timeout_15000=0x7f0800fe; + public static final int settings_network_timeout_30000=0x7f0800ff; + public static final int settings_network_timeout_45000=0x7f080100; + public static final int settings_network_timeout_60000=0x7f080101; + public static final int settings_network_timeout_75000=0x7f080102; + public static final int settings_network_timeout_90000=0x7f080103; + public static final int settings_network_title=0x7f0800b4; + public static final int settings_other_title=0x7f0800db; + public static final int settings_playback_control_title=0x7f0800dd; + public static final int settings_preload=0x7f0800a5; + public static final int settings_preload_1=0x7f0800ca; + public static final int settings_preload_10=0x7f0800ce; + public static final int settings_preload_2=0x7f0800cb; + public static final int settings_preload_3=0x7f0800cc; + public static final int settings_preload_5=0x7f0800cd; + public static final int settings_preload_unlimited=0x7f0800cf; + public static final int settings_screen_lit_summary=0x7f0800e8; + public static final int settings_screen_lit_title=0x7f0800e7; + public static final int settings_scrobble_summary=0x7f0800df; + public static final int settings_scrobble_title=0x7f0800de; + public static final int settings_search_1=0x7f080115; + public static final int settings_search_10=0x7f080118; + public static final int settings_search_100=0x7f080120; + public static final int settings_search_15=0x7f080119; + public static final int settings_search_20=0x7f08011a; + public static final int settings_search_25=0x7f08011b; + public static final int settings_search_250=0x7f080121; + public static final int settings_search_3=0x7f080116; + public static final int settings_search_30=0x7f08011c; + public static final int settings_search_40=0x7f08011d; + public static final int settings_search_5=0x7f080117; + public static final int settings_search_50=0x7f08011e; + public static final int settings_search_500=0x7f080122; + public static final int settings_search_75=0x7f08011f; + public static final int settings_search_history_cleared=0x7f0800da; + public static final int settings_search_title=0x7f0800dc; + public static final int settings_server_add_server=0x7f08009d; + public static final int settings_server_address=0x7f0800a0; + public static final int settings_server_name=0x7f08009c; + public static final int settings_server_number=0x7f08009e; + public static final int settings_server_password=0x7f0800a2; + public static final int settings_server_remove_server=0x7f08009f; + public static final int settings_server_scaling_summary=0x7f0800e1; + public static final int settings_server_scaling_title=0x7f0800e0; + public static final int settings_server_unused=0x7f080098; + public static final int settings_server_unused1=0x7f080099; + public static final int settings_server_unused2=0x7f08009a; + public static final int settings_server_unused3=0x7f08009b; + public static final int settings_server_username=0x7f0800a1; + public static final int settings_servers_title=0x7f080097; + public static final int settings_show_lockscreen_controls=0x7f08010a; + public static final int settings_show_lockscreen_controls_summary=0x7f08010b; + public static final int settings_show_notification=0x7f080106; + public static final int settings_show_notification_always=0x7f080108; + public static final int settings_show_notification_always_summary=0x7f080109; + public static final int settings_show_notification_summary=0x7f080107; + public static final int settings_show_now_playing=0x7f080112; + public static final int settings_show_now_playing_summary=0x7f080113; + public static final int settings_show_track_number=0x7f0800c8; + public static final int settings_show_track_number_summary=0x7f0800c9; + public static final int settings_test_connection_title=0x7f080096; + public static final int settings_testing_connection=0x7f0800aa; + public static final int settings_testing_ok=0x7f0800ab; + public static final int settings_testing_unlicensed=0x7f0800ac; + public static final int settings_theme_dark=0x7f0800b3; + public static final int settings_theme_light=0x7f0800b2; + public static final int settings_theme_title=0x7f0800b1; + public static final int settings_title=0x7f080095; + public static final int settings_use_folder_for_album_artist=0x7f0800c6; + public static final int settings_use_folder_for_album_artist_summary=0x7f0800c7; + public static final int settings_use_id3=0x7f080129; + public static final int settings_use_id3_summary=0x7f08012a; + public static final int settings_use_stream_proxy=0x7f08010c; + public static final int settings_use_stream_proxy_summary=0x7f08010d; + public static final int settings_wifi_required_summary=0x7f0800c3; + public static final int settings_wifi_required_title=0x7f0800c2; + public static final int shuffle_endYear=0x7f08012c; + public static final int shuffle_genre=0x7f08012d; + public static final int shuffle_startYear=0x7f08012b; + public static final int song_details_all=0x7f080091; + public static final int song_details_kbps=0x7f080092; + public static final int updated_playlist=0x7f08008d; + public static final int updated_playlist_error=0x7f08008e; + public static final int util_bytes_format_byte=0x7f080149; + public static final int util_bytes_format_gigabyte=0x7f080146; + public static final int util_bytes_format_kilobyte=0x7f080148; + public static final int util_bytes_format_megabyte=0x7f080147; + public static final int util_no_time=0x7f08014a; + public static final int util_zero_time=0x7f08014b; + public static final int widget_initial_text=0x7f080143; + public static final int widget_sdcard_busy=0x7f080144; + public static final int widget_sdcard_missing=0x7f080145; } public static final class style { public static final int MenuDrawer=0x7f0a0005; diff --git a/res/layout/album_buttons.xml b/res/layout/album_buttons.xml index ebe3b4aa..d1bf4fc8 100644 --- a/res/layout/album_buttons.xml +++ b/res/layout/album_buttons.xml @@ -53,6 +53,14 @@ android:layout_weight="1" android:src="?attr/unpin" android:visibility="gone" /> + + - + - - + a:id="@+id/main_shuffle" + a:icon="?attr/media_shuffle" + a:showAsAction="ifRoom|withText" + a:title="@string/main.shuffle"/> + + \ No newline at end of file diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml index 318d26aa..310fe9be 100644 --- a/res/menu/nowplaying.xml +++ b/res/menu/nowplaying.xml @@ -1,39 +1,29 @@ - + - + a:title="@string/download.menu_equalizer"/> - + a:title="@string/download.menu_visualizer"/> - + a:title="@string/download.menu_jukebox"/> - + a:title="@string/download.menu_save"/> - + a:title="@string/download.menu_remove_all"/> - + a:title="@string/download.menu_screen_on"/> + + \ No newline at end of file diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml index a4ffd522..94fb1578 100644 --- a/res/menu/nowplaying_context.xml +++ b/res/menu/nowplaying_context.xml @@ -1,34 +1,23 @@ - + - - - + - - + - - + - - + - - + - - + a:title="@string/download.menu_save"/> + + \ No newline at end of file diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml index e2c1cc15..de25c260 100644 --- a/res/menu/select_album.xml +++ b/res/menu/select_album.xml @@ -1,14 +1,10 @@ - - - - - - + + + \ No newline at end of file diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml index a8f91e92..39909393 100644 --- a/res/menu/select_album_context.xml +++ b/res/menu/select_album_context.xml @@ -1,29 +1,23 @@ - + - - - + - - + - - + - - + - + a:title="@string/common.unpin"/> + + \ No newline at end of file diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml index 6681f9e9..755d160f 100644 --- a/res/menu/select_artist_context.xml +++ b/res/menu/select_artist_context.xml @@ -1,30 +1,23 @@ - + - - - + - - + - - + - - + - - + a:title="@string/common.unpin"/> + + \ No newline at end of file diff --git a/res/menu/select_playlist_context.xml b/res/menu/select_playlist_context.xml index 2573d595..7c012bc4 100644 --- a/res/menu/select_playlist_context.xml +++ b/res/menu/select_playlist_context.xml @@ -15,7 +15,10 @@ android:title="@string/common.pin"/> + android:title="@string/common.unpin"/> + diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml index 17b36400..3e8e9fd1 100644 --- a/res/menu/select_song_context.xml +++ b/res/menu/select_song_context.xml @@ -1,29 +1,23 @@ - + - - - + - - + - - + - - + - + a:title="@string/common.unpin"/> + + \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index b66b6199..7e59fb19 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -290,7 +290,7 @@ Un titre %d titres - + Un titre sélectionnée pour être épinglé. %d titres sélectionnée pour être épinglé. diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 1bf5d4e1..478f1a6b 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -323,7 +323,7 @@ 1 dal %d dal - + 1 dal kijelölve tárolásra. %d dal kijelölve tárolásra. diff --git a/res/values/strings.xml b/res/values/strings.xml index 25181252..a57747a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9,6 +9,7 @@ Play Last Pin Unpin + Download Delete Various Artists Multiple Genres @@ -343,9 +344,13 @@ 1 song %d songs - + 1 song selected to be pinned. %d songs selected to be pinned. + + + 1 song selected to be downloaded. + %d songs selected to be downloaded. 1 song selected to be unpinned. diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java index d7948e0b..83d133b6 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java @@ -205,7 +205,10 @@ public class SearchActivity extends SubsonicTabActivity { break; case R.id.album_menu_unpin: downloadRecursively(id, false, false, false, false, false, false, true); - break; + break; + case R.id.album_menu_download: + downloadRecursively(id, false, false, false, false, true, false, false); + break; case R.id.song_menu_play_now: if (entry != null) { songs = new ArrayList(1); @@ -230,10 +233,17 @@ public class SearchActivity extends SubsonicTabActivity { case R.id.song_menu_pin: if (entry != null) { songs.add(entry); - Util.toast(SearchActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size())); + Util.toast(SearchActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_pinned, songs.size(), songs.size())); downloadBackground(true, songs); } break; + case R.id.song_menu_download: + if (entry != null) { + songs.add(entry); + Util.toast(SearchActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_downloaded, songs.size(), songs.size())); + downloadBackground(false, songs); + } + break; case R.id.song_menu_unpin: if (entry != null) { songs.add(entry); @@ -258,8 +268,6 @@ public class SearchActivity extends SubsonicTabActivity { public void run() { warnIfNetworkOrStorageUnavailable(); getDownloadService().downloadBackground(songs, save); - - Util.toast(SearchActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size())); } }; diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java index 10d593fa..209c9052 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java @@ -70,6 +70,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { private ImageView playLastButton; private ImageView pinButton; private ImageView unpinButton; + private ImageView downloadButton; private ImageView deleteButton; private ImageView moreButton; private boolean playAllButtonVisible; @@ -126,6 +127,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { playLastButton = (ImageView) findViewById(R.id.select_album_play_last); pinButton = (ImageView) findViewById(R.id.select_album_pin); unpinButton = (ImageView) findViewById(R.id.select_album_unpin); + downloadButton = (ImageView) findViewById(R.id.select_album_download); deleteButton = (ImageView) findViewById(R.id.select_album_delete); moreButton = (ImageView) findViewById(R.id.select_album_more); emptyView = findViewById(R.id.select_album_empty); @@ -169,6 +171,13 @@ public class SelectAlbumActivity extends SubsonicTabActivity { selectAll(false, false); } }); + downloadButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + downloadBackground(false); + selectAll(false, false); + } + }); deleteButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -329,7 +338,10 @@ public class SelectAlbumActivity extends SubsonicTabActivity { break; case R.id.album_menu_unpin: downloadRecursively(entry.getId(), false, false, false, false, false, false, true); - break; + break; + case R.id.album_menu_download: + downloadRecursively(entry.getId(), false, false, false, false, true, false, false); + break; case R.id.select_album_play_all: playAll(); break; @@ -489,6 +501,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { if (!result.getFirst().getChildren().isEmpty()) { pinButton.setVisibility(View.GONE); unpinButton.setVisibility(View.GONE); + downloadButton.setVisibility(View.GONE); deleteButton.setVisibility(View.GONE); // Hide more button when results are less than album list size @@ -566,11 +579,13 @@ public class SelectAlbumActivity extends SubsonicTabActivity { boolean deleteEnabled = false; int pinnedCount = 0; + for (MusicDirectory.Entry song : selection) { DownloadFile downloadFile = getDownloadService().forSong(song); if (downloadFile.isCompleteFileAvailable()) { deleteEnabled = true; } + if (downloadFile.isSaved()) { pinnedCount++; unpinEnabled = true; @@ -581,8 +596,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity { playNextButton.setVisibility(enabled ? View.VISIBLE : View.GONE); playLastButton.setVisibility(enabled ? View.VISIBLE : View.GONE); pinButton.setVisibility((enabled && !Util.isOffline(this) && selection.size() > pinnedCount) ? View.VISIBLE : View.GONE); - unpinButton.setVisibility(unpinEnabled ? View.VISIBLE : View.GONE); - deleteButton.setVisibility(deleteEnabled ? View.VISIBLE : View.GONE); + unpinButton.setVisibility(enabled && unpinEnabled ? View.VISIBLE : View.GONE); + downloadButton.setVisibility(enabled && !deleteEnabled && !Util.isOffline(this) ? View.VISIBLE : View.GONE); + deleteButton.setVisibility(enabled && deleteEnabled ? View.VISIBLE : View.GONE); } private void downloadBackground(final boolean save) { @@ -605,8 +621,11 @@ public class SelectAlbumActivity extends SubsonicTabActivity { warnIfNetworkOrStorageUnavailable(); getDownloadService().downloadBackground(songs, save); - Util.toast(SelectAlbumActivity.this, - getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size())); + if (save) { + Util.toast(SelectAlbumActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_pinned, songs.size(), songs.size())); + } else { + Util.toast(SelectAlbumActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_downloaded, songs.size(), songs.size())); + } } }; @@ -687,6 +706,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { pinButton.setVisibility(View.VISIBLE); unpinButton.setVisibility(View.VISIBLE); + downloadButton.setVisibility(View.VISIBLE); deleteButton.setVisibility(View.VISIBLE); selectButton.setVisibility(View.VISIBLE); playNowButton.setVisibility(View.VISIBLE); @@ -716,6 +736,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { } else { pinButton.setVisibility(View.GONE); unpinButton.setVisibility(View.GONE); + downloadButton.setVisibility(View.GONE); deleteButton.setVisibility(View.GONE); selectButton.setVisibility(View.GONE); playNowButton.setVisibility(View.GONE); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java index 0cec1693..a57cd81a 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java @@ -237,6 +237,9 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter case R.id.artist_menu_unpin: downloadRecursively(artist.getId(), false, false, false, false, false, false, true); break; + case R.id.artist_menu_download: + downloadRecursively(artist.getId(), false, false, false, false, true, false, false); + break; default: return super.onContextItemSelected(menuItem); } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java index 8452cbd9..dd573696 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java @@ -146,6 +146,9 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt break; case R.id.playlist_menu_unpin: downloadPlaylist(playlist.getId(), playlist.getName(), false, false, false, false, true, false, true); + break; + case R.id.playlist_menu_download: + downloadPlaylist(playlist.getId(), playlist.getName(), false, false, false, false, true, false, false); break; case R.id.playlist_menu_play_now: intent = new Intent(SelectPlaylistActivity.this, SelectAlbumActivity.class); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java index 53c9bc0d..bd6aba48 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java @@ -668,7 +668,7 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{ Util.startActivityWithoutTransition(SubsonicTabActivity.this, DownloadActivity.class); } } else if (save) { - Util.toast(SubsonicTabActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size())); + Util.toast(SubsonicTabActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_pinned, songs.size(), songs.size())); } else if (playNext) { Util.toast(SubsonicTabActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_play_next, songs.size(), songs.size())); } else if (append) { @@ -740,7 +740,7 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{ protected void done(List songs) { DownloadService downloadService = getDownloadService(); if (!songs.isEmpty() && downloadService != null) { - if (!append && !playNext && !unpin) { + if (!append && !playNext && !unpin && !background) { downloadService.clear(); } warnIfNetworkOrStorageUnavailable();