diff --git a/bin/MainActivity.apk b/bin/MainActivity.apk index 50dbae64..6c544d0b 100644 Binary files a/bin/MainActivity.apk and b/bin/MainActivity.apk differ diff --git a/bin/classes.dex b/bin/classes.dex index a27c7bf8..994a1e97 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class index dedb2f4c..42da782d 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class index 96c88677..ce936756 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class index a31f447a..0591e3bd 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class index e0dea787..d57d707d 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class index 9c6f62a1..450e3577 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class index 860578b5..0cc10555 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class index cf7f6dd3..831b8ddb 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class index aae615bc..8a53d3aa 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class index 2ecff414..737f347e 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class index fa3cf138..3821dc0c 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class index 8cae997e..68bba88c 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class index 50a3c9ba..a3d66a5b 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class index fc2e59d0..538f1b2f 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class index 852bf107..0d2f5639 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class b/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class index 457d545f..cfe12b41 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class and b/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class index 785140cf..6a0c0179 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/ImageLoader.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/ImageLoader.class index 71f3ff9b..a34b6e9e 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/ImageLoader.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/ImageLoader.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class index 5fb90d71..afbff0db 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class differ diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class index 8efd6068..1b50fd89 100644 Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class differ diff --git a/bin/res/drawable-hdpi/action_shuffle.png b/bin/res/drawable-hdpi/action_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/bin/res/drawable-hdpi/action_shuffle.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/actionbar_button_normal.9.png b/bin/res/drawable-hdpi/actionbar_button_normal.9.png deleted file mode 100644 index 36bfb306..00000000 Binary files a/bin/res/drawable-hdpi/actionbar_button_normal.9.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/actionbar_shadow.9.png b/bin/res/drawable-hdpi/actionbar_shadow.9.png deleted file mode 100644 index 7496c349..00000000 Binary files a/bin/res/drawable-hdpi/actionbar_shadow.9.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/ic_launcher.png b/bin/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..0e95c2dc Binary files /dev/null and b/bin/res/drawable-hdpi/ic_launcher.png differ diff --git a/bin/res/drawable-hdpi/menu_browse.png b/bin/res/drawable-hdpi/ic_menu_browse.png similarity index 100% rename from bin/res/drawable-hdpi/menu_browse.png rename to bin/res/drawable-hdpi/ic_menu_browse.png diff --git a/bin/res/drawable-hdpi/menu_home.png b/bin/res/drawable-hdpi/ic_menu_home.png similarity index 100% rename from bin/res/drawable-hdpi/menu_home.png rename to bin/res/drawable-hdpi/ic_menu_home.png diff --git a/bin/res/drawable-hdpi/browse_offline.png b/bin/res/drawable-hdpi/ic_menu_offline.png similarity index 100% rename from bin/res/drawable-hdpi/browse_offline.png rename to bin/res/drawable-hdpi/ic_menu_offline.png diff --git a/bin/res/drawable-hdpi/action_play_all.png b/bin/res/drawable-hdpi/ic_menu_play_all.png similarity index 100% rename from bin/res/drawable-hdpi/action_play_all.png rename to bin/res/drawable-hdpi/ic_menu_play_all.png diff --git a/bin/res/drawable-hdpi/menu_playlists.png b/bin/res/drawable-hdpi/ic_menu_playlists.png similarity index 100% rename from bin/res/drawable-hdpi/menu_playlists.png rename to bin/res/drawable-hdpi/ic_menu_playlists.png diff --git a/bin/res/drawable-hdpi/ic_menu_recent_history.png b/bin/res/drawable-hdpi/ic_menu_recent_history.png deleted file mode 100644 index f6a05689..00000000 Binary files a/bin/res/drawable-hdpi/ic_menu_recent_history.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/action_refresh.png b/bin/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from bin/res/drawable-hdpi/action_refresh.png rename to bin/res/drawable-hdpi/ic_menu_refresh.png diff --git a/bin/res/drawable-hdpi/ic_menu_rotate.png b/bin/res/drawable-hdpi/ic_menu_rotate.png deleted file mode 100644 index 7dc80766..00000000 Binary files a/bin/res/drawable-hdpi/ic_menu_rotate.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/action_search.png b/bin/res/drawable-hdpi/ic_menu_search.png similarity index 100% rename from bin/res/drawable-hdpi/action_search.png rename to bin/res/drawable-hdpi/ic_menu_search.png diff --git a/bin/res/drawable-hdpi/main_select_server.png b/bin/res/drawable-hdpi/ic_menu_select_artist_folder.png similarity index 100% rename from bin/res/drawable-hdpi/main_select_server.png rename to bin/res/drawable-hdpi/ic_menu_select_artist_folder.png diff --git a/bin/res/drawable-hdpi/ic_menu_share.png b/bin/res/drawable-hdpi/ic_menu_share.png index 44378144..62c4002e 100644 Binary files a/bin/res/drawable-hdpi/ic_menu_share.png and b/bin/res/drawable-hdpi/ic_menu_share.png differ diff --git a/bin/res/drawable-hdpi/ic_menu_star.png b/bin/res/drawable-hdpi/ic_menu_star.png deleted file mode 100644 index c32be71e..00000000 Binary files a/bin/res/drawable-hdpi/ic_menu_star.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/downloaded.png b/bin/res/drawable-hdpi/ic_stat_downloaded.png similarity index 100% rename from bin/res/drawable-hdpi/downloaded.png rename to bin/res/drawable-hdpi/ic_stat_downloaded.png diff --git a/bin/res/drawable-hdpi/downloading.png b/bin/res/drawable-hdpi/ic_stat_downloading.png similarity index 100% rename from bin/res/drawable-hdpi/downloading.png rename to bin/res/drawable-hdpi/ic_stat_downloading.png diff --git a/bin/res/drawable-hdpi/saved.png b/bin/res/drawable-hdpi/ic_stat_saved.png similarity index 100% rename from bin/res/drawable-hdpi/saved.png rename to bin/res/drawable-hdpi/ic_stat_saved.png diff --git a/bin/res/drawable-hdpi/list_item_artist.9.png b/bin/res/drawable-hdpi/list_item_more.9.png similarity index 100% rename from bin/res/drawable-hdpi/list_item_artist.9.png rename to bin/res/drawable-hdpi/list_item_more.9.png diff --git a/bin/res/drawable-hdpi/list_item_playlist.9.png b/bin/res/drawable-hdpi/list_item_playlist.9.png deleted file mode 100644 index cbd9de79..00000000 Binary files a/bin/res/drawable-hdpi/list_item_playlist.9.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/main_exit.png b/bin/res/drawable-hdpi/main_exit.png deleted file mode 100644 index 09e18dee..00000000 Binary files a/bin/res/drawable-hdpi/main_exit.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/main_help.png b/bin/res/drawable-hdpi/main_help.png deleted file mode 100644 index aaf8304c..00000000 Binary files a/bin/res/drawable-hdpi/main_help.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/main_settings.png b/bin/res/drawable-hdpi/main_settings.png deleted file mode 100644 index 1ab7722b..00000000 Binary files a/bin/res/drawable-hdpi/main_settings.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/main_shuffle.png b/bin/res/drawable-hdpi/main_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/bin/res/drawable-hdpi/main_shuffle.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/menu_now_playing.png b/bin/res/drawable-hdpi/menu_now_playing.png deleted file mode 100644 index 6ce5629a..00000000 Binary files a/bin/res/drawable-hdpi/menu_now_playing.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/scrubber_control_normal_holo.png b/bin/res/drawable-hdpi/scrubber_control_normal_holo.png deleted file mode 100644 index 4da239be..00000000 Binary files a/bin/res/drawable-hdpi/scrubber_control_normal_holo.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/search.png b/bin/res/drawable-hdpi/search.png deleted file mode 100644 index 6bc3d426..00000000 Binary files a/bin/res/drawable-hdpi/search.png and /dev/null differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index ff21f7b6..0db927b9 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/gen/net/sourceforge/subsonic/androidapp/R.java b/gen/net/sourceforge/subsonic/androidapp/R.java index 9b4aaa8a..bbb12a71 100644 --- a/gen/net/sourceforge/subsonic/androidapp/R.java +++ b/gen/net/sourceforge/subsonic/androidapp/R.java @@ -42,124 +42,106 @@ public final class R { } public static final class drawable { public static final int action_bar_bg=0x7f020000; - public static final int action_play_all=0x7f020001; - public static final int action_refresh=0x7f020002; - public static final int action_search=0x7f020003; - public static final int action_shuffle=0x7f020004; - public static final int actionbar_button_normal=0x7f020005; - public static final int actionbar_shadow=0x7f020006; - public static final int album_art_background=0x7f020007; - public static final int appwidget_art_default=0x7f020008; - public static final int appwidget_art_unknown=0x7f020009; - public static final int appwidget_bg=0x7f02000a; - public static final int appwidget_button_background=0x7f02000b; - public static final int appwidget_button_background_r=0x7f02000c; - public static final int appwidget_button_center=0x7f02000d; - public static final int appwidget_button_left=0x7f02000e; - public static final int appwidget_button_right=0x7f02000f; - public static final int appwidget_divider=0x7f020010; - public static final int appwidget_divider_horizontal=0x7f020011; - public static final int appwidget_divider_vertical=0x7f020012; - public static final int appwidget_inner_focus_c=0x7f020013; - public static final int appwidget_inner_focus_l=0x7f020014; - public static final int appwidget_inner_focus_r=0x7f020015; - public static final int appwidget_inner_press_c=0x7f020016; - public static final int appwidget_inner_press_l=0x7f020017; - public static final int appwidget_inner_press_r=0x7f020018; - public static final int appwidget_overlay=0x7f020019; - public static final int browse_offline=0x7f02001a; - public static final int btn_check_buttonless_off=0x7f02001b; - public static final int btn_check_buttonless_on=0x7f02001c; - public static final int btn_check_custom=0x7f02001d; - public static final int buttonbar_selector=0x7f02001e; - public static final int downloaded=0x7f02001f; - public static final int downloading=0x7f020020; - public static final int ic_appwidget_music_next=0x7f020021; - public static final int ic_appwidget_music_pause=0x7f020022; - public static final int ic_appwidget_music_play=0x7f020023; - public static final int ic_appwidget_music_previous=0x7f020024; - public static final int ic_launcher=0x7f020025; - public static final int ic_menu_compass=0x7f020026; - public static final int ic_menu_exit=0x7f020027; - public static final int ic_menu_help=0x7f020028; - public static final int ic_menu_moreoverflow=0x7f020029; - public static final int ic_menu_play_clip=0x7f02002a; - public static final int ic_menu_recent_history=0x7f02002b; - public static final int ic_menu_remove_all=0x7f02002c; - public static final int ic_menu_rotate=0x7f02002d; - public static final int ic_menu_save=0x7f02002e; - public static final int ic_menu_screen_on_off=0x7f02002f; - public static final int ic_menu_settings=0x7f020030; - public static final int ic_menu_share=0x7f020031; - public static final int ic_menu_shuffle=0x7f020032; - public static final int ic_menu_star=0x7f020033; - public static final int ic_stat_play=0x7f020034; - public static final int ic_stat_subsonic=0x7f020035; - public static final int list_background=0x7f020036; - public static final int list_focused_holo=0x7f020037; - public static final int list_item_artist=0x7f020038; - public static final int list_item_playlist=0x7f020039; - public static final int list_longpressed_holo=0x7f02003a; - public static final int list_pressed_holo_dark=0x7f02003b; - public static final int list_pressed_holo_light=0x7f02003c; - public static final int list_selector_background_transition_holo_dark=0x7f02003d; - public static final int list_selector_background_transition_holo_light=0x7f02003e; - public static final int list_selector_disabled_holo_dark=0x7f02003f; - public static final int list_selector_disabled_holo_light=0x7f020040; - public static final int list_selector_holo_dark=0x7f020041; - public static final int list_selector_holo_light=0x7f020042; - public static final int main_exit=0x7f020043; - public static final int main_header_icon=0x7f020044; - public static final int main_help=0x7f020045; - public static final int main_select_server=0x7f020046; - public static final int main_settings=0x7f020047; - public static final int main_shuffle=0x7f020048; - public static final int media_backward=0x7f020049; - public static final int media_backward_normal=0x7f02004a; - public static final int media_backward_pressed=0x7f02004b; - public static final int media_forward=0x7f02004c; - public static final int media_forward_normal=0x7f02004d; - public static final int media_forward_pressed=0x7f02004e; - public static final int media_pause=0x7f02004f; - public static final int media_pause_normal=0x7f020050; - public static final int media_pause_pressed=0x7f020051; - public static final int media_repeat_all=0x7f020052; - public static final int media_repeat_off=0x7f020053; - public static final int media_repeat_single=0x7f020054; - public static final int media_shuffle=0x7f020055; - public static final int media_shuffle_normal=0x7f020056; - public static final int media_shuffle_pressed=0x7f020057; - public static final int media_start=0x7f020058; - public static final int media_start_normal=0x7f020059; - public static final int media_start_pressed=0x7f02005a; - public static final int media_stop=0x7f02005b; - public static final int media_stop_normal=0x7f02005c; - public static final int media_stop_pressed=0x7f02005d; - public static final int media_toggle_list=0x7f02005e; - public static final int media_toggle_list_normal=0x7f02005f; - public static final int media_toggle_list_pressed=0x7f020060; - public static final int menu_browse=0x7f020061; - public static final int menu_home=0x7f020062; - public static final int menu_now_playing=0x7f020063; - public static final int menu_playlists=0x7f020064; - public static final int menu_search=0x7f020065; - public static final int menubar_button_disabled=0x7f020066; - public static final int menubar_button_normal=0x7f020067; - public static final int progress_bg_holo_dark=0x7f020068; - public static final int progress_horizontal_holo_dark=0x7f020069; - public static final int progress_primary_holo_dark=0x7f02006a; - public static final int progress_secondary_holo_dark=0x7f02006b; - public static final int refresh=0x7f02006c; - public static final int saved=0x7f02006d; - public static final int scrubber_control_normal_holo=0x7f02006e; - public static final int search=0x7f02006f; - public static final int select_album_play_all=0x7f020070; - public static final int select_album_play_all_normal=0x7f020071; - public static final int select_album_play_all_pressed=0x7f020072; - public static final int select_artist_folder=0x7f020073; - public static final int slider_knob=0x7f020074; - public static final int unknown_album=0x7f020075; - public static final int unknown_album_large=0x7f020076; + public static final int album_art_background=0x7f020001; + public static final int appwidget_art_default=0x7f020002; + public static final int appwidget_art_unknown=0x7f020003; + public static final int appwidget_bg=0x7f020004; + public static final int appwidget_button_background=0x7f020005; + public static final int appwidget_button_background_r=0x7f020006; + public static final int appwidget_button_center=0x7f020007; + public static final int appwidget_button_left=0x7f020008; + public static final int appwidget_button_right=0x7f020009; + public static final int appwidget_divider=0x7f02000a; + public static final int appwidget_divider_horizontal=0x7f02000b; + public static final int appwidget_divider_vertical=0x7f02000c; + public static final int appwidget_inner_focus_c=0x7f02000d; + public static final int appwidget_inner_focus_l=0x7f02000e; + public static final int appwidget_inner_focus_r=0x7f02000f; + public static final int appwidget_inner_press_c=0x7f020010; + public static final int appwidget_inner_press_l=0x7f020011; + public static final int appwidget_inner_press_r=0x7f020012; + public static final int appwidget_overlay=0x7f020013; + public static final int btn_check_buttonless_off=0x7f020014; + public static final int btn_check_buttonless_on=0x7f020015; + public static final int btn_check_custom=0x7f020016; + public static final int buttonbar_selector=0x7f020017; + public static final int ic_appwidget_music_next=0x7f020018; + public static final int ic_appwidget_music_pause=0x7f020019; + public static final int ic_appwidget_music_play=0x7f02001a; + public static final int ic_appwidget_music_previous=0x7f02001b; + public static final int ic_launcher=0x7f02001c; + public static final int ic_menu_browse=0x7f02001d; + public static final int ic_menu_compass=0x7f02001e; + public static final int ic_menu_exit=0x7f02001f; + public static final int ic_menu_help=0x7f020020; + public static final int ic_menu_home=0x7f020021; + public static final int ic_menu_moreoverflow=0x7f020022; + public static final int ic_menu_offline=0x7f020023; + public static final int ic_menu_play_all=0x7f020024; + public static final int ic_menu_playlists=0x7f020025; + public static final int ic_menu_refresh=0x7f020026; + public static final int ic_menu_remove_all=0x7f020027; + public static final int ic_menu_save=0x7f020028; + public static final int ic_menu_screen_on_off=0x7f020029; + public static final int ic_menu_search=0x7f02002a; + public static final int ic_menu_select_artist_folder=0x7f02002b; + public static final int ic_menu_settings=0x7f02002c; + public static final int ic_menu_share=0x7f02002d; + public static final int ic_menu_shuffle=0x7f02002e; + public static final int ic_stat_downloaded=0x7f02002f; + public static final int ic_stat_downloading=0x7f020030; + public static final int ic_stat_play=0x7f020031; + public static final int ic_stat_saved=0x7f020032; + public static final int ic_stat_subsonic=0x7f020033; + public static final int list_background=0x7f020034; + public static final int list_focused_holo=0x7f020035; + public static final int list_item_more=0x7f020036; + public static final int list_longpressed_holo=0x7f020037; + public static final int list_pressed_holo_dark=0x7f020038; + public static final int list_pressed_holo_light=0x7f020039; + public static final int list_selector_background_transition_holo_dark=0x7f02003a; + public static final int list_selector_background_transition_holo_light=0x7f02003b; + public static final int list_selector_disabled_holo_dark=0x7f02003c; + public static final int list_selector_disabled_holo_light=0x7f02003d; + public static final int list_selector_holo_dark=0x7f02003e; + public static final int list_selector_holo_light=0x7f02003f; + public static final int main_header_icon=0x7f020040; + public static final int media_backward=0x7f020041; + public static final int media_backward_normal=0x7f020042; + public static final int media_backward_pressed=0x7f020043; + public static final int media_forward=0x7f020044; + public static final int media_forward_normal=0x7f020045; + public static final int media_forward_pressed=0x7f020046; + public static final int media_pause=0x7f020047; + public static final int media_pause_normal=0x7f020048; + public static final int media_pause_pressed=0x7f020049; + public static final int media_repeat_all=0x7f02004a; + public static final int media_repeat_off=0x7f02004b; + public static final int media_repeat_single=0x7f02004c; + public static final int media_shuffle=0x7f02004d; + public static final int media_shuffle_normal=0x7f02004e; + public static final int media_shuffle_pressed=0x7f02004f; + public static final int media_start=0x7f020050; + public static final int media_start_normal=0x7f020051; + public static final int media_start_pressed=0x7f020052; + public static final int media_stop=0x7f020053; + public static final int media_stop_normal=0x7f020054; + public static final int media_stop_pressed=0x7f020055; + public static final int media_toggle_list=0x7f020056; + public static final int media_toggle_list_normal=0x7f020057; + public static final int media_toggle_list_pressed=0x7f020058; + public static final int menubar_button_disabled=0x7f020059; + public static final int menubar_button_normal=0x7f02005a; + public static final int progress_bg_holo_dark=0x7f02005b; + public static final int progress_horizontal_holo_dark=0x7f02005c; + public static final int progress_primary_holo_dark=0x7f02005d; + public static final int progress_secondary_holo_dark=0x7f02005e; + public static final int select_album_play_all=0x7f02005f; + public static final int select_album_play_all_normal=0x7f020060; + public static final int select_album_play_all_pressed=0x7f020061; + public static final int slider_knob=0x7f020062; + public static final int unknown_album=0x7f020063; + public static final int unknown_album_large=0x7f020064; } public static final class id { public static final int action_button_1=0x7f0c0003; @@ -169,16 +151,16 @@ public final class R { public static final int actionbar_title_text=0x7f0c0001; public static final int album_artist=0x7f0c0007; public static final int album_coverart=0x7f0c0005; - public static final int album_menu_pin=0x7f0c007e; - public static final int album_menu_play_last=0x7f0c007d; - public static final int album_menu_play_now=0x7f0c007c; + public static final int album_menu_pin=0x7f0c007f; + public static final int album_menu_play_last=0x7f0c007e; + public static final int album_menu_play_now=0x7f0c007d; public static final int album_title=0x7f0c0006; public static final int appwidget_coverart=0x7f0c0008; public static final int appwidget_top=0x7f0c0009; public static final int artist=0x7f0c000b; - public static final int artist_menu_pin=0x7f0c0081; - public static final int artist_menu_play_last=0x7f0c0080; - public static final int artist_menu_play_now=0x7f0c007f; + public static final int artist_menu_pin=0x7f0c0082; + public static final int artist_menu_play_last=0x7f0c0081; + public static final int artist_menu_play_now=0x7f0c0080; public static final int button_bar=0x7f0c000f; public static final int button_bar_home=0x7f0c0010; public static final int button_bar_music=0x7f0c0011; @@ -224,6 +206,7 @@ public final class R { public static final int help_buttons=0x7f0c0035; public static final int help_close=0x7f0c0037; public static final int help_contents=0x7f0c0038; + public static final int ic_menu_shuffle=0x7f0c0075; public static final int jukebox_volume_progress_bar=0x7f0c003a; public static final int lyrics_artist=0x7f0c003b; public static final int lyrics_text=0x7f0c003d; @@ -248,7 +231,7 @@ public final class R { public static final int menu_screen_on_off=0x7f0c0078; public static final int menu_settings=0x7f0c0073; public static final int menu_show_album=0x7f0c0079; - public static final int menu_shuffle=0x7f0c0075; + public static final int menu_shuffle=0x7f0c007c; public static final int notification_artist=0x7f0c004b; public static final int notification_image=0x7f0c0049; public static final int notification_title=0x7f0c004a; @@ -286,9 +269,9 @@ public final class R { public static final int song_artist=0x7f0c006e; public static final int song_check=0x7f0c006b; public static final int song_duration=0x7f0c006f; - public static final int song_menu_play_last=0x7f0c0084; - public static final int song_menu_play_next=0x7f0c0083; - public static final int song_menu_play_now=0x7f0c0082; + public static final int song_menu_play_last=0x7f0c0085; + public static final int song_menu_play_next=0x7f0c0084; + public static final int song_menu_play_now=0x7f0c0083; public static final int song_status=0x7f0c006d; public static final int song_title=0x7f0c006c; public static final int tab_progress=0x7f0c0070; diff --git a/res/drawable-hdpi/action_play_all.png b/res/drawable-hdpi/action_play_all.png deleted file mode 100644 index 6ce5629a..00000000 Binary files a/res/drawable-hdpi/action_play_all.png and /dev/null differ diff --git a/res/drawable-hdpi/action_refresh.png b/res/drawable-hdpi/action_refresh.png deleted file mode 100644 index 9f30dc95..00000000 Binary files a/res/drawable-hdpi/action_refresh.png and /dev/null differ diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png deleted file mode 100644 index 6bc3d426..00000000 Binary files a/res/drawable-hdpi/action_search.png and /dev/null differ diff --git a/res/drawable-hdpi/action_shuffle.png b/res/drawable-hdpi/action_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/res/drawable-hdpi/action_shuffle.png and /dev/null differ diff --git a/res/drawable-hdpi/actionbar_button_normal.9.png b/res/drawable-hdpi/actionbar_button_normal.9.png deleted file mode 100644 index 385f751c..00000000 Binary files a/res/drawable-hdpi/actionbar_button_normal.9.png and /dev/null differ diff --git a/res/drawable-hdpi/actionbar_shadow.9.png b/res/drawable-hdpi/actionbar_shadow.9.png deleted file mode 100644 index 82aa67bb..00000000 Binary files a/res/drawable-hdpi/actionbar_shadow.9.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..b71b0293 Binary files /dev/null and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-hdpi/menu_browse.png b/res/drawable-hdpi/ic_menu_browse.png similarity index 100% rename from res/drawable-hdpi/menu_browse.png rename to res/drawable-hdpi/ic_menu_browse.png diff --git a/res/drawable-hdpi/menu_home.png b/res/drawable-hdpi/ic_menu_home.png similarity index 100% rename from res/drawable-hdpi/menu_home.png rename to res/drawable-hdpi/ic_menu_home.png diff --git a/res/drawable-hdpi/browse_offline.png b/res/drawable-hdpi/ic_menu_offline.png similarity index 100% rename from res/drawable-hdpi/browse_offline.png rename to res/drawable-hdpi/ic_menu_offline.png diff --git a/bin/res/drawable-hdpi/ic_menu_play_clip.png b/res/drawable-hdpi/ic_menu_play_all.png similarity index 100% rename from bin/res/drawable-hdpi/ic_menu_play_clip.png rename to res/drawable-hdpi/ic_menu_play_all.png diff --git a/res/drawable-hdpi/ic_menu_play_clip.png b/res/drawable-hdpi/ic_menu_play_clip.png deleted file mode 100644 index 2d0d2e2d..00000000 Binary files a/res/drawable-hdpi/ic_menu_play_clip.png and /dev/null differ diff --git a/res/drawable-hdpi/menu_playlists.png b/res/drawable-hdpi/ic_menu_playlists.png similarity index 100% rename from res/drawable-hdpi/menu_playlists.png rename to res/drawable-hdpi/ic_menu_playlists.png diff --git a/res/drawable-hdpi/ic_menu_recent_history.png b/res/drawable-hdpi/ic_menu_recent_history.png deleted file mode 100644 index 4101434e..00000000 Binary files a/res/drawable-hdpi/ic_menu_recent_history.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/refresh.png b/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from bin/res/drawable-hdpi/refresh.png rename to res/drawable-hdpi/ic_menu_refresh.png diff --git a/res/drawable-hdpi/ic_menu_rotate.png b/res/drawable-hdpi/ic_menu_rotate.png deleted file mode 100644 index 09efba4b..00000000 Binary files a/res/drawable-hdpi/ic_menu_rotate.png and /dev/null differ diff --git a/bin/res/drawable-hdpi/menu_search.png b/res/drawable-hdpi/ic_menu_search.png similarity index 100% rename from bin/res/drawable-hdpi/menu_search.png rename to res/drawable-hdpi/ic_menu_search.png diff --git a/bin/res/drawable-hdpi/select_artist_folder.png b/res/drawable-hdpi/ic_menu_select_artist_folder.png similarity index 100% rename from bin/res/drawable-hdpi/select_artist_folder.png rename to res/drawable-hdpi/ic_menu_select_artist_folder.png diff --git a/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png index 44378144..28376157 100644 Binary files a/res/drawable-hdpi/ic_menu_share.png and b/res/drawable-hdpi/ic_menu_share.png differ diff --git a/res/drawable-hdpi/ic_menu_star.png b/res/drawable-hdpi/ic_menu_star.png deleted file mode 100644 index 4f667a4c..00000000 Binary files a/res/drawable-hdpi/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-hdpi/downloaded.png b/res/drawable-hdpi/ic_stat_downloaded.png similarity index 100% rename from res/drawable-hdpi/downloaded.png rename to res/drawable-hdpi/ic_stat_downloaded.png diff --git a/res/drawable-hdpi/downloading.png b/res/drawable-hdpi/ic_stat_downloading.png similarity index 100% rename from res/drawable-hdpi/downloading.png rename to res/drawable-hdpi/ic_stat_downloading.png diff --git a/res/drawable-hdpi/saved.png b/res/drawable-hdpi/ic_stat_saved.png similarity index 100% rename from res/drawable-hdpi/saved.png rename to res/drawable-hdpi/ic_stat_saved.png diff --git a/res/drawable-hdpi/list_item_artist.9.png b/res/drawable-hdpi/list_item_more.9.png similarity index 100% rename from res/drawable-hdpi/list_item_artist.9.png rename to res/drawable-hdpi/list_item_more.9.png diff --git a/res/drawable-hdpi/list_item_playlist.9.png b/res/drawable-hdpi/list_item_playlist.9.png deleted file mode 100644 index 79ca860d..00000000 Binary files a/res/drawable-hdpi/list_item_playlist.9.png and /dev/null differ diff --git a/res/drawable-hdpi/main_exit.png b/res/drawable-hdpi/main_exit.png deleted file mode 100644 index 09e18dee..00000000 Binary files a/res/drawable-hdpi/main_exit.png and /dev/null differ diff --git a/res/drawable-hdpi/main_help.png b/res/drawable-hdpi/main_help.png deleted file mode 100644 index aaf8304c..00000000 Binary files a/res/drawable-hdpi/main_help.png and /dev/null differ diff --git a/res/drawable-hdpi/main_select_server.png b/res/drawable-hdpi/main_select_server.png deleted file mode 100644 index c2cefead..00000000 Binary files a/res/drawable-hdpi/main_select_server.png and /dev/null differ diff --git a/res/drawable-hdpi/main_settings.png b/res/drawable-hdpi/main_settings.png deleted file mode 100644 index 1ab7722b..00000000 Binary files a/res/drawable-hdpi/main_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/main_shuffle.png b/res/drawable-hdpi/main_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/res/drawable-hdpi/main_shuffle.png and /dev/null differ diff --git a/res/drawable-hdpi/menu_now_playing.png b/res/drawable-hdpi/menu_now_playing.png deleted file mode 100644 index 6ce5629a..00000000 Binary files a/res/drawable-hdpi/menu_now_playing.png and /dev/null differ diff --git a/res/drawable-hdpi/menu_search.png b/res/drawable-hdpi/menu_search.png deleted file mode 100644 index 6bc3d426..00000000 Binary files a/res/drawable-hdpi/menu_search.png and /dev/null differ diff --git a/res/drawable-hdpi/refresh.png b/res/drawable-hdpi/refresh.png deleted file mode 100644 index 9f30dc95..00000000 Binary files a/res/drawable-hdpi/refresh.png and /dev/null differ diff --git a/res/drawable-hdpi/scrubber_control_normal_holo.png b/res/drawable-hdpi/scrubber_control_normal_holo.png deleted file mode 100644 index 90e9c9c9..00000000 Binary files a/res/drawable-hdpi/scrubber_control_normal_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/search.png b/res/drawable-hdpi/search.png deleted file mode 100644 index 6bc3d426..00000000 Binary files a/res/drawable-hdpi/search.png and /dev/null differ diff --git a/res/drawable-hdpi/select_artist_folder.png b/res/drawable-hdpi/select_artist_folder.png deleted file mode 100644 index c2cefead..00000000 Binary files a/res/drawable-hdpi/select_artist_folder.png and /dev/null differ diff --git a/res/layout/action_bar.xml b/res/layout/action_bar.xml index f6a5b9cd..128cef2d 100644 --- a/res/layout/action_bar.xml +++ b/res/layout/action_bar.xml @@ -75,6 +75,6 @@ a:padding="5dp" a:scaleType="center" a:showAsAction="ifRoom|withText" - a:src="@drawable/search" /> + a:src="@drawable/ic_menu_search" /> diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml index 37dc0a4d..1c4172f6 100644 --- a/res/layout/album_list_item.xml +++ b/res/layout/album_list_item.xml @@ -38,7 +38,7 @@ + a:src="@drawable/ic_menu_home" /> + a:src="@drawable/ic_menu_browse" /> + a:src="@drawable/ic_menu_search" /> + a:src="@drawable/ic_menu_playlists" /> + a:src="@drawable/ic_menu_play_all" /> diff --git a/res/layout/main_buttons.xml b/res/layout/main_buttons.xml index da3b2945..68b91ccc 100644 --- a/res/layout/main_buttons.xml +++ b/res/layout/main_buttons.xml @@ -56,7 +56,7 @@ diff --git a/res/layout/select_artist.xml b/res/layout/select_artist.xml index 8e159a15..a286ae0e 100644 --- a/res/layout/select_artist.xml +++ b/res/layout/select_artist.xml @@ -8,7 +8,7 @@ diff --git a/res/layout/select_artist_header.xml b/res/layout/select_artist_header.xml index d8561600..95365210 100644 --- a/res/layout/select_artist_header.xml +++ b/res/layout/select_artist_header.xml @@ -10,7 +10,7 @@ a:minHeight="?android:attr/listPreferredItemHeight"> diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml index c25cee59..3827caed 100644 --- a/res/menu/nowplaying.xml +++ b/res/menu/nowplaying.xml @@ -2,13 +2,13 @@ diff --git a/src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java index 0fe6c2cb..65b85c16 100644 --- a/src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java +++ b/src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java @@ -119,7 +119,7 @@ public class MainActivity extends SubsonicTabActivity { // Button 1: shuffle ImageButton actionShuffleButton = (ImageButton)findViewById(R.id.action_button_1); - actionShuffleButton.setImageResource(R.drawable.action_shuffle); + actionShuffleButton.setImageResource(R.drawable.ic_menu_shuffle); actionShuffleButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -131,7 +131,7 @@ public class MainActivity extends SubsonicTabActivity { // Button 2: search ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2); - actionSearchButton.setImageResource(R.drawable.action_search); + actionSearchButton.setImageResource(R.drawable.ic_menu_search); actionSearchButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java index da97b892..31f70678 100644 --- a/src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java +++ b/src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java @@ -140,7 +140,7 @@ public class SearchActivity extends SubsonicTabActivity { // Button 2: search final ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2); - actionSearchButton.setImageResource(R.drawable.action_search); + actionSearchButton.setImageResource(R.drawable.ic_menu_search); actionSearchButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java index b354599f..4c7fb4b0 100644 --- a/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java +++ b/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java @@ -172,7 +172,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { // Button 1: play all playAllButton = (ImageButton) findViewById(R.id.action_button_1); - playAllButton.setImageResource(R.drawable.action_play_all); + playAllButton.setImageResource(R.drawable.ic_menu_play_all); playAllButton.setVisibility(View.GONE); playAllButton.setOnClickListener(new View.OnClickListener() { @Override @@ -183,7 +183,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { // Button 2: refresh ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2); - refreshButton.setImageResource(R.drawable.action_refresh); + refreshButton.setImageResource(R.drawable.ic_menu_refresh); refreshButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java index 0930cada..1a444868 100644 --- a/src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java +++ b/src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java @@ -78,7 +78,7 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter // Button 1: shuffle ImageButton shuffleButton = (ImageButton) findViewById(R.id.action_button_1); - shuffleButton.setImageResource(R.drawable.action_shuffle); + shuffleButton.setImageResource(R.drawable.ic_menu_shuffle); shuffleButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -90,7 +90,7 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter // Button 2: refresh ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2); - refreshButton.setImageResource(R.drawable.action_refresh); + refreshButton.setImageResource(R.drawable.ic_menu_refresh); refreshButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java index 8eb10349..1706f8c2 100644 --- a/src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java +++ b/src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java @@ -66,7 +66,7 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt // Button 2: refresh ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2); - refreshButton.setImageResource(R.drawable.action_refresh); + refreshButton.setImageResource(R.drawable.ic_menu_refresh); refreshButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/src/net/sourceforge/subsonic/androidapp/util/SongView.java b/src/net/sourceforge/subsonic/androidapp/util/SongView.java index 9cdf3efc..b2ce8129 100644 --- a/src/net/sourceforge/subsonic/androidapp/util/SongView.java +++ b/src/net/sourceforge/subsonic/androidapp/util/SongView.java @@ -114,12 +114,12 @@ public class SongView extends LinearLayout implements Checkable { int rightImage = 0; if (completeFile.exists()) { - leftImage = downloadFile.isSaved() ? R.drawable.saved : R.drawable.downloaded; + leftImage = downloadFile.isSaved() ? R.drawable.ic_stat_saved : R.drawable.ic_stat_downloaded; } if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFile.exists()) { statusTextView.setText(Util.formatLocalizedBytes(partialFile.length(), getContext())); - rightImage = R.drawable.downloading; + rightImage = R.drawable.ic_stat_downloading; } else { statusTextView.setText(null); }