From 210cd0b0a4613c200e82b79729d939e55ac87307 Mon Sep 17 00:00:00 2001 From: Joshua Bahnsen Date: Fri, 17 May 2013 00:26:06 -0700 Subject: [PATCH] Add settings for incremental skip ahead --- .classpath | 1 + gen/com/handmark/pulltorefresh/library/R.java | 154 +++++++++--------- .../thejoshwa/ultrasonic/androidapp/R.java | 78 ++++----- gen/net/simonvt/menudrawer/R.java | 74 ++++----- res/values/arrays.xml | 12 ++ res/values/strings.xml | 1 + res/xml/settings.xml | 80 ++++----- .../androidapp/activity/DownloadActivity.java | 7 +- .../androidapp/activity/SettingsActivity.java | 3 + .../ultrasonic/androidapp/util/Constants.java | 1 + .../ultrasonic/androidapp/util/Util.java | 5 + 11 files changed, 224 insertions(+), 192 deletions(-) diff --git a/.classpath b/.classpath index d3bb07b4..d57ec025 100644 --- a/.classpath +++ b/.classpath @@ -4,5 +4,6 @@ + diff --git a/gen/com/handmark/pulltorefresh/library/R.java b/gen/com/handmark/pulltorefresh/library/R.java index 107ea8f0..6d6250b4 100644 --- a/gen/com/handmark/pulltorefresh/library/R.java +++ b/gen/com/handmark/pulltorefresh/library/R.java @@ -7,98 +7,98 @@ package com.handmark.pulltorefresh.library; public final class R { - public static final class id { - public static final int pullFromStart = 0x7f060001; - public static final int pull_to_refresh_progress = 0x7f060081; - public static final int rotate = 0x7f060007; - public static final int both = 0x7f060003; - public static final int webview = 0x7f06000a; - public static final int pull_to_refresh_text = 0x7f060082; - public static final int pullDownFromTop = 0x7f060005; - public static final int gridview = 0x7f060009; - public static final int pullUpFromBottom = 0x7f060006; - public static final int scrollview = 0x7f06000b; - public static final int pullFromEnd = 0x7f060002; - public static final int pull_to_refresh_image = 0x7f060080; - public static final int pull_to_refresh_sub_text = 0x7f060083; - public static final int fl_inner = 0x7f06007f; - public static final int flip = 0x7f060008; - public static final int disabled = 0x7f060000; - public static final int manualOnly = 0x7f060004; - } public static final class anim { - public static final int slide_out_to_top = 0x7f040007; - public static final int slide_out_to_bottom = 0x7f040006; public static final int slide_in_from_bottom = 0x7f040004; public static final int slide_in_from_top = 0x7f040005; - } - public static final class string { - public static final int pull_to_refresh_refreshing_label = 0x7f080002; - public static final int pull_to_refresh_release_label = 0x7f080001; - public static final int pull_to_refresh_from_bottom_pull_label = 0x7f080003; - public static final int pull_to_refresh_from_bottom_refreshing_label = 0x7f080005; - public static final int pull_to_refresh_pull_label = 0x7f080000; - public static final int pull_to_refresh_from_bottom_release_label = 0x7f080004; - } - public static final class layout { - public static final int pull_to_refresh_header_vertical = 0x7f030019; - public static final int pull_to_refresh_header_horizontal = 0x7f030018; - } - public static final class styleable { - public static final int PullToRefresh_ptrDrawableStart = 7; - public static final int PullToRefresh_ptrShowIndicator = 5; - public static final int[] PullToRefresh = { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005, 0x7f010006, 0x7f010007, 0x7f010008, 0x7f010009, 0x7f01000a, 0x7f01000b, 0x7f01000c, 0x7f01000d, 0x7f01000e, 0x7f01000f, 0x7f010010, 0x7f010011, 0x7f010012 }; - public static final int PullToRefresh_ptrHeaderTextAppearance = 10; - public static final int PullToRefresh_ptrRefreshableViewBackground = 0; - public static final int PullToRefresh_ptrAnimationStyle = 12; - public static final int PullToRefresh_ptrScrollingWhileRefreshingEnabled = 13; - public static final int PullToRefresh_ptrAdapterViewBackground = 16; - public static final int PullToRefresh_ptrMode = 4; - public static final int PullToRefresh_ptrHeaderTextColor = 2; - public static final int PullToRefresh_ptrListViewExtrasEnabled = 14; - public static final int PullToRefresh_ptrDrawableBottom = 18; - public static final int PullToRefresh_ptrHeaderBackground = 1; - public static final int PullToRefresh_ptrDrawableTop = 17; - public static final int PullToRefresh_ptrOverScroll = 9; - public static final int PullToRefresh_ptrDrawableEnd = 8; - public static final int PullToRefresh_ptrRotateDrawableWhilePulling = 15; - public static final int PullToRefresh_ptrSubHeaderTextAppearance = 11; - public static final int PullToRefresh_ptrDrawable = 6; - public static final int PullToRefresh_ptrHeaderSubTextColor = 3; - } - public static final class drawable { - public static final int indicator_bg_top = 0x7f020046; - public static final int indicator_bg_bottom = 0x7f020045; - public static final int default_ptr_flip = 0x7f02000c; - public static final int indicator_arrow = 0x7f020044; - public static final int default_ptr_rotate = 0x7f02000d; + public static final int slide_out_to_bottom = 0x7f040006; + public static final int slide_out_to_top = 0x7f040007; } public static final class attr { - public static final int ptrHeaderBackground = 0x7f010001; - public static final int ptrMode = 0x7f010004; - public static final int ptrScrollingWhileRefreshingEnabled = 0x7f01000d; public static final int ptrAdapterViewBackground = 0x7f010010; - public static final int ptrRotateDrawableWhilePulling = 0x7f01000f; - public static final int ptrDrawableStart = 0x7f010007; - public static final int ptrSubHeaderTextAppearance = 0x7f01000b; public static final int ptrAnimationStyle = 0x7f01000c; - public static final int ptrDrawableEnd = 0x7f010008; - public static final int ptrShowIndicator = 0x7f010005; - public static final int ptrDrawableTop = 0x7f010011; public static final int ptrDrawable = 0x7f010006; - public static final int ptrHeaderTextAppearance = 0x7f01000a; public static final int ptrDrawableBottom = 0x7f010012; + public static final int ptrDrawableEnd = 0x7f010008; + public static final int ptrDrawableStart = 0x7f010007; + public static final int ptrDrawableTop = 0x7f010011; + public static final int ptrHeaderBackground = 0x7f010001; public static final int ptrHeaderSubTextColor = 0x7f010003; - public static final int ptrListViewExtrasEnabled = 0x7f01000e; - public static final int ptrOverScroll = 0x7f010009; + public static final int ptrHeaderTextAppearance = 0x7f01000a; public static final int ptrHeaderTextColor = 0x7f010002; + public static final int ptrListViewExtrasEnabled = 0x7f01000e; + public static final int ptrMode = 0x7f010004; + public static final int ptrOverScroll = 0x7f010009; public static final int ptrRefreshableViewBackground = 0x7f010000; + public static final int ptrRotateDrawableWhilePulling = 0x7f01000f; + public static final int ptrScrollingWhileRefreshingEnabled = 0x7f01000d; + public static final int ptrShowIndicator = 0x7f010005; + public static final int ptrSubHeaderTextAppearance = 0x7f01000b; } public static final class dimen { - public static final int indicator_right_padding = 0x7f070000; + public static final int header_footer_left_right_padding = 0x7f070003; + public static final int header_footer_top_bottom_padding = 0x7f070004; public static final int indicator_corner_radius = 0x7f070001; public static final int indicator_internal_padding = 0x7f070002; - public static final int header_footer_top_bottom_padding = 0x7f070004; - public static final int header_footer_left_right_padding = 0x7f070003; + public static final int indicator_right_padding = 0x7f070000; + } + public static final class drawable { + public static final int default_ptr_flip = 0x7f02000c; + public static final int default_ptr_rotate = 0x7f02000d; + public static final int indicator_arrow = 0x7f020044; + public static final int indicator_bg_bottom = 0x7f020045; + public static final int indicator_bg_top = 0x7f020046; + } + public static final class id { + public static final int both = 0x7f060003; + public static final int disabled = 0x7f060000; + public static final int fl_inner = 0x7f06007f; + public static final int flip = 0x7f060008; + public static final int gridview = 0x7f060009; + public static final int manualOnly = 0x7f060004; + public static final int pullDownFromTop = 0x7f060005; + public static final int pullFromEnd = 0x7f060002; + public static final int pullFromStart = 0x7f060001; + public static final int pullUpFromBottom = 0x7f060006; + public static final int pull_to_refresh_image = 0x7f060080; + public static final int pull_to_refresh_progress = 0x7f060081; + public static final int pull_to_refresh_sub_text = 0x7f060083; + public static final int pull_to_refresh_text = 0x7f060082; + public static final int rotate = 0x7f060007; + public static final int scrollview = 0x7f06000b; + public static final int webview = 0x7f06000a; + } + public static final class layout { + public static final int pull_to_refresh_header_horizontal = 0x7f030018; + public static final int pull_to_refresh_header_vertical = 0x7f030019; + } + public static final class string { + public static final int pull_to_refresh_from_bottom_pull_label = 0x7f080003; + public static final int pull_to_refresh_from_bottom_refreshing_label = 0x7f080005; + public static final int pull_to_refresh_from_bottom_release_label = 0x7f080004; + public static final int pull_to_refresh_pull_label = 0x7f080000; + public static final int pull_to_refresh_refreshing_label = 0x7f080002; + public static final int pull_to_refresh_release_label = 0x7f080001; + } + public static final class styleable { + public static final int[] PullToRefresh = { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005, 0x7f010006, 0x7f010007, 0x7f010008, 0x7f010009, 0x7f01000a, 0x7f01000b, 0x7f01000c, 0x7f01000d, 0x7f01000e, 0x7f01000f, 0x7f010010, 0x7f010011, 0x7f010012 }; + public static final int PullToRefresh_ptrAdapterViewBackground = 16; + public static final int PullToRefresh_ptrAnimationStyle = 12; + public static final int PullToRefresh_ptrDrawable = 6; + public static final int PullToRefresh_ptrDrawableBottom = 18; + public static final int PullToRefresh_ptrDrawableEnd = 8; + public static final int PullToRefresh_ptrDrawableStart = 7; + public static final int PullToRefresh_ptrDrawableTop = 17; + public static final int PullToRefresh_ptrHeaderBackground = 1; + public static final int PullToRefresh_ptrHeaderSubTextColor = 3; + public static final int PullToRefresh_ptrHeaderTextAppearance = 10; + public static final int PullToRefresh_ptrHeaderTextColor = 2; + public static final int PullToRefresh_ptrListViewExtrasEnabled = 14; + public static final int PullToRefresh_ptrMode = 4; + public static final int PullToRefresh_ptrOverScroll = 9; + public static final int PullToRefresh_ptrRefreshableViewBackground = 0; + public static final int PullToRefresh_ptrRotateDrawableWhilePulling = 15; + public static final int PullToRefresh_ptrScrollingWhileRefreshingEnabled = 13; + public static final int PullToRefresh_ptrShowIndicator = 5; + public static final int PullToRefresh_ptrSubHeaderTextAppearance = 11; } } diff --git a/gen/com/thejoshwa/ultrasonic/androidapp/R.java b/gen/com/thejoshwa/ultrasonic/androidapp/R.java index 33c2b8fd..7adeb426 100644 --- a/gen/com/thejoshwa/ultrasonic/androidapp/R.java +++ b/gen/com/thejoshwa/ultrasonic/androidapp/R.java @@ -19,18 +19,19 @@ public final class R { public static final int slide_out_to_top=0x7f040007; } public static final class array { - public static final int bufferLengthNames=0x7f0b0009; + public static final int bufferLengthNames=0x7f0b000a; public static final int bufferLengthValues=0x7f0b0008; public static final int cacheSizeNames=0x7f0b0005; public static final int cacheSizeValues=0x7f0b0004; + public static final int incrementTimeValues=0x7f0b0009; public static final int maxBitrateNames=0x7f0b0007; public static final int maxBitrateValues=0x7f0b0006; - public static final int networkTimeoutNames=0x7f0b000b; - public static final int networkTimeoutValues=0x7f0b000a; + public static final int networkTimeoutNames=0x7f0b000c; + public static final int networkTimeoutValues=0x7f0b000b; public static final int preloadCountNames=0x7f0b0003; public static final int preloadCountValues=0x7f0b0002; - public static final int searchNames=0x7f0b000d; - public static final int searchValues=0x7f0b000c; + public static final int searchNames=0x7f0b000e; + public static final int searchValues=0x7f0b000d; public static final int themeNames=0x7f0b0001; public static final int themeValues=0x7f0b0000; } @@ -858,12 +859,12 @@ or to a theme attribute in the form "?[package:][type:]na public static final int select_album_n_songs_unpinned=0x7f0d0002; } public static final class string { - public static final int background_task_loading=0x7f08011e; - public static final int background_task_network_error=0x7f080120; - public static final int background_task_no_network=0x7f08011f; - public static final int background_task_not_found=0x7f080121; - public static final int background_task_parse_error=0x7f080122; - public static final int background_task_wait=0x7f08011d; + public static final int background_task_loading=0x7f08011f; + public static final int background_task_network_error=0x7f080121; + public static final int background_task_no_network=0x7f080120; + public static final int background_task_not_found=0x7f080122; + public static final int background_task_parse_error=0x7f080123; + public static final int background_task_wait=0x7f08011e; public static final int button_bar_browse=0x7f080019; public static final int button_bar_home=0x7f080018; public static final int button_bar_now_playing=0x7f08001c; @@ -920,9 +921,9 @@ or to a theme attribute in the form "?[package:][type:]na public static final int download_repeat_single=0x7f080080; public static final int download_visualizer_off=0x7f080082; public static final int download_visualizer_on=0x7f080081; - public static final int equalizer_enabled=0x7f08012f; - public static final int equalizer_label=0x7f08012e; - public static final int equalizer_preset=0x7f080130; + public static final int equalizer_enabled=0x7f080130; + public static final int equalizer_label=0x7f08012f; + public static final int equalizer_preset=0x7f080131; public static final int error_label=0x7f080091; public static final int help_back=0x7f080046; public static final int help_close=0x7f080047; @@ -968,14 +969,14 @@ or to a theme attribute in the form "?[package:][type:]na public static final int menu_settings=0x7f080036; public static final int music_library_label=0x7f080055; public static final int music_library_label_offline=0x7f080056; - public static final int music_service_retry=0x7f08011c; - public static final int parser_artist_count=0x7f08012a; - public static final int parser_not_authenticated=0x7f080128; - public static final int parser_not_authorized=0x7f080129; - public static final int parser_reading=0x7f080124; - public static final int parser_reading_done=0x7f080125; - public static final int parser_upgrade_client=0x7f080126; - public static final int parser_upgrade_server=0x7f080127; + public static final int music_service_retry=0x7f08011d; + public static final int parser_artist_count=0x7f08012b; + public static final int parser_not_authenticated=0x7f080129; + public static final int parser_not_authorized=0x7f08012a; + public static final int parser_reading=0x7f080125; + public static final int parser_reading_done=0x7f080126; + public static final int parser_upgrade_client=0x7f080127; + public static final int parser_upgrade_server=0x7f080128; public static final int play_video_loading=0x7f08004a; public static final int play_video_noplugin=0x7f08004b; public static final int playlist_label=0x7f080040; @@ -1017,13 +1018,13 @@ or to a theme attribute in the form "?[package:][type:]na public static final int select_album_play_all=0x7f08005e; public static final int select_album_searching=0x7f08005d; public static final int select_album_select=0x7f080058; - public static final int select_artist_all_folders=0x7f08012d; + public static final int select_artist_all_folders=0x7f08012e; public static final int select_artist_empty=0x7f080066; - public static final int select_artist_folder=0x7f08012c; - public static final int select_artist_refresh=0x7f08012b; + public static final int select_artist_folder=0x7f08012d; + public static final int select_artist_refresh=0x7f08012c; public static final int select_genre_empty=0x7f080067; public static final int select_playlist_empty=0x7f080068; - public static final int service_connecting=0x7f080123; + public static final int service_connecting=0x7f080124; public static final int settings_appearance_title=0x7f0800ab; public static final int settings_buffer_length=0x7f0800e4; public static final int settings_buffer_length_1=0x7f0800e6; @@ -1062,6 +1063,7 @@ or to a theme attribute in the form "?[package:][type:]na public static final int settings_hide_media_summary=0x7f0800de; public static final int settings_hide_media_title=0x7f0800dd; public static final int settings_hide_media_toast=0x7f0800df; + public static final int settings_increment_time=0x7f080119; public static final int settings_invalid_url=0x7f0800a9; public static final int settings_invalid_username=0x7f0800aa; public static final int settings_max_albums=0x7f080105; @@ -1159,22 +1161,22 @@ or to a theme attribute in the form "?[package:][type:]na public static final int settings_use_stream_proxy_summary=0x7f0800fe; public static final int settings_wifi_required_summary=0x7f0800be; public static final int settings_wifi_required_title=0x7f0800bd; - public static final int shuffle_endYear=0x7f08011a; - public static final int shuffle_genre=0x7f08011b; - public static final int shuffle_startYear=0x7f080119; + public static final int shuffle_endYear=0x7f08011b; + public static final int shuffle_genre=0x7f08011c; + public static final int shuffle_startYear=0x7f08011a; public static final int song_details_all=0x7f08008e; public static final int song_details_kbps=0x7f08008f; public static final int updated_playlist=0x7f08008a; public static final int updated_playlist_error=0x7f08008b; - public static final int util_bytes_format_byte=0x7f080137; - public static final int util_bytes_format_gigabyte=0x7f080134; - public static final int util_bytes_format_kilobyte=0x7f080136; - public static final int util_bytes_format_megabyte=0x7f080135; - public static final int util_no_time=0x7f080138; - public static final int util_zero_time=0x7f080139; - public static final int widget_initial_text=0x7f080131; - public static final int widget_sdcard_busy=0x7f080132; - public static final int widget_sdcard_missing=0x7f080133; + public static final int util_bytes_format_byte=0x7f080138; + public static final int util_bytes_format_gigabyte=0x7f080135; + public static final int util_bytes_format_kilobyte=0x7f080137; + public static final int util_bytes_format_megabyte=0x7f080136; + public static final int util_no_time=0x7f080139; + public static final int util_zero_time=0x7f08013a; + public static final int widget_initial_text=0x7f080132; + public static final int widget_sdcard_busy=0x7f080133; + public static final int widget_sdcard_missing=0x7f080134; } public static final class style { public static final int MenuDrawer=0x7f0a0005; diff --git a/gen/net/simonvt/menudrawer/R.java b/gen/net/simonvt/menudrawer/R.java index db959022..00d43348 100644 --- a/gen/net/simonvt/menudrawer/R.java +++ b/gen/net/simonvt/menudrawer/R.java @@ -7,47 +7,47 @@ package net.simonvt.menudrawer; public final class R { - public static final class id { - public static final int md__menu = 0x7f06000f; - public static final int mdContent = 0x7f06000c; - public static final int mdActiveViewPosition = 0x7f060011; - public static final int mdMenu = 0x7f06000d; - public static final int md__drawer = 0x7f060010; - public static final int md__content = 0x7f06000e; - } - public static final class style { - public static final int Widget_MenuDrawer = 0x7f0a0001; - public static final int Widget = 0x7f0a0000; + public static final class attr { + public static final int mdActiveIndicator = 0x7f010017; + public static final int mdAllowIndicatorAnimation = 0x7f01001d; + public static final int mdContentBackground = 0x7f010014; + public static final int mdDropShadow = 0x7f01001b; + public static final int mdDropShadowColor = 0x7f01001a; + public static final int mdDropShadowEnabled = 0x7f010018; + public static final int mdDropShadowSize = 0x7f010019; + public static final int mdMaxAnimationDuration = 0x7f01001e; + public static final int mdMenuBackground = 0x7f010015; + public static final int mdMenuSize = 0x7f010016; + public static final int mdTouchBezelSize = 0x7f01001c; + public static final int menuDrawerStyle = 0x7f010013; } public static final class color { public static final int md__defaultBackground = 0x7f090000; } - public static final class styleable { - public static final int MenuDrawer_mdMenuBackground = 1; - public static final int MenuDrawer_mdDropShadowColor = 6; - public static final int MenuDrawer_mdDropShadow = 7; - public static final int MenuDrawer_mdMenuSize = 2; - public static final int MenuDrawer_mdActiveIndicator = 3; - public static final int MenuDrawer_mdDropShadowEnabled = 4; - public static final int MenuDrawer_mdAllowIndicatorAnimation = 9; - public static final int MenuDrawer_mdTouchBezelSize = 8; - public static final int MenuDrawer_mdMaxAnimationDuration = 10; - public static final int MenuDrawer_mdDropShadowSize = 5; - public static final int[] MenuDrawer = { 0x7f010014, 0x7f010015, 0x7f010016, 0x7f010017, 0x7f010018, 0x7f010019, 0x7f01001a, 0x7f01001b, 0x7f01001c, 0x7f01001d, 0x7f01001e }; - public static final int MenuDrawer_mdContentBackground = 0; + public static final class id { + public static final int mdActiveViewPosition = 0x7f060011; + public static final int mdContent = 0x7f06000c; + public static final int mdMenu = 0x7f06000d; + public static final int md__content = 0x7f06000e; + public static final int md__drawer = 0x7f060010; + public static final int md__menu = 0x7f06000f; } - public static final class attr { - public static final int mdMenuBackground = 0x7f010015; - public static final int mdMenuSize = 0x7f010016; - public static final int mdDropShadowSize = 0x7f010019; - public static final int mdDropShadowEnabled = 0x7f010018; - public static final int mdAllowIndicatorAnimation = 0x7f01001d; - public static final int mdDropShadowColor = 0x7f01001a; - public static final int mdMaxAnimationDuration = 0x7f01001e; - public static final int mdDropShadow = 0x7f01001b; - public static final int mdTouchBezelSize = 0x7f01001c; - public static final int mdActiveIndicator = 0x7f010017; - public static final int mdContentBackground = 0x7f010014; - public static final int menuDrawerStyle = 0x7f010013; + public static final class style { + public static final int Widget = 0x7f0a0000; + public static final int Widget_MenuDrawer = 0x7f0a0001; + } + public static final class styleable { + public static final int[] MenuDrawer = { 0x7f010014, 0x7f010015, 0x7f010016, 0x7f010017, 0x7f010018, 0x7f010019, 0x7f01001a, 0x7f01001b, 0x7f01001c, 0x7f01001d, 0x7f01001e }; + public static final int MenuDrawer_mdActiveIndicator = 3; + public static final int MenuDrawer_mdAllowIndicatorAnimation = 9; + public static final int MenuDrawer_mdContentBackground = 0; + public static final int MenuDrawer_mdDropShadow = 7; + public static final int MenuDrawer_mdDropShadowColor = 6; + public static final int MenuDrawer_mdDropShadowEnabled = 4; + public static final int MenuDrawer_mdDropShadowSize = 5; + public static final int MenuDrawer_mdMaxAnimationDuration = 10; + public static final int MenuDrawer_mdMenuBackground = 1; + public static final int MenuDrawer_mdMenuSize = 2; + public static final int MenuDrawer_mdTouchBezelSize = 8; } } diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8c4020e9..d7cd7b83 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -92,6 +92,18 @@ 20 30 + + + 1000 + 2000 + 5000 + 8000 + 10000 + 12000 + 15000 + 20000 + 30000 + @string/settings.buffer_length_1 diff --git a/res/values/strings.xml b/res/values/strings.xml index d61c5be8..020fdd69 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -275,6 +275,7 @@ Default Artists Default Albums Default Songs + Skip Interval Start Year: End Year: Genre: diff --git a/res/xml/settings.xml b/res/xml/settings.xml index d5e35865..e89482f6 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -38,6 +38,49 @@ a:summary="@string/settings.show_now_playing_summary" a:title="@string/settings.show_now_playing" /> + + + + + + + + + + - - - - - - - - -