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

Move visualizer, equalizer and jukebox to menu, resize album art

This commit is contained in:
Joshua Bahnsen 2013-01-11 00:53:41 -07:00
parent c73c8a2cd5
commit 5ab323d4bf
9 changed files with 425 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -2,7 +2,7 @@
<manifest xmlns:a="http://schemas.android.com/apk/res/android" <manifest xmlns:a="http://schemas.android.com/apk/res/android"
package="net.sourceforge.subsonic.androidapp" package="net.sourceforge.subsonic.androidapp"
a:versionCode="47" a:versionCode="47"
a:versionName="3.9.9.6" a:installLocation="auto"> a:versionName="3.9.9.7" a:installLocation="auto">
<uses-permission a:name="android.permission.INTERNET"/> <uses-permission a:name="android.permission.INTERNET"/>
<uses-permission a:name="android.permission.READ_PHONE_STATE"/> <uses-permission a:name="android.permission.READ_PHONE_STATE"/>

593
gen/net/sourceforge/subsonic/androidapp/R.java
View File

@ -142,19 +142,19 @@ public final class R {
public static final int unknown_album_large=0x7f020056; public static final int unknown_album_large=0x7f020056;
} }
public static final class id { public static final class id {
public static final int album=0x7f0d004c; public static final int album=0x7f0d0048;
public static final int album_artist=0x7f0d0002; public static final int album_artist=0x7f0d0002;
public static final int album_coverart=0x7f0d0000; public static final int album_coverart=0x7f0d0000;
public static final int album_menu_pin=0x7f0d0087; public static final int album_menu_pin=0x7f0d0085;
public static final int album_menu_play_last=0x7f0d0086; public static final int album_menu_play_last=0x7f0d0084;
public static final int album_menu_play_now=0x7f0d0085; public static final int album_menu_play_now=0x7f0d0083;
public static final int album_title=0x7f0d0001; public static final int album_title=0x7f0d0001;
public static final int appwidget_coverart=0x7f0d0003; public static final int appwidget_coverart=0x7f0d0003;
public static final int appwidget_top=0x7f0d0005; public static final int appwidget_top=0x7f0d0005;
public static final int artist=0x7f0d0007; public static final int artist=0x7f0d0007;
public static final int artist_menu_pin=0x7f0d008a; public static final int artist_menu_pin=0x7f0d0088;
public static final int artist_menu_play_last=0x7f0d0089; public static final int artist_menu_play_last=0x7f0d0087;
public static final int artist_menu_play_now=0x7f0d0088; public static final int artist_menu_play_now=0x7f0d0086;
public static final int button_bar=0x7f0d000b; public static final int button_bar=0x7f0d000b;
public static final int button_bar_home=0x7f0d000c; public static final int button_bar_home=0x7f0d000c;
public static final int button_bar_music=0x7f0d000d; public static final int button_bar_music=0x7f0d000d;
@ -164,127 +164,125 @@ public final class R {
public static final int control_next=0x7f0d000a; public static final int control_next=0x7f0d000a;
public static final int control_play=0x7f0d0009; public static final int control_play=0x7f0d0009;
public static final int control_previous=0x7f0d0008; public static final int control_previous=0x7f0d0008;
public static final int control_stop=0x7f0d004d; public static final int control_stop=0x7f0d0049;
public static final int download_album=0x7f0d0028; public static final int download_album=0x7f0d0024;
public static final int download_album_art_image=0x7f0d0022; public static final int download_album_art_image=0x7f0d001e;
public static final int download_album_art_layout=0x7f0d0021; public static final int download_album_art_layout=0x7f0d001d;
public static final int download_artist=0x7f0d0027; public static final int download_artist=0x7f0d0023;
public static final int download_button_bar_flipper=0x7f0d0024; public static final int download_button_bar_flipper=0x7f0d0020;
public static final int download_control_layout=0x7f0d0011; public static final int download_control_layout=0x7f0d0011;
public static final int download_duration=0x7f0d0026; public static final int download_duration=0x7f0d0022;
public static final int download_empty=0x7f0d0029; public static final int download_empty=0x7f0d0025;
public static final int download_equalizer=0x7f0d001b; public static final int download_equalizer=0x7f0d0079;
public static final int download_jukebox=0x7f0d001c; public static final int download_jukebox=0x7f0d007b;
public static final int download_list=0x7f0d002a; public static final int download_list=0x7f0d0026;
public static final int download_next=0x7f0d0016; public static final int download_next=0x7f0d0018;
public static final int download_pause=0x7f0d0013; public static final int download_pause=0x7f0d0015;
public static final int download_playlist_flipper=0x7f0d0020; public static final int download_playlist_flipper=0x7f0d001c;
public static final int download_position=0x7f0d0025; public static final int download_position=0x7f0d0021;
public static final int download_previous=0x7f0d0012; public static final int download_previous=0x7f0d0014;
public static final int download_progress_bar=0x7f0d002b; public static final int download_progress_bar=0x7f0d0027;
public static final int download_repeat=0x7f0d001a; public static final int download_repeat=0x7f0d0013;
public static final int download_shuffle=0x7f0d0019; public static final int download_shuffle=0x7f0d0012;
public static final int download_song_title=0x7f0d0018; public static final int download_song_title=0x7f0d001b;
public static final int download_start=0x7f0d0015; public static final int download_start=0x7f0d0017;
public static final int download_status=0x7f0d0017; public static final int download_status=0x7f0d001a;
public static final int download_stop=0x7f0d0014; public static final int download_stop=0x7f0d0016;
public static final int download_toggle_list=0x7f0d001f; public static final int download_toggle_list=0x7f0d0019;
public static final int download_visualizer=0x7f0d001d; public static final int download_visualizer=0x7f0d007a;
public static final int download_visualizer_view_layout=0x7f0d0023; public static final int download_visualizer_view_layout=0x7f0d001f;
public static final int equalizer_bar=0x7f0d0031; public static final int equalizer_bar=0x7f0d002d;
public static final int equalizer_frequency=0x7f0d002f; public static final int equalizer_frequency=0x7f0d002b;
public static final int equalizer_level=0x7f0d0030; public static final int equalizer_level=0x7f0d002c;
public static final int equalizer_enabled=0x7f0d002c; public static final int equalizer_enabled=0x7f0d0028;
public static final int equalizer_layout=0x7f0d002d; public static final int equalizer_layout=0x7f0d0029;
public static final int equalizer_preset=0x7f0d002e; public static final int equalizer_preset=0x7f0d002a;
public static final int help_back=0x7f0d0033; public static final int help_back=0x7f0d002f;
public static final int help_buttons=0x7f0d0032; public static final int help_buttons=0x7f0d002e;
public static final int help_close=0x7f0d0034; public static final int help_close=0x7f0d0030;
public static final int help_contents=0x7f0d0035; public static final int help_contents=0x7f0d0031;
public static final int ic_menu_shuffle=0x7f0d007d; public static final int icon=0x7f0d006e;
public static final int icon=0x7f0d0072; public static final int jukebox_volume_progress_bar=0x7f0d0033;
public static final int jukebox_volume_progress_bar=0x7f0d0037;
public static final int linearLayout1=0x7f0d0004; public static final int linearLayout1=0x7f0d0004;
public static final int lyrics_artist=0x7f0d0039; public static final int lyrics_artist=0x7f0d0035;
public static final int lyrics_scrollview=0x7f0d0038; public static final int lyrics_scrollview=0x7f0d0034;
public static final int lyrics_text=0x7f0d003b; public static final int lyrics_text=0x7f0d0037;
public static final int lyrics_title=0x7f0d003a; public static final int lyrics_title=0x7f0d0036;
public static final int main_select_server_1=0x7f0d003f; public static final int main_select_server_1=0x7f0d003b;
public static final int main_select_server_2=0x7f0d0040; public static final int main_select_server_2=0x7f0d003c;
public static final int main_albums=0x7f0d0041; public static final int main_albums=0x7f0d003d;
public static final int main_albums_frequent=0x7f0d0044; public static final int main_albums_frequent=0x7f0d0040;
public static final int main_albums_highest=0x7f0d0045; public static final int main_albums_highest=0x7f0d0041;
public static final int main_albums_newest=0x7f0d0042; public static final int main_albums_newest=0x7f0d003e;
public static final int main_albums_random=0x7f0d0047; public static final int main_albums_random=0x7f0d0043;
public static final int main_albums_recent=0x7f0d0043; public static final int main_albums_recent=0x7f0d003f;
public static final int main_albums_starred=0x7f0d0046; public static final int main_albums_starred=0x7f0d0042;
public static final int main_dummy=0x7f0d003d; public static final int main_dummy=0x7f0d0039;
public static final int main_list=0x7f0d003c; public static final int main_list=0x7f0d0038;
public static final int main_select_server=0x7f0d003e; public static final int main_select_server=0x7f0d003a;
public static final int main_shuffle=0x7f0d007c; public static final int main_shuffle=0x7f0d0078;
public static final int menu_exit=0x7f0d007b; public static final int menu_exit=0x7f0d0077;
public static final int menu_help=0x7f0d007a; public static final int menu_help=0x7f0d0076;
public static final int menu_lyrics=0x7f0d0082; public static final int menu_lyrics=0x7f0d0080;
public static final int menu_refresh=0x7f0d008b; public static final int menu_refresh=0x7f0d0089;
public static final int menu_remove=0x7f0d0083; public static final int menu_remove=0x7f0d0081;
public static final int menu_remove_all=0x7f0d007f; public static final int menu_remove_all=0x7f0d007d;
public static final int menu_save_playlist=0x7f0d007e; public static final int menu_save_playlist=0x7f0d007c;
public static final int menu_screen_on_off=0x7f0d0080; public static final int menu_screen_on_off=0x7f0d007e;
public static final int menu_selector=0x7f0d001e; public static final int menu_settings=0x7f0d0075;
public static final int menu_settings=0x7f0d0079; public static final int menu_show_album=0x7f0d007f;
public static final int menu_show_album=0x7f0d0081; public static final int menu_shuffle=0x7f0d0082;
public static final int menu_shuffle=0x7f0d0084; public static final int notification_image=0x7f0d0045;
public static final int notification_image=0x7f0d0049; public static final int play_video_contents=0x7f0d004a;
public static final int play_video_contents=0x7f0d004e; public static final int progress_message=0x7f0d004b;
public static final int progress_message=0x7f0d004f; public static final int save_playlist_name=0x7f0d004d;
public static final int save_playlist_name=0x7f0d0051; public static final int save_playlist_root=0x7f0d004c;
public static final int save_playlist_root=0x7f0d0050; public static final int search_albums=0x7f0d0051;
public static final int search_albums=0x7f0d0055; public static final int search_artists=0x7f0d0050;
public static final int search_artists=0x7f0d0054; public static final int search_list=0x7f0d004e;
public static final int search_list=0x7f0d0052; public static final int search_more_albums=0x7f0d0054;
public static final int search_more_albums=0x7f0d0058; public static final int search_more_artists=0x7f0d0053;
public static final int search_more_artists=0x7f0d0057; public static final int search_more_songs=0x7f0d0055;
public static final int search_more_songs=0x7f0d0059; public static final int search_search=0x7f0d004f;
public static final int search_search=0x7f0d0053; public static final int search_songs=0x7f0d0052;
public static final int search_songs=0x7f0d0056; public static final int select_album_cover_art=0x7f0d005f;
public static final int select_album_cover_art=0x7f0d0063; public static final int select_album_delete=0x7f0d005d;
public static final int select_album_delete=0x7f0d0061; public static final int select_album_empty=0x7f0d0056;
public static final int select_album_empty=0x7f0d005a; public static final int select_album_entries=0x7f0d0057;
public static final int select_album_entries=0x7f0d005b; public static final int select_album_more=0x7f0d005e;
public static final int select_album_more=0x7f0d0062; public static final int select_album_pin=0x7f0d005b;
public static final int select_album_pin=0x7f0d005f; public static final int select_album_play_all=0x7f0d0062;
public static final int select_album_play_all=0x7f0d0066; public static final int select_album_play_last=0x7f0d005a;
public static final int select_album_play_last=0x7f0d005e; public static final int select_album_play_now=0x7f0d0059;
public static final int select_album_play_now=0x7f0d005d; public static final int select_album_select=0x7f0d0058;
public static final int select_album_select=0x7f0d005c; public static final int select_album_text1=0x7f0d0060;
public static final int select_album_text1=0x7f0d0064; public static final int select_album_text2=0x7f0d0061;
public static final int select_album_text2=0x7f0d0065; public static final int select_album_unpin=0x7f0d005c;
public static final int select_album_unpin=0x7f0d0060; public static final int select_artist_folder=0x7f0d0064;
public static final int select_artist_folder=0x7f0d0068; public static final int select_artist_folder_1=0x7f0d0065;
public static final int select_artist_folder_1=0x7f0d0069; public static final int select_artist_folder_2=0x7f0d0066;
public static final int select_artist_folder_2=0x7f0d006a; public static final int select_artist_list=0x7f0d0063;
public static final int select_artist_list=0x7f0d0067; public static final int select_playlist_empty=0x7f0d0067;
public static final int select_playlist_empty=0x7f0d006b; public static final int select_playlist_list=0x7f0d0068;
public static final int select_playlist_list=0x7f0d006c; public static final int song_artist=0x7f0d006c;
public static final int song_artist=0x7f0d0070; public static final int song_check=0x7f0d0069;
public static final int song_check=0x7f0d006d; public static final int song_duration=0x7f0d006d;
public static final int song_duration=0x7f0d0071; public static final int song_menu_play_last=0x7f0d008c;
public static final int song_menu_play_last=0x7f0d008e; public static final int song_menu_play_next=0x7f0d008b;
public static final int song_menu_play_next=0x7f0d008d; public static final int song_menu_play_now=0x7f0d008a;
public static final int song_menu_play_now=0x7f0d008c; public static final int song_status=0x7f0d006b;
public static final int song_status=0x7f0d006f; public static final int song_title=0x7f0d006a;
public static final int song_title=0x7f0d006e; public static final int status_icon=0x7f0d0046;
public static final int status_icon=0x7f0d004a; public static final int status_media_collapse=0x7f0d0072;
public static final int status_media_collapse=0x7f0d0076; public static final int status_media_next=0x7f0d0071;
public static final int status_media_next=0x7f0d0075; public static final int status_media_play=0x7f0d0070;
public static final int status_media_play=0x7f0d0074; public static final int status_media_prev=0x7f0d006f;
public static final int status_media_prev=0x7f0d0073; public static final int statusbar=0x7f0d0044;
public static final int statusbar=0x7f0d0048; public static final int tab_progress=0x7f0d0073;
public static final int tab_progress=0x7f0d0077; public static final int tab_progress_message=0x7f0d0074;
public static final int tab_progress_message=0x7f0d0078;
public static final int title=0x7f0d0006; public static final int title=0x7f0d0006;
public static final int toast_layout_root=0x7f0d0036; public static final int toast_layout_root=0x7f0d0032;
public static final int trackname=0x7f0d004b; public static final int trackname=0x7f0d0047;
} }
public static final class integer { public static final class integer {
public static final int config_activityDefaultDur=0x7f080001; public static final int config_activityDefaultDur=0x7f080001;
@ -341,12 +339,12 @@ public final class R {
public static final int select_album_n_songs_downloading=0x7f0a0001; public static final int select_album_n_songs_downloading=0x7f0a0001;
} }
public static final class string { public static final class string {
public static final int background_task_loading=0x7f0900e0; public static final int background_task_loading=0x7f0900e3;
public static final int background_task_network_error=0x7f0900e2; public static final int background_task_network_error=0x7f0900e5;
public static final int background_task_no_network=0x7f0900e1; public static final int background_task_no_network=0x7f0900e4;
public static final int background_task_not_found=0x7f0900e3; public static final int background_task_not_found=0x7f0900e6;
public static final int background_task_parse_error=0x7f0900e4; public static final int background_task_parse_error=0x7f0900e7;
public static final int background_task_wait=0x7f0900df; public static final int background_task_wait=0x7f0900e2;
public static final int button_bar_browse=0x7f09000b; public static final int button_bar_browse=0x7f09000b;
public static final int button_bar_home=0x7f09000a; public static final int button_bar_home=0x7f09000a;
public static final int button_bar_now_playing=0x7f09000e; public static final int button_bar_now_playing=0x7f09000e;
@ -363,12 +361,14 @@ public final class R {
public static final int common_save=0x7f090002; public static final int common_save=0x7f090002;
public static final int common_unpin=0x7f090008; public static final int common_unpin=0x7f090008;
public static final int download_empty=0x7f090044; public static final int download_empty=0x7f090044;
public static final int download_jukebox_not_authorized=0x7f090060; public static final int download_jukebox_not_authorized=0x7f090063;
public static final int download_jukebox_off=0x7f09005c; public static final int download_jukebox_off=0x7f09005f;
public static final int download_jukebox_offline=0x7f09005f; public static final int download_jukebox_offline=0x7f090062;
public static final int download_jukebox_on=0x7f09005b; public static final int download_jukebox_on=0x7f09005e;
public static final int download_jukebox_server_too_old=0x7f09005e; public static final int download_jukebox_server_too_old=0x7f090061;
public static final int download_jukebox_volume=0x7f09005d; public static final int download_jukebox_volume=0x7f090060;
public static final int download_menu_equalizer=0x7f090050;
public static final int download_menu_jukebox=0x7f090052;
public static final int download_menu_lyrics=0x7f090049; public static final int download_menu_lyrics=0x7f090049;
public static final int download_menu_remove=0x7f09004a; public static final int download_menu_remove=0x7f09004a;
public static final int download_menu_remove_all=0x7f09004b; public static final int download_menu_remove_all=0x7f09004b;
@ -377,31 +377,32 @@ public final class R {
public static final int download_menu_screen_on=0x7f09004c; public static final int download_menu_screen_on=0x7f09004c;
public static final int download_menu_show_album=0x7f090048; public static final int download_menu_show_album=0x7f090048;
public static final int download_menu_shuffle=0x7f09004e; public static final int download_menu_shuffle=0x7f09004e;
public static final int download_menu_shuffle_notification=0x7f090050; public static final int download_menu_shuffle_notification=0x7f090053;
public static final int download_menu_visualizer=0x7f090051;
public static final int download_playerstate_buffering=0x7f090046; public static final int download_playerstate_buffering=0x7f090046;
public static final int download_playerstate_downloading=0x7f090045; public static final int download_playerstate_downloading=0x7f090045;
public static final int download_playerstate_playing_shuffle=0x7f090047; public static final int download_playerstate_playing_shuffle=0x7f090047;
public static final int download_playlist_done=0x7f090054; public static final int download_playlist_done=0x7f090057;
public static final int download_playlist_error=0x7f090055; public static final int download_playlist_error=0x7f090058;
public static final int download_playlist_name=0x7f090052; public static final int download_playlist_name=0x7f090055;
public static final int download_playlist_saving=0x7f090053; public static final int download_playlist_saving=0x7f090056;
public static final int download_playlist_title=0x7f090051; public static final int download_playlist_title=0x7f090054;
public static final int download_repeat_all=0x7f090057; public static final int download_repeat_all=0x7f09005a;
public static final int download_repeat_off=0x7f090056; public static final int download_repeat_off=0x7f090059;
public static final int download_repeat_single=0x7f090058; public static final int download_repeat_single=0x7f09005b;
public static final int download_visualizer_off=0x7f09005a; public static final int download_visualizer_off=0x7f09005d;
public static final int download_visualizer_on=0x7f090059; public static final int download_visualizer_on=0x7f09005c;
public static final int equalizer_enabled=0x7f0900f1; public static final int equalizer_enabled=0x7f0900f4;
public static final int equalizer_label=0x7f0900f0; public static final int equalizer_label=0x7f0900f3;
public static final int equalizer_preset=0x7f0900f2; public static final int equalizer_preset=0x7f0900f5;
public static final int error_label=0x7f090064; public static final int error_label=0x7f090067;
public static final int help_back=0x7f090023; public static final int help_back=0x7f090023;
public static final int help_close=0x7f090024; public static final int help_close=0x7f090024;
public static final int help_label=0x7f090021; public static final int help_label=0x7f090021;
public static final int help_loading=0x7f090026; public static final int help_loading=0x7f090026;
public static final int help_title=0x7f090022; public static final int help_title=0x7f090022;
public static final int help_url=0x7f090025; public static final int help_url=0x7f090025;
public static final int lyrics_nomatch=0x7f090063; public static final int lyrics_nomatch=0x7f090066;
public static final int main_albums_frequent=0x7f090018; public static final int main_albums_frequent=0x7f090018;
public static final int main_albums_highest=0x7f090019; public static final int main_albums_highest=0x7f090019;
public static final int main_albums_newest=0x7f090016; public static final int main_albums_newest=0x7f090016;
@ -424,14 +425,14 @@ public final class R {
/** <string name="settings.screen_lit_title">TODO: Keep screen on</string> /** <string name="settings.screen_lit_title">TODO: Keep screen on</string>
<string name="settings.screen_lit_summary">TODO: Keeping the screen on when downloading may improve download speed</string> <string name="settings.screen_lit_summary">TODO: Keeping the screen on when downloading may improve download speed</string>
*/ */
public static final int music_service_retry=0x7f0900de; public static final int music_service_retry=0x7f0900e1;
public static final int parser_artist_count=0x7f0900ec; public static final int parser_artist_count=0x7f0900ef;
public static final int parser_not_authenticated=0x7f0900ea; public static final int parser_not_authenticated=0x7f0900ed;
public static final int parser_not_authorized=0x7f0900eb; public static final int parser_not_authorized=0x7f0900ee;
public static final int parser_reading=0x7f0900e6; public static final int parser_reading=0x7f0900e9;
public static final int parser_reading_done=0x7f0900e7; public static final int parser_reading_done=0x7f0900ea;
public static final int parser_upgrade_client=0x7f0900e8; public static final int parser_upgrade_client=0x7f0900eb;
public static final int parser_upgrade_server=0x7f0900e9; public static final int parser_upgrade_server=0x7f0900ec;
public static final int play_video_loading=0x7f090027; public static final int play_video_loading=0x7f090027;
public static final int play_video_noplugin=0x7f090028; public static final int play_video_noplugin=0x7f090028;
/** <string name="menu.exit">TODO: Exit</string> /** <string name="menu.exit">TODO: Exit</string>
@ -466,145 +467,145 @@ public final class R {
public static final int select_album_play_all=0x7f09003b; public static final int select_album_play_all=0x7f09003b;
public static final int select_album_searching=0x7f09003a; public static final int select_album_searching=0x7f09003a;
public static final int select_album_select=0x7f090035; public static final int select_album_select=0x7f090035;
public static final int select_artist_all_folders=0x7f0900ef; public static final int select_artist_all_folders=0x7f0900f2;
public static final int select_artist_folder=0x7f0900ee; public static final int select_artist_folder=0x7f0900f1;
public static final int select_artist_refresh=0x7f0900ed; public static final int select_artist_refresh=0x7f0900f0;
public static final int select_playlist_empty=0x7f090043; public static final int select_playlist_empty=0x7f090043;
public static final int service_connecting=0x7f0900e5; public static final int service_connecting=0x7f0900e8;
public static final int settings_appearance_title=0x7f090079; public static final int settings_appearance_title=0x7f09007c;
public static final int settings_buffer_length=0x7f0900ab; public static final int settings_buffer_length=0x7f0900ae;
public static final int settings_buffer_length_10=0x7f0900b0; public static final int settings_buffer_length_10=0x7f0900b3;
public static final int settings_buffer_length_12=0x7f0900b1; public static final int settings_buffer_length_12=0x7f0900b4;
public static final int settings_buffer_length_15=0x7f0900b2; public static final int settings_buffer_length_15=0x7f0900b5;
public static final int settings_buffer_length_2=0x7f0900ad; public static final int settings_buffer_length_2=0x7f0900b0;
public static final int settings_buffer_length_20=0x7f0900b3; public static final int settings_buffer_length_20=0x7f0900b6;
public static final int settings_buffer_length_30=0x7f0900b4; public static final int settings_buffer_length_30=0x7f0900b7;
public static final int settings_buffer_length_5=0x7f0900ae; public static final int settings_buffer_length_5=0x7f0900b1;
public static final int settings_buffer_length_8=0x7f0900af; public static final int settings_buffer_length_8=0x7f0900b2;
public static final int settings_cache_location=0x7f090071; public static final int settings_cache_location=0x7f090074;
public static final int settings_cache_location_error=0x7f090072; public static final int settings_cache_location_error=0x7f090075;
public static final int settings_cache_size=0x7f090070; public static final int settings_cache_size=0x7f090073;
public static final int settings_cache_size_100=0x7f090095; public static final int settings_cache_size_100=0x7f090098;
public static final int settings_cache_size_1000=0x7f090098; public static final int settings_cache_size_1000=0x7f09009b;
public static final int settings_cache_size_10000=0x7f09009b; public static final int settings_cache_size_10000=0x7f09009e;
public static final int settings_cache_size_200=0x7f090096; public static final int settings_cache_size_200=0x7f090099;
public static final int settings_cache_size_2000=0x7f090099; public static final int settings_cache_size_2000=0x7f09009c;
public static final int settings_cache_size_20000=0x7f09009c; public static final int settings_cache_size_20000=0x7f09009f;
public static final int settings_cache_size_500=0x7f090097; public static final int settings_cache_size_500=0x7f09009a;
public static final int settings_cache_size_5000=0x7f09009a; public static final int settings_cache_size_5000=0x7f09009d;
public static final int settings_cache_size_unlimited=0x7f09009d; public static final int settings_cache_size_unlimited=0x7f0900a0;
public static final int settings_cache_title=0x7f09006e; public static final int settings_cache_title=0x7f090071;
public static final int settings_clear_search_history=0x7f09009e; public static final int settings_clear_search_history=0x7f0900a1;
public static final int settings_connection_failure=0x7f090076; public static final int settings_connection_failure=0x7f090079;
public static final int settings_hide_media_summary=0x7f0900a5; public static final int settings_hide_media_summary=0x7f0900a8;
/** <string name="settings.scrobble_title">TODO: Scrobble to Last.fm</string> /** <string name="settings.scrobble_title">TODO: Scrobble to Last.fm</string>
<string name="settings.scrobble_summary">TODO: Remember to set up your Last.fm user and password on the Subsonic server</string> <string name="settings.scrobble_summary">TODO: Remember to set up your Last.fm user and password on the Subsonic server</string>
*/ */
public static final int settings_hide_media_title=0x7f0900a4; public static final int settings_hide_media_title=0x7f0900a7;
public static final int settings_hide_media_toast=0x7f0900a6; public static final int settings_hide_media_toast=0x7f0900a9;
public static final int settings_invalid_url=0x7f090077; public static final int settings_invalid_url=0x7f09007a;
public static final int settings_invalid_username=0x7f090078; public static final int settings_invalid_username=0x7f09007b;
public static final int settings_max_albums=0x7f0900bf; public static final int settings_max_albums=0x7f0900c2;
public static final int settings_max_albums_10=0x7f0900c2; public static final int settings_max_albums_10=0x7f0900c5;
public static final int settings_max_albums_100=0x7f0900c7; public static final int settings_max_albums_100=0x7f0900ca;
public static final int settings_max_albums_20=0x7f0900c3; public static final int settings_max_albums_20=0x7f0900c6;
public static final int settings_max_albums_250=0x7f0900c8; public static final int settings_max_albums_250=0x7f0900cb;
public static final int settings_max_albums_30=0x7f0900c4; public static final int settings_max_albums_30=0x7f0900c7;
public static final int settings_max_albums_40=0x7f0900c5; public static final int settings_max_albums_40=0x7f0900c8;
public static final int settings_max_albums_5=0x7f0900c1; public static final int settings_max_albums_5=0x7f0900c4;
public static final int settings_max_albums_50=0x7f0900c6; public static final int settings_max_albums_50=0x7f0900c9;
public static final int settings_max_albums_500=0x7f0900c9; public static final int settings_max_albums_500=0x7f0900cc;
public static final int settings_max_albums_summary=0x7f0900c0; public static final int settings_max_albums_summary=0x7f0900c3;
public static final int settings_max_artists=0x7f0900d4; public static final int settings_max_artists=0x7f0900d7;
public static final int settings_max_artists_10=0x7f0900d7; public static final int settings_max_artists_10=0x7f0900da;
public static final int settings_max_artists_100=0x7f0900db; public static final int settings_max_artists_100=0x7f0900de;
public static final int settings_max_artists_200=0x7f0900dc; public static final int settings_max_artists_200=0x7f0900df;
public static final int settings_max_artists_25=0x7f0900d8; public static final int settings_max_artists_25=0x7f0900db;
public static final int settings_max_artists_5=0x7f0900d6; public static final int settings_max_artists_5=0x7f0900d9;
public static final int settings_max_artists_50=0x7f0900d9; public static final int settings_max_artists_50=0x7f0900dc;
public static final int settings_max_artists_500=0x7f0900dd; public static final int settings_max_artists_500=0x7f0900e0;
public static final int settings_max_artists_75=0x7f0900da; public static final int settings_max_artists_75=0x7f0900dd;
public static final int settings_max_artists_summary=0x7f0900d5; public static final int settings_max_artists_summary=0x7f0900d8;
public static final int settings_max_bitrate_112=0x7f090086; public static final int settings_max_bitrate_112=0x7f090089;
public static final int settings_max_bitrate_128=0x7f090087; public static final int settings_max_bitrate_128=0x7f09008a;
public static final int settings_max_bitrate_160=0x7f090088; public static final int settings_max_bitrate_160=0x7f09008b;
public static final int settings_max_bitrate_192=0x7f090089; public static final int settings_max_bitrate_192=0x7f09008c;
public static final int settings_max_bitrate_256=0x7f09008a; public static final int settings_max_bitrate_256=0x7f09008d;
public static final int settings_max_bitrate_32=0x7f090082; public static final int settings_max_bitrate_32=0x7f090085;
public static final int settings_max_bitrate_320=0x7f09008b; public static final int settings_max_bitrate_320=0x7f09008e;
public static final int settings_max_bitrate_64=0x7f090083; public static final int settings_max_bitrate_64=0x7f090086;
public static final int settings_max_bitrate_80=0x7f090084; public static final int settings_max_bitrate_80=0x7f090087;
public static final int settings_max_bitrate_96=0x7f090085; public static final int settings_max_bitrate_96=0x7f090088;
public static final int settings_max_bitrate_mobile=0x7f090081; public static final int settings_max_bitrate_mobile=0x7f090084;
public static final int settings_max_bitrate_unlimited=0x7f09008c; public static final int settings_max_bitrate_unlimited=0x7f09008f;
public static final int settings_max_bitrate_wifi=0x7f090080; public static final int settings_max_bitrate_wifi=0x7f090083;
public static final int settings_max_songs=0x7f0900ca; public static final int settings_max_songs=0x7f0900cd;
public static final int settings_max_songs_10=0x7f0900cd; public static final int settings_max_songs_10=0x7f0900d0;
public static final int settings_max_songs_100=0x7f0900d1; public static final int settings_max_songs_100=0x7f0900d4;
public static final int settings_max_songs_200=0x7f0900d2; public static final int settings_max_songs_200=0x7f0900d5;
public static final int settings_max_songs_25=0x7f0900ce; public static final int settings_max_songs_25=0x7f0900d1;
public static final int settings_max_songs_5=0x7f0900cc; public static final int settings_max_songs_5=0x7f0900cf;
public static final int settings_max_songs_50=0x7f0900cf; public static final int settings_max_songs_50=0x7f0900d2;
public static final int settings_max_songs_500=0x7f0900d3; public static final int settings_max_songs_500=0x7f0900d6;
public static final int settings_max_songs_75=0x7f0900d0; public static final int settings_max_songs_75=0x7f0900d3;
public static final int settings_max_songs_summary=0x7f0900cb; public static final int settings_max_songs_summary=0x7f0900ce;
public static final int settings_media_button_summary=0x7f0900a8; public static final int settings_media_button_summary=0x7f0900ab;
public static final int settings_media_button_title=0x7f0900a7; public static final int settings_media_button_title=0x7f0900aa;
public static final int settings_network_timeout=0x7f0900ac; public static final int settings_network_timeout=0x7f0900af;
public static final int settings_network_timeout_105000=0x7f0900bb; public static final int settings_network_timeout_105000=0x7f0900be;
public static final int settings_network_timeout_120000=0x7f0900bc; public static final int settings_network_timeout_120000=0x7f0900bf;
public static final int settings_network_timeout_15000=0x7f0900b5; public static final int settings_network_timeout_15000=0x7f0900b8;
public static final int settings_network_timeout_30000=0x7f0900b6; public static final int settings_network_timeout_30000=0x7f0900b9;
public static final int settings_network_timeout_45000=0x7f0900b7; public static final int settings_network_timeout_45000=0x7f0900ba;
public static final int settings_network_timeout_60000=0x7f0900b8; public static final int settings_network_timeout_60000=0x7f0900bb;
public static final int settings_network_timeout_75000=0x7f0900b9; public static final int settings_network_timeout_75000=0x7f0900bc;
public static final int settings_network_timeout_90000=0x7f0900ba; public static final int settings_network_timeout_90000=0x7f0900bd;
public static final int settings_network_title=0x7f09007f; public static final int settings_network_title=0x7f090082;
public static final int settings_other_title=0x7f0900a0; public static final int settings_other_title=0x7f0900a3;
public static final int settings_preload=0x7f09006f; public static final int settings_preload=0x7f090072;
public static final int settings_preload_1=0x7f09008f; public static final int settings_preload_1=0x7f090092;
public static final int settings_preload_10=0x7f090093; public static final int settings_preload_10=0x7f090096;
public static final int settings_preload_2=0x7f090090; public static final int settings_preload_2=0x7f090093;
public static final int settings_preload_3=0x7f090091; public static final int settings_preload_3=0x7f090094;
public static final int settings_preload_5=0x7f090092; public static final int settings_preload_5=0x7f090095;
public static final int settings_preload_unlimited=0x7f090094; public static final int settings_preload_unlimited=0x7f090097;
public static final int settings_screen_lit_summary=0x7f0900aa; public static final int settings_screen_lit_summary=0x7f0900ad;
public static final int settings_screen_lit_title=0x7f0900a9; public static final int settings_screen_lit_title=0x7f0900ac;
public static final int settings_scrobble_summary=0x7f0900a3; public static final int settings_scrobble_summary=0x7f0900a6;
public static final int settings_scrobble_title=0x7f0900a2; public static final int settings_scrobble_title=0x7f0900a5;
public static final int settings_search_history_cleared=0x7f09009f; public static final int settings_search_history_cleared=0x7f0900a2;
public static final int settings_search_title=0x7f0900a1; public static final int settings_search_title=0x7f0900a4;
public static final int settings_server_address=0x7f09006b; public static final int settings_server_address=0x7f09006e;
public static final int settings_server_name=0x7f09006a; public static final int settings_server_name=0x7f09006d;
public static final int settings_server_password=0x7f09006d; public static final int settings_server_password=0x7f090070;
public static final int settings_server_unused1=0x7f090068; public static final int settings_server_unused1=0x7f09006b;
public static final int settings_server_unused2=0x7f090069; public static final int settings_server_unused2=0x7f09006c;
public static final int settings_server_username=0x7f09006c; public static final int settings_server_username=0x7f09006f;
public static final int settings_servers_title=0x7f090067; public static final int settings_servers_title=0x7f09006a;
public static final int settings_show_notification=0x7f0900bd; public static final int settings_show_notification=0x7f0900c0;
public static final int settings_show_notification_summary=0x7f0900be; public static final int settings_show_notification_summary=0x7f0900c1;
public static final int settings_test_connection_title=0x7f090066; public static final int settings_test_connection_title=0x7f090069;
public static final int settings_testing_connection=0x7f090073; public static final int settings_testing_connection=0x7f090076;
public static final int settings_testing_ok=0x7f090074; public static final int settings_testing_ok=0x7f090077;
public static final int settings_testing_unlicensed=0x7f090075; public static final int settings_testing_unlicensed=0x7f090078;
public static final int settings_theme_dark=0x7f09007e; public static final int settings_theme_dark=0x7f090081;
public static final int settings_theme_fullscreen=0x7f09007b; public static final int settings_theme_fullscreen=0x7f09007e;
public static final int settings_theme_fullscreenlight=0x7f09007c; public static final int settings_theme_fullscreenlight=0x7f09007f;
public static final int settings_theme_light=0x7f09007d; public static final int settings_theme_light=0x7f090080;
public static final int settings_theme_title=0x7f09007a; public static final int settings_theme_title=0x7f09007d;
public static final int settings_theme_wheat=0x7f0900fa; public static final int settings_theme_wheat=0x7f0900fd;
public static final int settings_title=0x7f090065; public static final int settings_title=0x7f090068;
public static final int settings_wifi_required_summary=0x7f09008e; public static final int settings_wifi_required_summary=0x7f090091;
public static final int settings_wifi_required_title=0x7f09008d; public static final int settings_wifi_required_title=0x7f090090;
public static final int song_details_all=0x7f090061; public static final int song_details_all=0x7f090064;
public static final int song_details_kbps=0x7f090062; public static final int song_details_kbps=0x7f090065;
public static final int util_bytes_format_byte=0x7f0900f9; public static final int util_bytes_format_byte=0x7f0900fc;
public static final int util_bytes_format_gigabyte=0x7f0900f6; public static final int util_bytes_format_gigabyte=0x7f0900f9;
public static final int util_bytes_format_kilobyte=0x7f0900f8; public static final int util_bytes_format_kilobyte=0x7f0900fb;
public static final int util_bytes_format_megabyte=0x7f0900f7; public static final int util_bytes_format_megabyte=0x7f0900fa;
public static final int widget_initial_text=0x7f0900f3; public static final int widget_initial_text=0x7f0900f6;
public static final int widget_sdcard_busy=0x7f0900f4; public static final int widget_sdcard_busy=0x7f0900f7;
public static final int widget_sdcard_missing=0x7f0900f5; public static final int widget_sdcard_missing=0x7f0900f8;
} }
public static final class style { public static final class style {
public static final int Dark=0x7f0b0000; public static final int Dark=0x7f0b0000;

63
res/layout-land/download.xml
View File

@ -13,6 +13,14 @@
a:layout_height="wrap_content" a:layout_alignParentTop="true" a:layout_height="wrap_content" a:layout_alignParentTop="true"
a:layout_alignParentLeft="true"> a:layout_alignParentLeft="true">
<ImageButton a:id="@+id/download_shuffle" a:src="@drawable/media_shuffle_normal"
a:background="@android:color/transparent" a:padding="0dip"
a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center_vertical" />
<ImageButton a:id="@+id/download_repeat" a:src="@drawable/media_repeat_off"
a:background="@android:color/transparent" a:padding="0dip"
a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center_vertical" />
<ImageButton a:id="@+id/download_previous" a:src="@drawable/media_backward_normal" <ImageButton a:id="@+id/download_previous" a:src="@drawable/media_backward_normal"
a:background="@android:color/transparent" a:padding="0dip" a:background="@android:color/transparent" a:padding="0dip"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_width="wrap_content" a:layout_height="wrap_content"
@ -33,6 +41,10 @@
a:background="@android:color/transparent" a:padding="0dip" a:background="@android:color/transparent" a:padding="0dip"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center_vertical" /> a:layout_gravity="center_vertical" />
<ImageButton a:id="@+id/download_toggle_list" a:src="@drawable/media_toggle_list_normal"
a:background="@android:color/transparent" a:padding="0dip"
a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>
<TextView a:id="@+id/download_status" a:layout_width="wrap_content" <TextView a:id="@+id/download_status" a:layout_width="wrap_content"
@ -44,50 +56,10 @@
<TextView a:id="@+id/download_song_title" a:layout_width="150dip" <TextView a:id="@+id/download_song_title" a:layout_width="150dip"
a:layout_height="wrap_content" a:layout_gravity="center_horizontal" a:layout_height="wrap_content" a:layout_gravity="center_horizontal"
a:layout_above="@+id/download_status" a:layout_centerHorizontal="true" a:layout_above="@+id/download_status" a:layout_centerHorizontal="true"
a:layout_marginLeft="12dip" a:layout_marginRight="12dip" a:maxLines="2" a:layout_marginLeft="12dip" a:layout_marginRight="12dip" a:layout_marginTop="12dip" a:maxLines="2"
a:ellipsize="end" a:gravity="center_horizontal" a:textAppearance="?android:attr/textAppearanceMedium" a:ellipsize="end" a:gravity="center_horizontal" a:textAppearance="?android:attr/textAppearanceMedium"
a:textColor="@color/mediaControlForeground" /> a:textColor="@color/mediaControlForeground" />
<LinearLayout a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_centerHorizontal="true"
a:layout_centerVertical="true" a:orientation="horizontal">
<ImageButton a:id="@+id/download_shuffle"
a:layout_width="0dp" a:layout_height="wrap_content"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:src="@drawable/media_shuffle_normal" />
<ImageButton a:id="@+id/download_repeat" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_weight="1"
a:background="@android:color/transparent" a:padding="9dip"
a:src="@drawable/media_repeat_off" />
<Button a:id="@+id/download_equalizer" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_marginBottom="4dip"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="EQ" a:textSize="22sp" a:textStyle="bold" />
<Button a:id="@+id/download_jukebox" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_marginBottom="4dip"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="RC" a:textSize="22sp" a:textStyle="bold" />
<Button a:id="@+id/download_visualizer" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_marginBottom="4dip"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="VIS" a:textSize="22sp" a:textStyle="bold" />
<ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:padding="9dip"
a:src="@drawable/ic_menu_moreoverflow" />
<ImageButton a:id="@+id/download_toggle_list"
a:layout_width="0dp" a:layout_height="match_parent"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:src="@drawable/media_toggle_list_normal" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<net.sourceforge.subsonic.androidapp.util.MyViewFlipper <net.sourceforge.subsonic.androidapp.util.MyViewFlipper
@ -95,12 +67,13 @@
a:layout_height="fill_parent" a:layout_alignParentLeft="true" a:layout_height="fill_parent" a:layout_alignParentLeft="true"
a:layout_toLeftOf="@+id/download_control_layout"> a:layout_toLeftOf="@+id/download_control_layout">
<FrameLayout a:id="@+id/download_album_art_layout" <FrameLayout a:id="@+id/download_album_art_layout" a:layout_width="fill_parent" a:layout_height="fill_parent"
a:layout_width="fill_parent" a:layout_height="fill_parent" a:background="@color/black">
a:background="@drawable/album_art_background">
<ImageView a:id="@+id/download_album_art_image" <ImageView a:id="@+id/download_album_art_image"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center" a:layout_marginTop="20dip" a:scaleType="fitCenter" /> a:layout_gravity="center" a:layout_marginTop="0dip" a:scaleType="fitCenter" />
<LinearLayout a:id="@+id/download_visualizer_view_layout" <LinearLayout a:id="@+id/download_visualizer_view_layout"
a:layout_width="fill_parent" a:layout_height="60dip" a:layout_width="fill_parent" a:layout_height="60dip"
a:layout_marginLeft="60dip" a:layout_marginRight="60dip" a:layout_marginLeft="60dip" a:layout_marginRight="60dip"

76
res/layout-port/download.xml
View File

@ -11,68 +11,15 @@
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:layout_weight="1" a:layout_weight="1"
a:background="@drawable/album_art_background"
a:gravity="left" a:gravity="left"
a:orientation="vertical" > a:orientation="vertical"
a:background="@color/black"
<ImageButton >
a:id="@+id/download_repeat"
a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|right"
a:layout_alignParentLeft="true"
a:background="@color/transparent"
a:paddingBottom="12dip"
a:paddingLeft="12dip"
a:paddingTop="24dip"
a:src="@drawable/media_repeat_off" />
<Button
a:id="@+id/download_jukebox"
a:text="RC"
a:textStyle="bold"
a:textSize="22sp"
a:background="@android:color/transparent"
a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|left"
a:layout_alignParentLeft="true"
a:layout_below="@+id/download_repeat"
a:paddingTop="12dip"
a:paddingLeft="12dip"
a:paddingBottom="15dip" />
<Button a:id="@+id/download_equalizer"
a:text="EQ"
a:textStyle="bold"
a:textSize="22sp"
a:background="@android:color/transparent"
a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|right"
a:layout_alignParentRight="true"
a:paddingTop="24dip"
a:paddingRight="0dip"
a:paddingBottom="12dip" />
<Button a:id="@+id/download_visualizer"
a:text="VIS"
a:textStyle="bold"
a:textSize="22sp"
a:background="@android:color/transparent"
a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|right"
a:layout_alignParentRight="true"
a:layout_below="@+id/download_equalizer"
a:paddingTop="12dip"
a:paddingRight="12dip"
a:paddingBottom="12dip" />
<ImageView a:id="@+id/download_album_art_image" <ImageView a:id="@+id/download_album_art_image"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_centerHorizontal="true" a:layout_alignParentTop="true" a:layout_centerHorizontal="true" a:layout_alignParentTop="true"
a:layout_marginTop="24dip" a:scaleType="fitCenter" /> a:layout_marginTop="0dip" a:scaleType="fitCenter" />
<TextView a:id="@+id/download_status" a:layout_width="wrap_content" <TextView a:id="@+id/download_status" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_alignParentBottom="true" a:layout_height="wrap_content" a:layout_alignParentBottom="true"
@ -82,7 +29,7 @@
<TextView a:id="@+id/download_song_title" a:layout_width="wrap_content" <TextView a:id="@+id/download_song_title" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_gravity="center_horizontal" a:layout_height="wrap_content" a:layout_gravity="center_horizontal"
a:layout_above="@+id/download_status" a:layout_centerHorizontal="true" a:layout_above="@+id/download_status" a:layout_centerHorizontal="true"
a:layout_marginLeft="16dip" a:layout_marginRight="16dip" a:layout_marginLeft="16dip" a:layout_marginRight="16dip" a:layout_marginTop="16dip"
a:singleLine="true" a:textColor="@color/mediaControlForeground" a:singleLine="true" a:textColor="@color/mediaControlForeground"
a:textStyle="bold" a:textSize="18sp" a:ellipsize="end" /> a:textStyle="bold" a:textSize="18sp" a:ellipsize="end" />
@ -101,10 +48,16 @@
a:layout_height="wrap_content" a:layout_marginTop="0dip" a:layout_height="wrap_content" a:layout_marginTop="0dip"
a:background="@color/mediaControlBackground" a:orientation="horizontal" a:background="@color/mediaControlBackground" a:orientation="horizontal"
a:paddingBottom="0dip" a:paddingTop="0dip"> a:paddingBottom="0dip" a:paddingTop="0dip">
<ImageButton a:id="@+id/download_shuffle" a:layout_width="0dip" <ImageButton a:id="@+id/download_shuffle" a:layout_width="0dip"
a:layout_height="fill_parent" a:layout_gravity="center_vertical|left" a:layout_height="fill_parent" a:layout_gravity="center_vertical|left"
a:layout_weight="1" a:background="@drawable/list_selector_holo_dark" a:layout_weight="1" a:background="@drawable/list_selector_holo_dark"
a:paddingLeft="4dip" a:src="@drawable/media_shuffle_normal" /> a:paddingLeft="4dip" a:src="@drawable/media_shuffle_normal" />
<ImageButton a:id="@+id/download_repeat" a:layout_width="0dip"
a:layout_height="fill_parent" a:layout_gravity="center_vertical|left"
a:layout_weight="1" a:background="@drawable/list_selector_holo_dark"
a:paddingLeft="4dip" a:src="@drawable/media_repeat_off" />
<ImageButton a:id="@+id/download_previous" a:layout_width="0dp" <ImageButton a:id="@+id/download_previous" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_gravity="center_vertical" a:layout_height="match_parent" a:layout_gravity="center_vertical"
@ -130,16 +83,11 @@
a:layout_height="match_parent" a:layout_gravity="center_vertical" a:layout_height="match_parent" a:layout_gravity="center_vertical"
a:layout_weight="1" a:background="@drawable/list_selector_holo_dark" a:layout_weight="1" a:background="@drawable/list_selector_holo_dark"
a:padding="0dip" a:src="@drawable/media_forward_normal" /> a:padding="0dip" a:src="@drawable/media_forward_normal" />
<ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:paddingBottom="12dip"
a:paddingLeft="8dip" a:paddingTop="12dip" a:src="@drawable/ic_menu_moreoverflow" />
<ImageButton a:id="@+id/download_toggle_list" <ImageButton a:id="@+id/download_toggle_list"
a:layout_width="0dip" a:layout_height="fill_parent" a:layout_weight="1" a:layout_width="0dip" a:layout_height="fill_parent" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:paddingRight="4dip" a:background="@drawable/list_selector_holo_dark" a:paddingRight="4dip"
a:src="@drawable/media_toggle_list_normal" /> a:src="@drawable/media_toggle_list_normal" a:paddingTop="12dip" a:paddingBottom="12dip" />
</LinearLayout> </LinearLayout>
<include layout="@layout/download_slider" /> <include layout="@layout/download_slider" />

63
res/menu/nowplaying.xml
View File

@ -1,27 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:a="http://schemas.android.com/apk/res/android"> <menu xmlns:a="http://schemas.android.com/apk/res/android">
<item <item
a:id="@+id/ic_menu_shuffle" a:id="@+id/download_equalizer"
a:icon="@drawable/ic_menu_shuffle" a:title="@string/download.menu_equalizer"
a:title="@string/download.menu_shuffle" />
/>
<item
<item a:id="@+id/download_visualizer"
a:id="@+id/menu_save_playlist" a:title="@string/download.menu_visualizer"
a:icon="@drawable/ic_menu_save" />
a:title="@string/download.menu_save"
/> <item
a:id="@+id/download_jukebox"
<item a:title="@string/download.menu_jukebox"
a:id="@+id/menu_remove_all" />
a:icon="@drawable/ic_menu_remove_all"
a:title="@string/download.menu_remove_all" <item
/> a:id="@+id/menu_save_playlist"
a:icon="@drawable/ic_menu_save"
<item a:title="@string/download.menu_save"
a:id="@+id/menu_screen_on_off" />
a:icon="@drawable/ic_menu_screen_on_off"
a:title="@string/download.menu_screen_on" <item
/> a:id="@+id/menu_remove_all"
</menu> a:icon="@drawable/ic_menu_remove_all"
a:title="@string/download.menu_remove_all"
/>
<item
a:id="@+id/menu_screen_on_off"
a:icon="@drawable/ic_menu_screen_on_off"
a:title="@string/download.menu_screen_on"
/>
</menu>

3
res/values/strings.xml
View File

@ -95,6 +95,9 @@
<string name="download.menu_screen_off">Screen off</string> <string name="download.menu_screen_off">Screen off</string>
<string name="download.menu_shuffle">Shuffle</string> <string name="download.menu_shuffle">Shuffle</string>
<string name="download.menu_save">Save playlist</string> <string name="download.menu_save">Save playlist</string>
<string name="download.menu_equalizer">Equalizer</string>
<string name="download.menu_visualizer">Visualizer</string>
<string name="download.menu_jukebox">Jukebox</string>
<string name="download.menu_shuffle_notification">Playlist was shuffled</string> <string name="download.menu_shuffle_notification">Playlist was shuffled</string>
<string name="download.playlist_title">Save playlist</string> <string name="download.playlist_title">Save playlist</string>
<string name="download.playlist_name">Enter the playlist name:</string> <string name="download.playlist_name">Enter the playlist name:</string>

123
src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java
View File

@ -32,7 +32,6 @@ import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.view.ContextMenu; import android.view.ContextMenu;
@ -50,7 +49,6 @@ import android.view.WindowManager;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
@ -79,9 +77,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
private static final int DIALOG_SAVE_PLAYLIST = 100; private static final int DIALOG_SAVE_PLAYLIST = 100;
private static final int PERCENTAGE_OF_SCREEN_FOR_SWIPE = 5; private static final int PERCENTAGE_OF_SCREEN_FOR_SWIPE = 5;
private static final int COLOR_BUTTON_ENABLED = Color.rgb(0, 153, 204);
private static final int COLOR_BUTTON_DISABLED = Color.rgb(164, 166, 158);
private ViewFlipper playlistFlipper; private ViewFlipper playlistFlipper;
private ViewFlipper buttonBarFlipper; private ViewFlipper buttonBarFlipper;
private TextView emptyTextView; private TextView emptyTextView;
@ -101,9 +97,9 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
private View startButton; private View startButton;
private View shuffleButton; private View shuffleButton;
private ImageButton repeatButton; private ImageButton repeatButton;
private Button equalizerButton; private MenuItem equalizerMenuItem;
private Button visualizerButton; private MenuItem visualizerMenuItem;
private Button jukeboxButton; private MenuItem jukeboxMenuItem;
private View toggleListButton; private View toggleListButton;
private ScheduledExecutorService executorService; private ScheduledExecutorService executorService;
private DownloadFile currentPlaying; private DownloadFile currentPlaying;
@ -113,7 +109,9 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
private int swipeDistance; private int swipeDistance;
private int swipeVelocity; private int swipeVelocity;
private VisualizerView visualizerView; private VisualizerView visualizerView;
private boolean visualizerAvailable;
private boolean equalizerAvailable;
/** /**
* Called when the activity is first created. * Called when the activity is first created.
*/ */
@ -147,9 +145,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
startButton = findViewById(R.id.download_start); startButton = findViewById(R.id.download_start);
shuffleButton = findViewById(R.id.download_shuffle); shuffleButton = findViewById(R.id.download_shuffle);
repeatButton = (ImageButton) findViewById(R.id.download_repeat); repeatButton = (ImageButton) findViewById(R.id.download_repeat);
equalizerButton = (Button) findViewById(R.id.download_equalizer);
visualizerButton = (Button) findViewById(R.id.download_visualizer);
jukeboxButton = (Button) findViewById(R.id.download_jukebox);
LinearLayout visualizerViewLayout = (LinearLayout) findViewById(R.id.download_visualizer_view_layout); LinearLayout visualizerViewLayout = (LinearLayout) findViewById(R.id.download_visualizer_view_layout);
toggleListButton = findViewById(R.id.download_toggle_list); toggleListButton = findViewById(R.id.download_toggle_list);
@ -165,9 +160,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
pauseButton.setOnTouchListener(touchListener); pauseButton.setOnTouchListener(touchListener);
stopButton.setOnTouchListener(touchListener); stopButton.setOnTouchListener(touchListener);
startButton.setOnTouchListener(touchListener); startButton.setOnTouchListener(touchListener);
equalizerButton.setOnTouchListener(touchListener);
visualizerButton.setOnTouchListener(touchListener);
jukeboxButton.setOnTouchListener(touchListener);
buttonBarFlipper.setOnTouchListener(touchListener); buttonBarFlipper.setOnTouchListener(touchListener);
emptyTextView.setOnTouchListener(touchListener); emptyTextView.setOnTouchListener(touchListener);
albumArtImageView.setOnTouchListener(touchListener); albumArtImageView.setOnTouchListener(touchListener);
@ -237,16 +229,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
} }
}); });
// Button: menu
ImageButton actionMenuButton = (ImageButton)findViewById(R.id.menu_selector);
actionMenuButton.setImageResource(R.drawable.ic_menu_moreoverflow);
actionMenuButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openOptionsMenu();
}
});
repeatButton.setOnClickListener(new View.OnClickListener() { repeatButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -269,34 +251,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
} }
}); });
equalizerButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(DownloadActivity.this, EqualizerActivity.class));
}
});
visualizerButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
boolean active = !visualizerView.isActive();
visualizerView.setActive(active);
getDownloadService().setShowVisualization(visualizerView.isActive());
updateButtons();
Util.toast(DownloadActivity.this, active ? R.string.download_visualizer_on : R.string.download_visualizer_off);
}
});
jukeboxButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
boolean jukeboxEnabled = !getDownloadService().isJukeboxEnabled();
getDownloadService().setJukeboxEnabled(jukeboxEnabled);
updateButtons();
Util.toast(DownloadActivity.this, jukeboxEnabled ? R.string.download_jukebox_on : R.string.download_jukebox_off, false);
}
});
toggleListButton.setOnClickListener(new View.OnClickListener() { toggleListButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -333,15 +287,11 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
downloadService.setShufflePlayEnabled(true); downloadService.setShufflePlayEnabled(true);
} }
boolean visualizerAvailable = downloadService != null && downloadService.getVisualizerController() != null; visualizerAvailable = downloadService != null && downloadService.getVisualizerController() != null;
boolean equalizerAvailable = downloadService != null && downloadService.getEqualizerController() != null; equalizerAvailable = downloadService != null && downloadService.getEqualizerController() != null;
if (!equalizerAvailable) {
equalizerButton.setVisibility(View.GONE); if (visualizerAvailable) {
}
if (!visualizerAvailable) {
visualizerButton.setVisibility(View.GONE);
} else {
visualizerView = new VisualizerView(this); visualizerView = new VisualizerView(this);
visualizerViewLayout.addView(visualizerView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)); visualizerViewLayout.addView(visualizerView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@ -355,12 +305,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
} }
}); });
} }
// TODO: Extract to utility method and cache.
Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Regular.ttf");
equalizerButton.setTypeface(typeface);
visualizerButton.setTypeface(typeface);
jukeboxButton.setTypeface(typeface);
} }
@Override @Override
@ -407,16 +351,22 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
} }
private void updateButtons() { private void updateButtons() {
boolean eqEnabled = getDownloadService() != null && getDownloadService().getEqualizerController() != null && boolean eqEnabled = getDownloadService() != null && getDownloadService().getEqualizerController() != null && getDownloadService().getEqualizerController().isEnabled();
getDownloadService().getEqualizerController().isEnabled();
equalizerButton.setTextColor(eqEnabled ? COLOR_BUTTON_ENABLED : COLOR_BUTTON_DISABLED); if (equalizerMenuItem != null) {
equalizerMenuItem.setEnabled(eqEnabled);
}
if (visualizerView != null) { if (visualizerView != null) {
visualizerButton.setTextColor(visualizerView.isActive() ? COLOR_BUTTON_ENABLED : COLOR_BUTTON_DISABLED); if (visualizerMenuItem != null) {
visualizerMenuItem.setEnabled(visualizerView.isActive());
}
} }
boolean jukeboxEnabled = getDownloadService() != null && getDownloadService().isJukeboxEnabled(); boolean jukeboxEnabled = getDownloadService() != null && getDownloadService().isJukeboxEnabled();
jukeboxButton.setTextColor(jukeboxEnabled ? COLOR_BUTTON_ENABLED : COLOR_BUTTON_DISABLED); if (jukeboxMenuItem != null) {
jukeboxMenuItem.setEnabled(jukeboxEnabled);
}
} }
// Scroll to current playing/downloading. // Scroll to current playing/downloading.
@ -481,7 +431,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
return super.onCreateDialog(id); return super.onCreateDialog(id);
} }
} }
@Override @Override
protected void onPrepareDialog(int id, Dialog dialog) { protected void onPrepareDialog(int id, Dialog dialog) {
if (id == DIALOG_SAVE_PLAYLIST) { if (id == DIALOG_SAVE_PLAYLIST) {
@ -510,6 +460,14 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
savePlaylist.setEnabled(savePlaylistEnabled); savePlaylist.setEnabled(savePlaylistEnabled);
savePlaylist.setVisible(savePlaylistEnabled); savePlaylist.setVisible(savePlaylistEnabled);
MenuItem screenOption = menu.findItem(R.id.menu_screen_on_off); MenuItem screenOption = menu.findItem(R.id.menu_screen_on_off);
equalizerMenuItem = menu.findItem(R.id.download_equalizer);
visualizerMenuItem = menu.findItem(R.id.download_visualizer);
jukeboxMenuItem = menu.findItem(R.id.download_jukebox);
equalizerMenuItem.setEnabled(equalizerAvailable);
equalizerMenuItem.setVisible(equalizerAvailable);
visualizerMenuItem.setEnabled(visualizerAvailable);
visualizerMenuItem.setVisible(visualizerAvailable);
DownloadService downloadService = getDownloadService(); DownloadService downloadService = getDownloadService();
@ -594,6 +552,22 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
case R.id.menu_save_playlist: case R.id.menu_save_playlist:
showDialog(DIALOG_SAVE_PLAYLIST); showDialog(DIALOG_SAVE_PLAYLIST);
return true; return true;
case R.id.download_equalizer:
startActivity(new Intent(DownloadActivity.this, EqualizerActivity.class));
return true;
case R.id.download_visualizer:
boolean active = !visualizerView.isActive();
visualizerView.setActive(active);
getDownloadService().setShowVisualization(visualizerView.isActive());
updateButtons();
Util.toast(DownloadActivity.this, active ? R.string.download_visualizer_on : R.string.download_visualizer_off);
return true;
case R.id.download_jukebox:
boolean jukeboxEnabled = !getDownloadService().isJukeboxEnabled();
getDownloadService().setJukeboxEnabled(jukeboxEnabled);
updateButtons();
Util.toast(DownloadActivity.this, jukeboxEnabled ? R.string.download_jukebox_on : R.string.download_jukebox_off, false);
return true;
default: default:
return false; return false;
} }
@ -792,7 +766,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
break; break;
} }
jukeboxButton.setTextColor(getDownloadService().isJukeboxEnabled() ? COLOR_BUTTON_ENABLED : COLOR_BUTTON_DISABLED); if (jukeboxMenuItem != null)
jukeboxMenuItem.setEnabled(getDownloadService().isJukeboxEnabled());
} }
private class SongListAdapter extends ArrayAdapter<DownloadFile> { private class SongListAdapter extends ArrayAdapter<DownloadFile> {

7
src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java
View File

@ -717,9 +717,10 @@ public class DownloadServiceImpl extends Service implements DownloadService {
try { try {
String artist = currentPlaying.getSong().getArtist(); //String artist = currentPlaying.getSong().getArtist();
//String album = currentPlaying.getSong().getAlbum();
String album = currentPlaying.getSong().getAlbum(); String album = currentPlaying.getSong().getAlbum();
String title = currentPlaying.getSong().getTitle(); String title = currentPlaying.getSong().getArtist() + " - " + currentPlaying.getSong().getTitle();
Integer duration = currentPlaying.getSong().getDuration(); Integer duration = currentPlaying.getSong().getDuration();
MusicService musicService = MusicServiceFactory.getMusicService(this); MusicService musicService = MusicServiceFactory.getMusicService(this);
@ -729,7 +730,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
// Update the remote controls // Update the remote controls
remoteControlClientCompat.editMetadata(true) remoteControlClientCompat.editMetadata(true)
.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, artist) //.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, artist)
.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, title) .putString(MediaMetadataRetriever.METADATA_KEY_TITLE, title)
.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, album) .putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, album)
.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration) .putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration)

