Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-03 02:27:31 +01:00
Code Issues Releases Wiki Activity

Fix more on Random, new icons, new help

Browse Source
This commit is contained in:
Joshua Bahnsen 2013-04-29 23:06:01 -07:00
parent 5c1c7c7bbd
commit aaf3029b19
21 changed files with 231 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
package="com.thejoshwa.ultrasonic.androidapp"
a:installLocation="auto"
a:versionCode="12"
a:versionName="1.1.0.8" >
a:versionCode="13"
a:versionName="1.1.0.9" >
<uses-permission a:name="android.permission.INTERNET" />
<uses-permission a:name="android.permission.READ_PHONE_STATE" />

89
assets/html/en/index.html
View File

@ -1,97 +1,44 @@
<html>
<head>
<title>UltraSonic Help</title>
<title>About UltraSonic</title>
<link rel="stylesheet" href="../style.css" type="text/css">
</head>
<body>
<h3><img src="../img/ultrasonic.png" alt=""> Welcome to UltraSonic</h3>
<h3><img src="../img/ultrasonic.png" alt="">UltraSonic</h3>
<p>
With <b>UltraSonic</b> you can easily stream or download music from your home computer to your Android phone
(and do lots of other cool stuff too).
With <b>UltraSonic</b> you can easily stream or download music from your home computer to your Android phone using
the Subsonic media streamer. The Subsonic server software requires additional configuration separate from UltraSonic. For more information or to
install the Subsonic server software on your computer, please visit <a href="http://subsonic.org">subsonic.org</a>. The basic version of Subsonic is free.
When you first install Subsonic, the premium features are available for 30 days so you can try them out before deciding to upgrade.
Click <a href="http://www.subsonic.org/pages/premium.jsp">here</a> to upgrade to Subsonic Premium.
</p>
<p>
To install the Subsonic server software on your computer, please visit <a href="http://subsonic.org">subsonic.org</a>.
It's available for Windows, Mac, Linux and Unix.
By default, UltraSonic is not configured. Once you've set up your own server, please go to <b>Settings</b> and change the configuration
so that it connects to your own computer.
</p>
<p>
By default, this program is not configured. Once you've set up your own
server, please go to <b>Settings</b> and change the configuration so that it connects to your own computer.
</p>
<p>
You can use this program freely for 30 days. After that you will have to make a donation to the Subsonic project.
As a donor you get the following benefits:
</p>
<ul>
<li>Unlimited streaming and download to any number of iPhone and Android phones.</li>
<li>Video streaming.</li>
<li>A personal web address for your Subsonic server (<em>yourname</em>.subsonic.org).</li>
<li>No ads in the Subsonic web interface.</li>
<li>Free access to new premium features.</li>
</ul>
<p>
The suggested donation amount is <b>&euro;20</b>, but you can give any amount you like.
If you are pleased with UltraSonic, please click "Donate" to help further development. This donation is separate from the Subsonic server software and does not grant you access to the premium features of Subsonic.
</p>
<p>
Click one of the buttons to go to PayPal where you can pay by credit card or by using your PayPal account.
Once the donation is processed, you will receive a license key by email.
</p>
<table>
<tr>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3RTGWJRNAW2PU"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">&euro;10</td>
</tr>
</table>
</td>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UCUUB2TYE4PGN"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">&euro;20</td>
</tr>
</table>
</td>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3M6TFHWEPSU44"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">&euro;25</td>
</tr>
</table>
</td>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5KP7LPQU77UAS"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">&euro;30</td>
</tr>
</table>
</td>
</tr>
</table>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="TVZ3F8DRFJ2JN">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
<p>
For more information, please visit <a href="http://subsonic.org/">subsonic.org</a>. Source code for UltraSonic is available at <a href="https://github.com/archrival/Subsonic-Android">github.com</a>.
To submit feature requests or file bug reports, please visit the UltraSonic for Android <a href="http://forum.subsonic.org/forum/viewforum.php?f=17">forum</a>. Source code for UltraSonic is available at <a href="https://github.com/archrival/Subsonic-Android">github.com</a>.
</p>
</body>

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

