diff options
Diffstat (limited to 'subsonic-android/res')
20 files changed, 347 insertions, 108 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_dark.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_dark.png Binary files differnew file mode 100644 index 00000000..be04b06e --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_dark.png diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_light.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_light.png Binary files differnew file mode 100644 index 00000000..3f58695c --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_light.png diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_send_dark.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_send_dark.png Binary files differnew file mode 100644 index 00000000..bd37dc59 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_send_dark.png diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_send_light.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_send_light.png Binary files differnew file mode 100644 index 00000000..0c870d2c --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/ic_menu_chat_send_light.png diff --git a/subsonic-android/res/layout/chat.xml b/subsonic-android/res/layout/chat.xml new file mode 100644 index 00000000..fdeb5b36 --- /dev/null +++ b/subsonic-android/res/layout/chat.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <include layout="@layout/tab_progress" /> + + <ListView + android:id="@+id/chat_entries" + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1.0" + android:textFilterEnabled="true" /> + + <LinearLayout + android:layout_height="4dip" + android:layout_width="fill_parent" + android:layout_marginTop="4dip"/> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="bottom" > + + <EditText + android:id="@+id/chat_edittext" + android:layout_width="0dip" + android:layout_height="40dip" + android:layout_weight="1" + android:autoLink="all" + android:hint="@string/chat.send_a_message" + android:inputType="textEmailAddress|textMultiLine" + android:linksClickable="true" + android:paddingBottom="10dip" + android:paddingTop="10dip" /> + + <ImageButton + android:id="@+id/chat_send" + android:layout_width="60dip" + android:layout_height="40dip" + android:src="?attr/chat_send" /> + + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/subsonic-android/res/layout/chat_item.xml b/subsonic-android/res/layout/chat_item.xml new file mode 100644 index 00000000..b44631d1 --- /dev/null +++ b/subsonic-android/res/layout/chat_item.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/chat_username" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:ellipsize="marquee" + android:singleLine="true" + android:text="User" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:textColorSecondary"/> + + <LinearLayout + android:id="@+id/chat_message_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:orientation="horizontal" > + + <TextView + android:id="@+id/chat_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:singleLine="true" + android:text="00:00" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/chat_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:autoLink="all" + android:linksClickable="true" + android:singleLine="false" + android:text="Message Text Goes Here" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/subsonic-android/res/layout/chat_item_reverse.xml b/subsonic-android/res/layout/chat_item_reverse.xml new file mode 100644 index 00000000..62695521 --- /dev/null +++ b/subsonic-android/res/layout/chat_item_reverse.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/chat_username" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="6dip" + android:gravity="right" + android:layout_gravity="right" + android:ellipsize="marquee" + android:singleLine="true" + android:text="User" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:textColorSecondary"/> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:orientation="horizontal" + android:layout_gravity="right" > + + <TextView + android:id="@+id/chat_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:singleLine="true" + android:gravity="right" + android:text="00:00" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/chat_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:autoLink="all" + android:linksClickable="true" + android:singleLine="false" + android:gravity="right" + android:text="Chat message" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml index fe79716c..a2a46a1e 100644 --- a/subsonic-android/res/layout/main.xml +++ b/subsonic-android/res/layout/main.xml @@ -25,10 +25,10 @@ <ImageView android:id="@+id/album_art" - android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_width="50dip" + android:layout_height="50dip" android:layout_gravity="left|center" - android:scaleType="fitXY" + android:scaleType="fitStart" android:src="@drawable/unknown_album"/> <LinearLayout diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml index e8be57f0..1e60838d 100644 --- a/subsonic-android/res/layout/main_buttons.xml +++ b/subsonic-android/res/layout/main_buttons.xml @@ -128,6 +128,18 @@ android:paddingLeft="6dip"
android:paddingRight="6dip"
android:minHeight="50dip"/>
+ <TextView
+ android:id="@+id/main_albums_genres"
+ android:text="@string/main.albums_genres"
+ android:drawableRight="@drawable/list_item_more"
+ android:drawablePadding="6dip"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+ android:minHeight="50dip"/>
<TextView
android:id="@+id/main_albums_random"
android:text="@string/main.albums_random"
diff --git a/subsonic-android/res/layout/select_genres.xml b/subsonic-android/res/layout/select_genres.xml new file mode 100644 index 00000000..95f9d415 --- /dev/null +++ b/subsonic-android/res/layout/select_genres.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/select_genre_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <include layout="@layout/tab_progress" /> + + <TextView + android:id="@+id/select_genre_empty" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="10dip" + android:text="@string/select_genre.empty" + android:visibility="gone" /> + + <ListView + android:id="@+id/select_genre_list" + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1.0" + android:textFilterEnabled="true" + android:fastScrollEnabled="true"/> + </LinearLayout> +</FrameLayout>
\ No newline at end of file diff --git a/subsonic-android/res/layout/shuffle_dialog.xml b/subsonic-android/res/layout/shuffle_dialog.xml index 2a21dc11..e78aba33 100644 --- a/subsonic-android/res/layout/shuffle_dialog.xml +++ b/subsonic-android/res/layout/shuffle_dialog.xml @@ -66,6 +66,14 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginLeft="4dp" - android:hint="@string/shuffle.genre" /> + android:hint="@string/shuffle.genre"/> + + <Button + android:id="@+id/genre_combo" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginLeft="4dp" + android:text="@string/shuffle.genre"/> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/subsonic-android/res/menu/chat.xml b/subsonic-android/res/menu/chat.xml new file mode 100644 index 00000000..e0f9a718 --- /dev/null +++ b/subsonic-android/res/menu/chat.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_refresh" + android:icon="@drawable/action_refresh" + android:title="@string/menu.refresh" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> +</menu>
\ No newline at end of file diff --git a/subsonic-android/res/menu/select_genres.xml b/subsonic-android/res/menu/select_genres.xml new file mode 100644 index 00000000..e0f9a718 --- /dev/null +++ b/subsonic-android/res/menu/select_genres.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_refresh" + android:icon="@drawable/action_refresh" + android:title="@string/menu.refresh" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> +</menu>
\ No newline at end of file diff --git a/subsonic-android/res/raw/changelog.xml b/subsonic-android/res/raw/changelog.xml index 18636dda..14f59866 100644 --- a/subsonic-android/res/raw/changelog.xml +++ b/subsonic-android/res/raw/changelog.xml @@ -1,7 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> <changelog> + <release version="4.0.3" versioncode="52" releasedate="5/31/2013"> + <change>Sort by disc number if specified in tags</change> + <change>Show starred artists in starred list</change> + <change>Change folder.jpg to albumart.jpg which galleries shouldn't display</change> + <change>Fix Show Album</change> + <change>Added support for server Ignored Articles (future server version) + defaults to server's defaults</change> + <change>On network error return to front of the app instead of exiting all the way</change> + <change>Fix occasional crash when going back into app after running for a while</change> + <change>Various minor bugfixes</change> + </release> + <release version="4.0.2" versioncode="51" releasedate="5/24/2013"> + <change>Fix if you set chat refresh rate to 0, will just not refresh</change> + <change>Revert dark theme modification</change> + <change>New Theme called black which is the pure black background</change> + <change>Option to disable chat menu, need to exit app and reenter for now</change> + </release> + + <release version="4.0.1" versioncode="50" releasedate="5/23/2013"> + <change>New: Chat Tab (Set chat auto refresh rate from settings)</change> + <change>New: Dynamic servers, add as many, or remove all but the ones you are using</change> + <change>New: Added separate setting for songs to preload for Wifi/Mobile</change> + <change>Improvement: The infinite playlist while shuffling is now persistent between startups</change> + <change>Theme: White is now more white, got rid of blue text for white theme only</change> + <change>Theme: Black is now a flat black due to popular request</change> + <change>Theme: Apply the current theme to settings screen</change> + <change>Fix: Don't stretch album art on bottom of main tabs</change> + <change>Fix: Possible fix for some who were having crash on starting EQ</change> + </release> + <release version="4.0.0" versioncode="48" releasedate="5/16/2013"> - <change>Converted everything to fragments!</change> + <change>Converted everything to fragments!</change> <change>Swipe to switch tabs</change> <change>Breadcrumb trail when going down several levels</change> <change>Require double tapping back to exit app</change> @@ -13,5 +42,5 @@ <change>Added total time to playlist/album headers</change> <change>Fixed a lot of the menu items not working when using search</change> <change>Update to Light/Dark themes</change> - </release> + </release> </changelog>
\ No newline at end of file diff --git a/subsonic-android/res/values-ru/strings.xml b/subsonic-android/res/values-ru/strings.xml index a74d7f61..73569d9d 100644 --- a/subsonic-android/res/values-ru/strings.xml +++ b/subsonic-android/res/values-ru/strings.xml @@ -307,6 +307,23 @@ <string name="util.bytes_format.kilobyte">0 КБ</string>
<string name="util.bytes_format.byte">0 Б</string>
+ <string name="button_bar.chat">Чат</string>
+ <string name="main.back_confirm">Нажмите "назад" еще раз для выхода</string>
+ <string name="download.playing_out_of">Воспроизведение: %1$d/%2$d</string>
+ <string name="settings.persistent_title">Постоянное уведомление</string>
+ <string name="settings.persistent_summary">Показывать уведомление даже во время паузы. Остановка воспроизведения уберет это уведомление.</string>
+ <string name="settings.gapless_playback">Непрерывное воспроизведение</string>
+ <string name="settings.gapless_playback_summary">Galaxy S3 может зависать или испытывать прочие трудности с момента начала непрерывного воспроизведения. Выключите эту функцию для исправления данной проблемы.</string>
+ <string name="settings.chat_refresh">Частота обновления чата (сек)</string>
+ <string name="settings.chat_enabled">Чат активен</string>
+ <string name="settings.chat_enabled_summary">Показывать или нет вкладку чата</string>
+ <string name="changelog_full_title">Журнал изменений</string>
+ <string name="changelog_title">Что нового</string>
+ <string name="changelog_ok_button">OK</string>
+ <string name="changelog_show_full">Еще…</string>
+ <string name="chat.send_a_message">Отправить сообщение</string>
+
+
<plurals name="select_album_n_songs">
<item quantity="zero">Нет композиций</item>
<item quantity="one">1 композиция</item>
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml index 75ad2bea..80cc4fad 100644 --- a/subsonic-android/res/values/arrays.xml +++ b/subsonic-android/res/values/arrays.xml @@ -4,18 +4,22 @@ <string-array name="themeValues"> <item>light</item> <item>dark</item> + <item>black</item> <item>holo</item> <item>light_fullscreen</item> <item>dark_fullscreen</item> + <item>black_fullscreen</item> <item>holo_fullscreen</item> </string-array> <string-array name="themeNames"> <item>@string/settings.theme_light</item> <item>@string/settings.theme_dark</item> + <item>@string/settings.theme_black</item> <item>@string/settings.theme_holo</item> <item>@string/settings.theme_light_fullscreen</item> <item>@string/settings.theme_dark_fullscreen</item> + <item>@string/settings.theme_black_fullscreen</item> <item>@string/settings.theme_holo_fullscreen</item> </string-array> diff --git a/subsonic-android/res/values/attrs.xml b/subsonic-android/res/values/attrs.xml index e5d8984f..8f669cd2 100644 --- a/subsonic-android/res/values/attrs.xml +++ b/subsonic-android/res/values/attrs.xml @@ -7,4 +7,6 @@ <attr name="media_button_repeat_off" format="reference"/> <attr name="media_button_start" format="reference"/> <attr name="media_button_stop" format="reference"/> + <attr name="chat" format="reference"/> + <attr name="chat_send" format="reference" /> </resources> diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index 7f03003e..b5e8f3e1 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -28,6 +28,7 @@ <string name="button_bar.search">Search</string>
<string name="button_bar.playlists">Playlists</string>
<string name="button_bar.now_playing">Playing</string>
+ <string name="button_bar.chat">Chat</string>
<string name="main.welcome_title">Welcome!</string>
<string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve
@@ -50,6 +51,7 @@ <string name="main.albums_highest">Top rated</string>
<string name="main.albums_starred">Starred</string>
<string name="main.albums_random">Random</string>
+ <string name="main.albums_genres">Genres</string>
<string name="main.back_confirm">Press back again to exit</string>
<string name="menu.search">Search</string>
@@ -113,6 +115,8 @@ <string name="select_album.donate_dialog_later">Later</string>
<string name="select_album.donate_dialog_0_trial_days_left">Trial period is over</string>
+ <string name="select_genre.empty">No genres found</string>
+
<string name="select_playlist.empty">No saved playlists on server</string>
<string name="download.empty">Playlist is empty</string>
@@ -175,15 +179,18 @@ <string name="settings.title">DSub settings</string>
<string name="settings.test_connection_title">Test connection</string>
+ <string name="settings.servers_add">Add Server</string>
+ <string name="settings.servers_remove">Remove Server</string>
<string name="settings.servers_title">Servers</string>
- <string name="settings.server_unused1">Unused 1</string>
- <string name="settings.server_unused2">Unused 2</string>
+ <string name="settings.server_unused">Unused</string>
<string name="settings.server_name">Name</string>
<string name="settings.server_address">Server address</string>
<string name="settings.server_username">Username</string>
<string name="settings.server_password">Password</string>
+ <string name="settings.server_open_browser">Open in browser</string>
<string name="settings.cache_title">Music cache</string>
- <string name="settings.preload">Songs to preload</string>
+ <string name="settings.preload_wifi">Songs to preload (Wifi)</string>
+ <string name="settings.preload_mobile">Songs to preload (Mobile)</string>
<string name="settings.cache_size">Cache size (MB)</string>
<string name="settings.cache_location">Cache location</string>
<string name="settings.cache_location_error">Invalid cache location. Using default.</string>
@@ -197,9 +204,11 @@ <string name="settings.theme_title">Theme</string>
<string name="settings.theme_light">Light</string>
<string name="settings.theme_dark">Dark</string>
+ <string name="settings.theme_black">Black</string>
<string name="settings.theme_holo">Holo</string>
<string name="settings.theme_light_fullscreen">Light Fullscreen</string>
<string name="settings.theme_dark_fullscreen">Dark Fullscreen</string>
+ <string name="settings.theme_black_fullscreen">Black Fullscreen</string>
<string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>
<string name="settings.network_title">Network</string>
<string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>
@@ -270,10 +279,14 @@ <string name="settings.persistent_summary">Show the notification even after pausing. Press the stop button to clear it away.</string>
<string name="settings.gapless_playback">Gapless Playback</string>
<string name="settings.gapless_playback_summary">The Galaxy S3 seems to be experiencing freezes/other weird issue since the introduction of gapless playback. Turn this off to fix the issue.</string>
-
+ <string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>
+ <string name="settings.chat_enabled">Chat Enabled</string>
+ <string name="settings.chat_enabled_summary">Whether or not to display the chat tab. Restart app after changing.</string>
+
<string name="shuffle.startYear">Start Year:</string>
<string name="shuffle.endYear">End Year:</string>
<string name="shuffle.genre">Genre:</string>
+ <string name="shuffle.pick_genre">Pick a genre</string>
<string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>
@@ -320,6 +333,8 @@ <string name="changelog_ok_button">OK</string>
<string name="changelog_show_full">More…</string>
+ <string name="chat.send_a_message">Send a message</string>
+
<string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string>
<plurals name="select_album_n_songs">
diff --git a/subsonic-android/res/values/themes.xml b/subsonic-android/res/values/themes.xml index 2389365f..33dd2de7 100644 --- a/subsonic-android/res/values/themes.xml +++ b/subsonic-android/res/values/themes.xml @@ -3,8 +3,6 @@ <style name="Theme.DSub.Light" parent="Theme.Sherlock.Light"> <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item> <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item> - <item name="android:textColorSecondary">@color/cyan</item> - <item name="android:windowBackground">@color/lightBackground</item> <item name="offline_icon">@drawable/main_offline_light</item> <item name="media_button_backward">@drawable/media_backward_light</item> <item name="media_button_forward">@drawable/media_forward_light</item> @@ -12,6 +10,8 @@ <item name="media_button_repeat_off">@drawable/media_repeat_off_light</item> <item name="media_button_start">@drawable/media_start_light</item> <item name="media_button_stop">@drawable/media_stop_light</item> + <item name="chat">@drawable/ic_menu_chat_light</item> + <item name="chat_send">@drawable/ic_menu_chat_send_light</item> </style> <style name="Theme.DSub.Dark" parent="Theme.Sherlock"> <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> @@ -24,6 +24,11 @@ <item name="media_button_repeat_off">@drawable/media_repeat_off</item> <item name="media_button_start">@drawable/media_start</item> <item name="media_button_stop">@drawable/media_stop</item> + <item name="chat">@drawable/ic_menu_chat_dark</item> + <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> + </style> + <style name="Theme.DSub.Black" parent="Theme.DSub.Dark"> + <item name="android:windowBackground">@android:color/black</item> </style> <style name="Theme.DSub.Holo" parent="Theme.Sherlock"> <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item> @@ -37,6 +42,8 @@ <item name="media_button_repeat_off">@drawable/media_repeat_off</item> <item name="media_button_start">@drawable/media_start</item> <item name="media_button_stop">@drawable/media_stop</item> + <item name="chat">@drawable/ic_menu_chat_dark</item> + <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> </style> <style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light"> @@ -45,6 +52,9 @@ <style name="Theme.DSub.Dark.Fullscreen" parent="Theme.DSub.Dark"> <item name="android:windowFullscreen">true</item> </style> + <style name="Theme.DSub.Black.Fullscreen" parent="Theme.DSub.Black"> + <item name="android:windowFullscreen">true</item> + </style> <style name="Theme.DSub.Holo.Fullscreen" parent="Theme.DSub.Holo"> <item name="android:windowFullscreen">true</item> </style> diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml index d21f928f..17a51621 100644 --- a/subsonic-android/res/xml/settings.xml +++ b/subsonic-android/res/xml/settings.xml @@ -4,102 +4,12 @@ android:title="@string/settings.title"> <PreferenceCategory + android:key="server" android:title="@string/settings.servers_title"> - <PreferenceScreen - android:key="server1"> - - <EditTextPreference - android:key="serverName1" - android:title="@string/settings.server_name" - android:defaultValue="Subsonic demo"/> - - <EditTextPreference - android:key="serverUrl1" - android:title="@string/settings.server_address" - android:defaultValue="http://demo.subsonic.org" - android:inputType="textUri"/> - - <EditTextPreference - android:key="username1" - android:title="@string/settings.server_username" - android:defaultValue="android-guest"/> - - <EditTextPreference - android:key="password1" - android:title="@string/settings.server_password" - android:password="true" - android:defaultValue="guest" - android:summary="****"/> - - <Preference - android:key="testConnection1" - android:title="@string/settings.test_connection_title" - android:persistent="false"/> - - </PreferenceScreen> - - <PreferenceScreen - android:key="server2"> - - <EditTextPreference - android:key="serverName2" - android:title="@string/settings.server_name" - android:defaultValue="@string/settings.server_unused1"/> - - <EditTextPreference - android:key="serverUrl2" - android:title="@string/settings.server_address" - android:defaultValue="http://yourhost" - android:inputType="textUri"/> - - <EditTextPreference - android:key="username2" - android:title="@string/settings.server_username"/> - - <EditTextPreference - android:key="password2" - android:title="@string/settings.server_password" - android:password="true" - android:summary="****"/> - - <Preference - android:key="testConnection2" - android:title="@string/settings.test_connection_title" - android:persistent="false"/> - - </PreferenceScreen> - - <PreferenceScreen - android:key="server3"> - - <EditTextPreference - android:key="serverName3" - android:title="@string/settings.server_name" - android:defaultValue="@string/settings.server_unused2"/> - - <EditTextPreference - android:key="serverUrl3" - android:title="@string/settings.server_address" - android:defaultValue="http://yourhost" - android:inputType="textUri"/> - - <EditTextPreference - android:key="username3" - android:title="@string/settings.server_username"/> - - <EditTextPreference - android:key="password3" - android:title="@string/settings.server_password" - android:password="true" - android:summary="****"/> - - <Preference - android:key="testConnection3" - android:title="@string/settings.test_connection_title" - android:persistent="false"/> - - </PreferenceScreen> + <Preference + android:key="serverAdd" + android:title="@string/settings.servers_add"/> </PreferenceCategory> @@ -204,14 +114,37 @@ android:key="cacheLocation"/> <ListPreference - android:title="@string/settings.preload" - android:key="preloadCount" + android:title="@string/settings.preload_wifi" + android:key="preloadCountWifi" + android:defaultValue="3" + android:entryValues="@array/preloadCountValues" + android:entries="@array/preloadCountNames"/> + + <ListPreference + android:title="@string/settings.preload_mobile" + android:key="preloadCountMobile" android:defaultValue="3" android:entryValues="@array/preloadCountValues" android:entries="@array/preloadCountNames"/> </PreferenceCategory> + <PreferenceCategory + android:title="@string/button_bar.chat"> + + <CheckBoxPreference + android:title="@string/settings.chat_enabled" + android:summary="@string/settings.chat_enabled_summary" + android:key="chatEnabled" + android:defaultValue="true"/> + + <EditTextPreference + android:title="@string/settings.chat_refresh" + android:key="chatRefreshRate" + android:defaultValue="30" + android:digits="0123456789"/> + </PreferenceCategory> + <PreferenceCategory android:title="@string/settings.other_title"> |
