aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/menu/abstract_top_menu.xml (renamed from res/menu/select_playlist.xml)50
-rw-r--r--res/menu/select_podcasts.xml6
-rw-r--r--res/values/arrays.xml8
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/settings.xml6
5 files changed, 45 insertions, 28 deletions
diff --git a/res/menu/select_playlist.xml b/res/menu/abstract_top_menu.xml
index 68904502..98f9884e 100644
--- a/res/menu/select_playlist.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -1,25 +1,25 @@
-<?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">
- <item
- android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
- android:title="@string/menu.search"
- compat: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>
+<?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">
+ <item
+ android:id="@+id/menu_refresh"
+ android:icon="@drawable/action_refresh"
+ android:title="@string/menu.refresh"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_search"
+ android:icon="@drawable/action_search"
+ android:title="@string/menu.search"
+ compat: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>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index 6311eaca..de6b83a7 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -7,6 +7,12 @@
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
+ <item
+ android:id="@+id/menu_search"
+ android:icon="@drawable/action_search"
+ android:title="@string/menu.search"
+ compat:showAsAction="always|withText"/>
+
<item
android:id="@+id/menu_add_podcast"
android:icon="@drawable/action_exit"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6d35f984..21b500d2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -5,14 +5,16 @@
<item>@string/button_bar.browse</item>
<item>@string/button_bar.playlists</item>
<item>@string/button_bar.podcasts</item>
+ <item>@string/button_bar.bookmarks</item>
<item>@string/button_bar.chat</item>
</string-array>
<string-array name="drawerItemsDescriptions">
<item>Home</item>
- <item>Library</item>
- <item>Playlists</item>
- <item>Podcasts</item>
+ <item>Artist</item>
+ <item>Playlist</item>
+ <item>Podcast</item>
+ <item>Bookmark</item>
<item>Chat</item>
</string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d162cd81..4eb57348 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -30,6 +30,7 @@
<string name="button_bar.playlists">Playlists</string>
<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.chat">Chat</string>
<string name="main.welcome_title">Welcome!</string>
@@ -332,6 +333,8 @@
<string name="settings.hide_widget_summary">Hide widget after exiting app</string>
<string name="settings.podcasts_enabled">Podcasts Enabled</string>
<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="shuffle.title">Shuffle By</string>
<string name="shuffle.startYear">Start Year:</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index a53b1ee4..f83f361c 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -69,6 +69,12 @@
android:summary="@string/settings.podcasts_enabled_summary"
android:key="podcastsEnabled"
android:defaultValue="true"/>
+
+ <CheckBoxPreference
+ android:title="@string/settings.bookmarks_enabled"
+ android:summary="@string/settings.bookmarks_enabled_summary"
+ android:key="bookmarksEnabled"
+ android:defaultValue="true"/>
</PreferenceCategory>
</PreferenceScreen>