@ -67,10 +67,10 @@ public final class R {
public static final int PullToRefresh_ptrHeaderSubTextColor = 3;
}
public static final class drawable {
public static final int indicator_bg_top = 0x7f020044;
public static final int indicator_bg_bottom = 0x7f020043;
public static final int indicator_bg_top = 0x7f020043;
public static final int indicator_bg_bottom = 0x7f020042;
public static final int default_ptr_flip = 0x7f02000c;
public static final int indicator_arrow = 0x7f020042;
public static final int indicator_arrow = 0x7f020041;
public static final int default_ptr_rotate = 0x7f02000d;
}
public static final class attr {

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

@ -176,15 +176,11 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_play_next=0x7f01003e;
public static final int media_play_next=0x7f01003d;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_play_now=0x7f01003d;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_play_small=0x7f01003f;
public static final int media_play_small=0x7f01003e;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
@ -208,11 +204,11 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_stop=0x7f010040;
public static final int media_stop=0x7f01003f;
/** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
*/
public static final int media_toggle=0x7f010041;
public static final int media_toggle=0x7f010040;
/** Reference to a style for the menu drawer.
<p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
@ -466,70 +462,70 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int ic_menu_help_light=0x7f02001e;
public static final int ic_menu_home_dark=0x7f02001f;
public static final int ic_menu_home_light=0x7f020020;
public static final int ic_menu_pin_dark=0x7f020021;
public static final int ic_menu_pin_light=0x7f020022;
public static final int ic_menu_playlists_dark=0x7f020023;
public static final int ic_menu_playlists_light=0x7f020024;
public static final int ic_menu_remove_all_dark=0x7f020025;
public static final int ic_menu_remove_all_light=0x7f020026;
public static final int ic_menu_save_dark=0x7f020027;
public static final int ic_menu_save_light=0x7f020028;
public static final int ic_menu_screen_on_off_dark=0x7f020029;
public static final int ic_menu_screen_on_off_light=0x7f02002a;
public static final int ic_menu_search_dark=0x7f02002b;
public static final int ic_menu_search_light=0x7f02002c;
public static final int ic_menu_select_all_dark=0x7f02002d;
public static final int ic_menu_select_all_light=0x7f02002e;
public static final int ic_menu_select_folder_dark=0x7f02002f;
public static final int ic_menu_select_folder_light=0x7f020030;
public static final int ic_menu_settings_dark=0x7f020031;
public static final int ic_menu_settings_light=0x7f020032;
public static final int ic_menu_share_dark=0x7f020033;
public static final int ic_menu_share_light=0x7f020034;
public static final int ic_menu_unpin_dark=0x7f020035;
public static final int ic_menu_unpin_light=0x7f020036;
public static final int ic_star_full_dark=0x7f020037;
public static final int ic_star_full_light=0x7f020038;
public static final int ic_star_hollow_dark=0x7f020039;
public static final int ic_star_hollow_light=0x7f02003a;
public static final int ic_stat_downloaded_dark=0x7f02003b;
public static final int ic_stat_downloaded_light=0x7f02003c;
public static final int ic_stat_downloading_dark=0x7f02003d;
public static final int ic_stat_downloading_light=0x7f02003e;
public static final int ic_stat_play_dark=0x7f02003f;
public static final int ic_stat_play_light=0x7f020040;
public static final int ic_stat_ultrasonic=0x7f020041;
public static final int indicator_arrow=0x7f020042;
public static final int indicator_bg_bottom=0x7f020043;
public static final int indicator_bg_top=0x7f020044;
public static final int list_background=0x7f020045;
public static final int list_focused_holo=0x7f020046;
public static final int list_longpressed_holo=0x7f020047;
public static final int list_pressed_holo_dark=0x7f020048;
public static final int list_pressed_holo_light=0x7f020049;
public static final int list_selector_background_transition_holo_dark=0x7f02004a;
public static final int list_selector_background_transition_holo_light=0x7f02004b;
public static final int list_selector_disabled_holo_dark=0x7f02004c;
public static final int list_selector_disabled_holo_light=0x7f02004d;
public static final int list_selector_holo_dark=0x7f02004e;
public static final int list_selector_holo_light=0x7f02004f;
public static final int main_header_icon=0x7f020050;
public static final int md__category_background=0x7f020051;
public static final int md__list_focused_holo=0x7f020052;
public static final int md__list_longpressed_holo=0x7f020053;
public static final int md__list_pressed_holo_dark=0x7f020054;
public static final int md__list_selector_background_transition_holo_dark=0x7f020055;
public static final int md__list_selector_disabled_holo_dark=0x7f020056;
public static final int md__list_selector_holo_dark=0x7f020057;
public static final int media_backward_normal=0x7f020058;
public static final int media_backward_normal_dark=0x7f020059;
public static final int media_backward_normal_light=0x7f02005a;
public static final int media_forward_normal=0x7f02005b;
public static final int media_forward_normal_dark=0x7f02005c;
public static final int media_forward_normal_light=0x7f02005d;
public static final int media_pause_normal=0x7f02005e;
public static final int media_pause_normal_dark=0x7f02005f;
public static final int media_pause_normal_light=0x7f020060;
public static final int ic_menu_pin=0x7f020021;
public static final int ic_menu_playlists_dark=0x7f020022;
public static final int ic_menu_playlists_light=0x7f020023;
public static final int ic_menu_remove_all_dark=0x7f020024;
public static final int ic_menu_remove_all_light=0x7f020025;
public static final int ic_menu_save_dark=0x7f020026;
public static final int ic_menu_save_light=0x7f020027;
public static final int ic_menu_screen_on_off_dark=0x7f020028;
public static final int ic_menu_screen_on_off_light=0x7f020029;
public static final int ic_menu_search_dark=0x7f02002a;
public static final int ic_menu_search_light=0x7f02002b;
public static final int ic_menu_select_all_dark=0x7f02002c;
public static final int ic_menu_select_all_light=0x7f02002d;
public static final int ic_menu_select_folder_dark=0x7f02002e;
public static final int ic_menu_select_folder_light=0x7f02002f;
public static final int ic_menu_settings_dark=0x7f020030;
public static final int ic_menu_settings_light=0x7f020031;
public static final int ic_menu_share_dark=0x7f020032;
public static final int ic_menu_share_light=0x7f020033;
public static final int ic_menu_unpin_dark=0x7f020034;
public static final int ic_menu_unpin_light=0x7f020035;
public static final int ic_star_full_dark=0x7f020036;
public static final int ic_star_full_light=0x7f020037;
public static final int ic_star_hollow_dark=0x7f020038;
public static final int ic_star_hollow_light=0x7f020039;
public static final int ic_stat_downloaded_dark=0x7f02003a;
public static final int ic_stat_downloaded_light=0x7f02003b;
public static final int ic_stat_downloading_dark=0x7f02003c;
public static final int ic_stat_downloading_light=0x7f02003d;
public static final int ic_stat_play_dark=0x7f02003e;
public static final int ic_stat_play_light=0x7f02003f;
public static final int ic_stat_ultrasonic=0x7f020040;
public static final int indicator_arrow=0x7f020041;
public static final int indicator_bg_bottom=0x7f020042;
public static final int indicator_bg_top=0x7f020043;
public static final int list_background=0x7f020044;
public static final int list_focused_holo=0x7f020045;
public static final int list_longpressed_holo=0x7f020046;
public static final int list_pressed_holo_dark=0x7f020047;
public static final int list_pressed_holo_light=0x7f020048;
public static final int list_selector_background_transition_holo_dark=0x7f020049;
public static final int list_selector_background_transition_holo_light=0x7f02004a;
public static final int list_selector_disabled_holo_dark=0x7f02004b;
public static final int list_selector_disabled_holo_light=0x7f02004c;
public static final int list_selector_holo_dark=0x7f02004d;
public static final int list_selector_holo_light=0x7f02004e;
public static final int main_header_icon=0x7f02004f;
public static final int md__category_background=0x7f020050;
public static final int md__list_focused_holo=0x7f020051;
public static final int md__list_longpressed_holo=0x7f020052;
public static final int md__list_pressed_holo_dark=0x7f020053;
public static final int md__list_selector_background_transition_holo_dark=0x7f020054;
public static final int md__list_selector_disabled_holo_dark=0x7f020055;
public static final int md__list_selector_holo_dark=0x7f020056;
public static final int media_backward_normal=0x7f020057;
public static final int media_backward_normal_dark=0x7f020058;
public static final int media_backward_normal_light=0x7f020059;
public static final int media_forward_normal=0x7f02005a;
public static final int media_forward_normal_dark=0x7f02005b;
public static final int media_forward_normal_light=0x7f02005c;
public static final int media_pause_normal=0x7f02005d;
public static final int media_pause_normal_dark=0x7f02005e;
public static final int media_pause_normal_light=0x7f02005f;
public static final int media_play_next=0x7f020060;
public static final int media_play_next_dark=0x7f020061;
public static final int media_play_next_light=0x7f020062;
public static final int media_play_now_dark=0x7f020063;
@ -606,20 +602,20 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int download_equalizer=0x7f0600a5;
public static final int download_jukebox=0x7f0600a7;
public static final int download_list=0x7f06003d;
public static final int download_next=0x7f06002d;
public static final int download_pause=0x7f06002a;
public static final int download_next=0x7f06002e;
public static final int download_pause=0x7f06002c;
public static final int download_playlist_flipper=0x7f060033;
public static final int download_position=0x7f060038;
public static final int download_previous=0x7f060029;
public static final int download_previous=0x7f06002a;
public static final int download_progress_bar=0x7f06003e;
public static final int download_repeat=0x7f06002e;
public static final int download_shuffle=0x7f060028;
public static final int download_repeat=0x7f06002f;
public static final int download_shuffle=0x7f060029;
public static final int download_song_title=0x7f060032;
public static final int download_star=0x7f06002f;
public static final int download_start=0x7f06002c;
public static final int download_star=0x7f060030;
public static final int download_start=0x7f06002b;
public static final int download_status=0x7f060031;
public static final int download_stop=0x7f06002b;
public static final int download_toggle_list=0x7f060030;
public static final int download_stop=0x7f06002d;
public static final int download_toggle_list=0x7f060028;
public static final int download_visualizer=0x7f0600a6;
public static final int download_visualizer_view_layout=0x7f060036;
public static final int equalizer_bar=0x7f060044;
@ -821,10 +817,12 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int select_artist_context=0x7f0e0005;
}
public static final class plurals {
public static final int select_album_donate_dialog_n_trial_days_left=0x7f0d0003;
public static final int select_album_donate_dialog_n_trial_days_left=0x7f0d0005;
public static final int select_album_n_songs=0x7f0d0000;
public static final int select_album_n_songs_added=0x7f0d0002;
public static final int select_album_n_songs_added=0x7f0d0003;
public static final int select_album_n_songs_downloading=0x7f0d0001;
public static final int select_album_n_songs_play_next=0x7f0d0004;
public static final int select_album_n_songs_unpinned=0x7f0d0002;
}
public static final class string {
public static final int background_task_loading=0x7f080101;

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
res/drawable-xhdpi/ic_menu_pin_dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
res/drawable-xhdpi/ic_menu_pin_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
res/drawable-xhdpi/ic_menu_unpin_dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
res/drawable-xhdpi/ic_menu_unpin_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
res/drawable-xhdpi/media_repeat_all.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
res/drawable-xhdpi/media_repeat_single.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

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

@ -26,6 +26,16 @@
a:paddingBottom="12dip"
a:paddingTop="12dip" >
<ImageView
a:id="@+id/download_toggle_list"
a:layout_width="0dip"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:paddingRight="4dip"
a:src="?attr/media_toggle" />
<ImageView
a:id="@+id/download_shuffle"
a:layout_width="0dip"
@ -44,6 +54,15 @@
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_previous" />
<ImageView
a:id="@+id/download_start"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_play" />
<ImageView
a:id="@+id/download_pause"
@ -63,15 +82,6 @@
a:focusable="true"
a:src="?attr/media_stop" />
<ImageView
a:id="@+id/download_start"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_play" />
<ImageView
a:id="@+id/download_next"
a:layout_width="0dp"
@ -99,15 +109,6 @@
a:gravity="center_vertical"
a:src="?attr/star_hollow" />
<ImageView
a:id="@+id/download_toggle_list"
a:layout_width="0dip"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:paddingRight="4dip"
a:src="?attr/media_toggle" />
</LinearLayout>
<TextView

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

@ -72,6 +72,16 @@
a:paddingBottom="12dip"
a:paddingTop="12dip" >
<ImageView
a:id="@+id/download_toggle_list"
a:layout_width="0dip"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:paddingRight="4dip"
a:src="?attr/media_toggle" />
<ImageView
a:id="@+id/download_shuffle"
a:layout_width="0dip"
@ -90,6 +100,15 @@
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_previous" />
<ImageView
a:id="@+id/download_start"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_play" />
<ImageView
a:id="@+id/download_pause"
@ -109,15 +128,6 @@
a:focusable="true"
a:src="?attr/media_stop" />
<ImageView
a:id="@+id/download_start"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_play" />
<ImageView
a:id="@+id/download_next"
a:layout_width="0dp"
@ -145,15 +155,6 @@
a:focusable="true"
a:src="?attr/star_hollow" />
<ImageView
a:id="@+id/download_toggle_list"
a:layout_width="0dip"
a:layout_height="match_parent"
a:layout_gravity="center_vertical"
a:layout_weight="1"
a:focusable="true"
a:paddingRight="4dip"
a:src="?attr/media_toggle" />
</LinearLayout>
<include layout="@layout/download_slider" />

2
res/layout/album_buttons.xml
View File

@ -19,7 +19,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="?attr/media_play_now"
android:src="?attr/media_play"
android:visibility="gone" />
<ImageView

22
res/values-fr/strings.xml
View File

@ -53,7 +53,7 @@
<string name="help.title">Bienvenue dans UltraSonic !</string>
<string name="help.back">Retour</string>
<string name="help.close">Fermer</string>
<string name="help.url">file:///android_asset/html/fr/index.html</string>
<string name="help.url">file:///android_asset/html/en/index.html</string>
<string name="help.loading">Chargement&#8230;</string>
<string name="play_video.loading">Chargement de la vidéo&#8230;</string>
<string name="play_video.noplugin">Veuillez installer Adobe Flash Player à partir du Google Play Store.</string>
@ -228,7 +228,7 @@
<string name="settings.use_stream_proxy">Utiliser un proxy</string>
<string name="settings.use_stream_proxy_summary">Support de lecture de flux à travers un proxy (peut provoquer des fritures)</string>
<string name="settings.show_now_playing">Montrer lecture en cours</string>
<string name="settings.show_now_playing_summary">Afficher jouant actuellement piste dans toutes les activités</string>
<string name="settings.show_now_playing_summary">Afficher les pistes en cours de lecture dans les autres activités d\'Ultrasonic</string>
<string name="settings.max_albums">Albums maximum</string>
<string name="settings.search_1">1</string>
<string name="settings.search_3">3</string>
@ -286,13 +286,21 @@
<item quantity="other">%d titres</item>
</plurals>
<plurals name="select_album_n_songs_downloading">
<item quantity="one">Un titre prévu pour téléchargement.</item>
<item quantity="other">%d titres prévus pour téléchargement.</item>
</plurals>
<item quantity="one">Un titre sélectionnée pour être épinglé.</item>
<item quantity="other">%d titres sélectionnée pour être épinglé.</item>
</plurals>
<plurals name="select_album_n_songs_unpinned">
<item quantity="one">Un titre sélectionné pour être dégoupillé.</item>
<item quantity="other">%d titres sélectionnés pour être dégoupillé.</item>
</plurals>
<plurals name="select_album_n_songs_added">
<item quantity="one">Un titre ajouté à la file de lecture.</item>
<item quantity="other">%d titres ajoutées à la file de lecture.</item>
<item quantity="one">Un titre ajouté à la fin de la file d\'attente de lecture.</item>
<item quantity="other">%d titres ajouté à la fin de la file d\'attente de lecture.</item>
</plurals>
<plurals name="select_album_n_songs_play_next">
<item quantity="one">Un titre inséré après le titre actuel.</item>
<item quantity="other">%d titres insérés après le titre actuel.</item>
</plurals>
<plurals name="select_album_donate_dialog_n_trial_days_left">
<item quantity="one">Un jour restant à la période d\'essai</item>
<item quantity="other">%d jours restant à la période d\'essai</item>

20
res/values-hu/strings.xml
View File

@ -286,16 +286,24 @@
<item quantity="other">%d dal</item>
</plurals>
<plurals name="select_album_n_songs_downloading">
<item quantity="one">1 dal letöltésre ütemezve.</item>
<item quantity="other">%d dal letöltésre ütemezve.</item>
</plurals>
<item quantity="one">1 dal kiválasztva kell csapolni.</item>
<item quantity="other">%d dal kiválasztva kell csapolni.</item>
</plurals>
<plurals name="select_album_n_songs_unpinned">
<item quantity="one">1 dal kiválasztva a leválasztani.</item>
<item quantity="other">%d dal kiválasztva a leválasztani.</item>
</plurals>
<plurals name="select_album_n_songs_added">
<item quantity="one">1 dal hozzáadva a lejátszási sorhoz.</item>
<item quantity="other">%d dal hozzáadva a lejátszási sorhoz.</item>
<item quantity="one">1 dal bekerül a nap végére sor.</item>
<item quantity="other">%d dal bekerül a nap végére sor.</item>
</plurals>
<plurals name="select_album_n_songs_play_next">
<item quantity="one">1 dal egészül aktuális dalt.</item>
<item quantity="other">%d dal egészül aktuális dalt.</item>
</plurals>
<plurals name="select_album_donate_dialog_n_trial_days_left">
<item quantity="one">1 nap van hátra a próba időszakból.</item>
<item quantity="other">%d nap van hátra a próba időszakból.</item>
</plurals>
</resources>
</resources>

22
res/values/strings.xml
View File

@ -281,17 +281,25 @@
<string name="util.zero_time">0:00</string>
<plurals name="select_album_n_songs">
<item quantity="zero">No Songs</item>
<item quantity="one">1 Song</item>
<item quantity="other">%d Songs</item>
<item quantity="zero">No songs</item>
<item quantity="one">1 song</item>
<item quantity="other">%d songs</item>
</plurals>
<plurals name="select_album_n_songs_downloading">
<item quantity="one">1 song scheduled for download.</item>
<item quantity="other">%d Songs scheduled for download.</item>
<item quantity="one">1 song selected to be pinned.</item>
<item quantity="other">%d songs selected to be pinned.</item>
</plurals>
<plurals name="select_album_n_songs_unpinned">
<item quantity="one">1 song selected to be unpinned.</item>
<item quantity="other">%d songs selected to be unpinned.</item>
</plurals>
<plurals name="select_album_n_songs_added">
<item quantity="one">1 song added to play queue.</item>
<item quantity="other">%d songs added to play queue.</item>
<item quantity="one">1 song added to the end of play queue.</item>
<item quantity="other">%d songs added to the end of play queue.</item>
</plurals>
<plurals name="select_album_n_songs_play_next">
<item quantity="one">1 song inserted after current song.</item>
<item quantity="other">%d songs inserted after current song.</item>
</plurals>
<plurals name="select_album_donate_dialog_n_trial_days_left">
<item quantity="one">1 day left of trial period</item>

1
res/values/styles.xml
View File

@ -76,7 +76,6 @@
<attr name="media_repeat_single" format="reference"/>
<attr name="media_shuffle" format="reference"/>
<attr name="media_play" format="reference"/>
<attr name="media_play_now" format="reference"/>
<attr name="media_play_next" format="reference"/>
<attr name="media_play_small" format="reference"/>
<attr name="media_stop" format="reference"/>

10
res/values/themes.xml
View File

@ -12,7 +12,7 @@
<item name="forward">@drawable/ic_menu_forward_dark</item>
<item name="help">@drawable/ic_menu_help_dark</item>
<item name="home">@drawable/ic_menu_home_dark</item>
<item name="pin">@drawable/ic_menu_pin_dark</item>
<item name="pin">@drawable/ic_menu_pin</item>
<item name="unpin">@drawable/ic_menu_unpin_dark</item>
<item name="playlists">@drawable/ic_menu_playlists_dark</item>
<item name="remove_all">@drawable/ic_menu_remove_all_dark</item>
@ -32,8 +32,7 @@
<item name="media_repeat_single">@drawable/media_repeat_single</item>
<item name="media_shuffle">@drawable/media_shuffle_normal_dark</item>
<item name="media_play">@drawable/media_start_normal_dark</item>
<item name="media_play_now">@drawable/media_play_now_dark</item>
<item name="media_play_next">@drawable/media_play_next_dark</item>
<item name="media_play_next">@drawable/media_play_next</item>
<item name="media_play_small">@drawable/ic_stat_play_dark</item>
<item name="media_stop">@drawable/media_stop_normal_dark</item>
<item name="media_toggle">@drawable/media_toggle_list_normal_dark</item>
@ -50,7 +49,7 @@
<item name="forward">@drawable/ic_menu_forward_light</item>
<item name="help">@drawable/ic_menu_help_light</item>
<item name="home">@drawable/ic_menu_home_light</item>
<item name="pin">@drawable/ic_menu_pin_light</item>
<item name="pin">@drawable/ic_menu_pin</item>
<item name="unpin">@drawable/ic_menu_unpin_light</item>
<item name="playlists">@drawable/ic_menu_playlists_light</item>
<item name="remove_all">@drawable/ic_menu_remove_all_light</item>
@ -70,8 +69,7 @@
<item name="media_repeat_single">@drawable/media_repeat_single</item>
<item name="media_shuffle">@drawable/media_shuffle_normal_light</item>
<item name="media_play">@drawable/media_start_normal_light</item>
<item name="media_play_now">@drawable/media_play_now_light</item>
<item name="media_play_next">@drawable/media_play_next_light</item>
<item name="media_play_next">@drawable/media_play_next</item>
<item name="media_play_small">@drawable/ic_stat_play_light</item>
<item name="media_stop">@drawable/media_stop_normal_light</item>
<item name="media_toggle">@drawable/media_toggle_list_normal_light</item>

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

@ -424,24 +424,24 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
moreButton.setVisibility(View.GONE);
} else {
moreButton.setVisibility(View.VISIBLE);
moreButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(SelectAlbumActivity.this, SelectAlbumActivity.class);
int albumListTitle = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TITLE, 0);
String type = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE);
int size = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0);
int offset = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0) + size;
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TITLE, albumListTitle);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, type);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, size);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, offset);
Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
}
});
}
moreButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(SelectAlbumActivity.this, SelectAlbumActivity.class);
int albumListTitle = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TITLE, 0);
String type = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE);
int size = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0);
int offset = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0) + size;
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TITLE, albumListTitle);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, type);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, size);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, offset);
Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
}
});
} else {
moreButton.setVisibility(View.GONE);
}
@ -548,11 +548,11 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
if (autoplay) {
Util.startActivityWithoutTransition(SelectAlbumActivity.this, DownloadActivity.class);
} else if (save) {
Util.toast(SelectAlbumActivity.this,
getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size()));
Util.toast(SelectAlbumActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_downloading, songs.size(), songs.size()));
} else if (playNext) {
Util.toast(SelectAlbumActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_play_next, songs.size(), songs.size()));
} else if (append) {
Util.toast(SelectAlbumActivity.this,
getResources().getQuantityString(R.plurals.select_album_n_songs_added, songs.size(), songs.size()));
Util.toast(SelectAlbumActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_added, songs.size(), songs.size()));
}
}
};
@ -568,7 +568,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
private void unpin() {
if (getDownloadService() != null) {
getDownloadService().unpin(getSelectedSongs());
List<MusicDirectory.Entry> songs = getSelectedSongs();
Util.toast(SelectAlbumActivity.this, getResources().getQuantityString(R.plurals.select_album_n_songs_unpinned, songs.size(), songs.size()));
getDownloadService().unpin(songs);
}
}
@ -662,7 +664,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
}
}
int listSize = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0);
final int listSize = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0);
if (songCount > 0) {
if(showHeader) {
@ -681,6 +683,21 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
moreButton.setVisibility(View.GONE);
} else {
moreButton.setVisibility(View.VISIBLE);
if (getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_RANDOM, 0) > 0) {
moreButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(SelectAlbumActivity.this, SelectAlbumActivity.class);
int offset = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0) + listSize;
intent.putExtra(Constants.INTENT_EXTRA_NAME_RANDOM, 1);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, listSize);
intent.putExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, offset);
Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
}
});
}
}
} else {
pinButton.setVisibility(View.GONE);