8
src/net/sourceforge/subsonic/androidapp/util/ImageLoader.java
View File

@ -35,6 +35,7 @@ import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import net.sourceforge.subsonic.androidapp.R; import net.sourceforge.subsonic.androidapp.R;
import net.sourceforge.subsonic.androidapp.activity.DownloadActivity;
import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
import net.sourceforge.subsonic.androidapp.service.MusicService; import net.sourceforge.subsonic.androidapp.service.MusicService;
import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory; import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
@ -66,7 +67,8 @@ public class ImageLoader implements Runnable {
// Determine the density-dependent image sizes. // Determine the density-dependent image sizes.
imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight(); imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight();
DisplayMetrics metrics = context.getResources().getDisplayMetrics(); DisplayMetrics metrics = context.getResources().getDisplayMetrics();
imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels) * 0.6); //imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels) * 0.6);
imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels));
for (int i = 0; i < CONCURRENCY; i++) { for (int i = 0; i < CONCURRENCY; i++) {
new Thread(this, "ImageLoader").start(); new Thread(this, "ImageLoader").start();
@ -78,7 +80,7 @@ public class ImageLoader implements Runnable {
private void createLargeUnknownImage(Context context) { private void createLargeUnknownImage(Context context) {
BitmapDrawable drawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.unknown_album_large); BitmapDrawable drawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.unknown_album_large);
Bitmap bitmap = Bitmap.createScaledBitmap(drawable.getBitmap(), imageSizeLarge, imageSizeLarge, true); Bitmap bitmap = Bitmap.createScaledBitmap(drawable.getBitmap(), imageSizeLarge, imageSizeLarge, true);
bitmap = createReflection(bitmap); //bitmap = createReflection(bitmap);
largeUnknownImage = Util.createDrawableFromBitmap(context, bitmap); largeUnknownImage = Util.createDrawableFromBitmap(context, bitmap);
} }
@ -232,7 +234,7 @@ public class ImageLoader implements Runnable {
Bitmap bitmap = musicService.getCoverArt(view.getContext(), entry, size, saveToFile, null); Bitmap bitmap = musicService.getCoverArt(view.getContext(), entry, size, saveToFile, null);
if (reflection) { if (reflection) {
bitmap = createReflection(bitmap); //bitmap = createReflection(bitmap);
} }
final Drawable drawable = Util.createDrawableFromBitmap(view.getContext(), bitmap); final Drawable drawable = Util.createDrawableFromBitmap(view.getContext(), bitmap);