diff options
author | Scott Jackson <daneren2005@gmail.com> | 2016-09-28 15:35:54 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2016-09-28 15:35:54 -0700 |
commit | 6958e7943bec8680ea5b3f59315af04dfe669341 (patch) | |
tree | cfb894cd9fb2bcf5564c111b0e5a101640981662 /app/src/main/res | |
parent | 7cbd580a5b1745fb72c00de097aef19a822fc10f (diff) | |
parent | 538cb889c45559f7af54fee33801547de719fbfc (diff) | |
download | dsub-6958e7943bec8680ea5b3f59315af04dfe669341.tar.gz dsub-6958e7943bec8680ea5b3f59315af04dfe669341.tar.bz2 dsub-6958e7943bec8680ea5b3f59315af04dfe669341.zip |
Merge branch 'edge' into connection
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/menu/drawer_navigation.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/select_internet_radio_context.xml | 7 | ||||
-rw-r--r-- | app/src/main/res/menu/select_song_context.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/menu/select_song_context_offline.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/values-hu/strings.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/values/arrays.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/attrs.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/values/themes.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/changelog.xml | 11 | ||||
-rw-r--r-- | app/src/main/res/xml/settings_drawer.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/xml/settings_playback.xml | 2 |
12 files changed, 61 insertions, 5 deletions
diff --git a/app/src/main/res/menu/drawer_navigation.xml b/app/src/main/res/menu/drawer_navigation.xml index bd309455..32de5cd5 100644 --- a/app/src/main/res/menu/drawer_navigation.xml +++ b/app/src/main/res/menu/drawer_navigation.xml @@ -22,6 +22,10 @@ android:icon="?attr/drawerBookmarks" android:title="@string/button_bar.bookmarks"/> <item + android:id="@+id/drawer_internet_radio_stations" + android:icon="?attr/drawerInternetRadioStations" + android:title="@string/button_bar.internet_radio"/> + <item android:id="@+id/drawer_shares" android:icon="?attr/drawerShares" android:title="@string/button_bar.shares"/> diff --git a/app/src/main/res/menu/select_internet_radio_context.xml b/app/src/main/res/menu/select_internet_radio_context.xml new file mode 100644 index 00000000..e739aec5 --- /dev/null +++ b/app/src/main/res/menu/select_internet_radio_context.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/internet_radio_info" + android:title="@string/common.info"/> + +</menu> diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml index b68dcad9..46eaaa38 100644 --- a/app/src/main/res/menu/select_song_context.xml +++ b/app/src/main/res/menu/select_song_context.xml @@ -15,6 +15,12 @@ android:title="@string/menu.show_artist"/> </group> + <group android:id="@+id/hide_play_now"> + <item + android:id="@+id/song_menu_play_now" + android:title="@string/common.play_now"/> + </group> + <group android:id="@+id/hide_play_next"> <item android:id="@+id/song_menu_play_next" diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml index d7182068..cc914563 100644 --- a/app/src/main/res/menu/select_song_context_offline.xml +++ b/app/src/main/res/menu/select_song_context_offline.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/song_menu_info" @@ -16,6 +15,12 @@ android:title="@string/menu.show_artist"/> </group> + <group android:id="@+id/hide_play_now"> + <item + android:id="@+id/song_menu_play_now" + android:title="@string/common.play_now"/> + </group> + <group android:id="@+id/hide_play_next"> <item android:id="@+id/song_menu_play_next" diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a720b214..12102043 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -36,6 +36,7 @@ <string name="button_bar.now_playing">Várólista</string> <string name="button_bar.podcasts">Podcastok</string> <string name="button_bar.bookmarks">Könyvjelzők</string> + <string name="button_bar.internet_radio">Internet rádió</string> <string name="button_bar.shares">Megosztások</string> <string name="button_bar.chat">Csevegés (Chat)</string> <string name="button_bar.admin">Admin</string> @@ -225,6 +226,7 @@ <string name="download.playback_speed_one_half">1.5x</string> <string name="download.playback_speed_double">2x</string> <string name="download.playback_speed_tripple">3x</string> + <string name="download.playback_speed_custom">Egyéni</string> <string name="sync.new_podcasts">Új podcastok: \"%s\"</string> <string name="sync.new_playlists">Új lejátszási listák: \"%s\"</string> @@ -305,6 +307,8 @@ <string name="settings.theme_dark">Sötét</string> <string name="settings.theme_black">Fekete</string> <string name="settings.theme_holo">Holo</string> + <string name="settings.theme_day_night">Nappal/Éjszaka</string> + <string name="settings.theme_day_black_night">Nappal/Fekete éjszaka</string> <string name="settings.theme_fullscreen">Teljes képernyős</string> <string name="settings.theme_fullscreen_summary">Teljes képernyős üzemmód (értesítési sáv elrejtése).</string> <string name="settings.track_title">Dalsorszám megjelenítése</string> @@ -407,6 +411,8 @@ <string name="settings.podcasts_enabled_summary">Podcastok menüpont megjelenítése az elhúzható oldalsávon.</string> <string name="settings.bookmarks_enabled">Könyvjelzők engedélyezése</string> <string name="settings.bookmarks_enabled_summary">Könyvjelzők menüpont megjelenítése az elhúzható oldalsávon.</string> + <string name="settings.internet_radio_enabled">Internet rádió engedélyezése</string> + <string name="settings.internet_radio_enabled_summary">Internet rádió menüpont megjelenítése az elhúzható oldalsávon.</string> <string name="settings.shares_enabled">Megosztások engedélyezése</string> <string name="settings.shares_enabled_summary">Megosztások menüpont megjelenítése az elhúzható oldalsávon.</string> <string name="settings.sync_title">Szinkronizálás</string> @@ -464,7 +470,7 @@ <string name="settings.replay_gain_type.track">Dal értékeiből</string> <string name="settings.replay_gain_bump">Hangerő-kiegyenlítés előerősítése</string> <string name="settings.replay_gain_untagged">Dalok hangerő-kiegyenlítés nélkül</string> - <string name="settings.casting">Casting (Tartalmak átküldése)</string> + <string name="settings.casting">Casting (tartalmak átküldése)</string> <string name="settings.casting_proxy">Eszköz használata proxyként</string> <string name="settings.casting_proxy_summary">Streamelés az eszközön (mint egy proxyn) keresztül. Ez megoldást jelenthet néhány esetben, pl. saját aláírású tanúsítvány használatakor.</string> <string name="settings.rename_duplicates">Duplikált dalok átnevezése</string> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index ee246d16..e9aadce7 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -6,6 +6,7 @@ <item>@string/button_bar.playlists</item> <item>@string/button_bar.podcasts</item> <item>@string/button_bar.bookmarks</item> + <item>@string/button_bar.internet_radio</item> <item>@string/button_bar.shares</item> <item>@string/button_bar.chat</item> </string-array> @@ -16,6 +17,7 @@ <item>Playlist</item> <item>Podcast</item> <item>Bookmark</item> + <item>Internet Radio</item> <item>Share</item> <item>Chat</item> </string-array> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7cd447f0..055726b8 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -49,6 +49,7 @@ <attr name="drawerPlaylists" format="reference"/> <attr name="drawerPodcasts" format="reference"/> <attr name="drawerBookmarks" format="reference"/> + <attr name="drawerInternetRadioStations" format="reference"/> <attr name="drawerShares" format="reference"/> <attr name="drawerChat" format="reference"/> <attr name="drawerAdmin" format="reference"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c15a5d3e..9ac609c3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ <string name="button_bar.now_playing">Now Playing</string> <string name="button_bar.podcasts">Podcasts</string> <string name="button_bar.bookmarks">Bookmarks</string> + <string name="button_bar.internet_radio">Internet Radio</string> <string name="button_bar.shares">Shares</string> <string name="button_bar.chat">Chat</string> <string name="button_bar.admin">Admin</string> @@ -410,6 +411,8 @@ <string name="settings.podcasts_enabled_summary">Whether or not to display the podcast listing in the pull out drawer</string> <string name="settings.bookmarks_enabled">Bookmarks Enabled</string> <string name="settings.bookmarks_enabled_summary">Whether or not to display the bookmarks listing in the pull out drawer</string> + <string name="settings.internet_radio_enabled">Internet Radio Enabled</string> + <string name="settings.internet_radio_enabled_summary">Whether or not to display the internet radio listing in the pull out drawer</string> <string name="settings.shares_enabled">Shares Enabled</string> <string name="settings.shares_enabled_summary">Whether or not to display the shares listing in the pull out drawer</string> <string name="settings.sync_title">Sync</string> @@ -610,6 +613,7 @@ <string name="details.title.podcast">Podcast Details</string> <string name="details.title.playlist">Playlist Details</string> <string name="details.title.artist">Artist Details</string> + <string name="details.title.internet_radio_station">Internet Radio Details</string> <string name="details.podcast">Podcast</string> <string name="details.status">Status</string> <string name="details.artist">Artist</string> @@ -649,6 +653,8 @@ <string name="details.last_played">Last Played</string> <string name="details.expiration">Expiration</string> <string name="details.played_count">Played Count</string> + <string name="details.stream_url">Stream URL</string> + <string name="details.home_page">Home Page</string> <string name="permission.external_storage.failed">DSub cannot function without the ability to write to storage</string> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 9e95fe9d..8cccab93 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -49,6 +49,7 @@ <item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item> <item name="drawerPodcasts">@drawable/ic_menu_podcast_light</item> <item name="drawerBookmarks">@drawable/ic_menu_bookmark_light</item> + <item name="drawerInternetRadioStations">@drawable/ic_menu_radio_light</item> <item name="drawerShares">@drawable/ic_menu_share_light</item> <item name="drawerChat">@drawable/ic_menu_chat_light</item> <item name="drawerAdmin">@drawable/ic_menu_admin_light</item> @@ -120,6 +121,7 @@ <item name="drawerPlaylists">@drawable/ic_menu_playlist_dark</item> <item name="drawerPodcasts">@drawable/ic_menu_podcast_dark</item> <item name="drawerBookmarks">@drawable/ic_menu_bookmark_dark</item> + <item name="drawerInternetRadioStations">@drawable/ic_menu_radio_dark</item> <item name="drawerShares">@drawable/ic_menu_share_dark</item> <item name="drawerChat">@drawable/ic_menu_chat_dark</item> <item name="drawerAdmin">@drawable/ic_menu_admin_dark</item> diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml index 490c427a..89f076f7 100644 --- a/app/src/main/res/xml/changelog.xml +++ b/app/src/main/res/xml/changelog.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <changelog> + <release version="5.3" versioncode="186" releasedate="9/23/2016"> + <change>Listen to Radio Internet Stations</change> + <change>Automatic Day/Night theme</change> + <change>Android 6.0 runtime permissions</change> + <change>Custom variable playback speed</change> + <change>Add Play Now for songs when click action is add to queue</change> + <change>More secure connections with tokens (Subsonic 6+)</change> + <change>Auto skip uncached songs when no network</change> + <change>Shrink install size</change> + <change>Fix DLNA casting on Android 7.0+</change> + </release> <release version="5.2.2" versioncode="184" releasedate="8/30/2016"> <change>Fix lagging in landscape view on the Now Playing screen</change> </release> diff --git a/app/src/main/res/xml/settings_drawer.xml b/app/src/main/res/xml/settings_drawer.xml index 4b92737e..f89fb990 100644 --- a/app/src/main/res/xml/settings_drawer.xml +++ b/app/src/main/res/xml/settings_drawer.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub" + xmlns:myns="http://schemas.android.com/apk/res-auto" android:title="@string/settings.drawer_items_title"> <PreferenceCategory @@ -19,6 +19,12 @@ android:defaultValue="true"/> <CheckBoxPreference + android:title="@string/settings.internet_radio_enabled" + android:summary="@string/settings.internet_radio_enabled_summary" + android:key="internetRadioEnabled" + android:defaultValue="true"/> + + <CheckBoxPreference android:title="@string/settings.shares_enabled" android:summary="@string/settings.shares_enabled_summary" android:key="sharedEnabled" diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml index 566a8218..da31d071 100644 --- a/app/src/main/res/xml/settings_playback.xml +++ b/app/src/main/res/xml/settings_playback.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub" + xmlns:myns="http://schemas.android.com/apk/res-auto" android:title="@string/settings.playback_title"> <PreferenceCategory |