diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-07-07 18:58:41 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-07-07 18:58:41 -0400 |
| commit | 0d2f99a1a7a473fc6abf1b23ff8b712ab1fb7c62 (patch) | |
| tree | f34ce94823ff6a7f49796dbc0cd89a93ec09766f /app/src/main/res | |
| parent | 1f0a6a14bba0b4620d286d8217e53271e6edaca2 (diff) | |
| parent | 9cae7c5bfbe252158ddfa6195519db2dbb0a950e (diff) | |
| download | AntennaPod-0d2f99a1a7a473fc6abf1b23ff8b712ab1fb7c62.zip | |
Merge pull request #994 from mfietz/redesign-new-state
Drawer: Feed context menu, counter and order
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/nav_feed_context.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 27 |
2 files changed, 42 insertions, 4 deletions
diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml new file mode 100644 index 000000000..4bf067d25 --- /dev/null +++ b/app/src/main/res/menu/nav_feed_context.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/mark_all_seen_item" + android:menuCategory="container" + android:title="@string/mark_all_seen_label" /> + + <item + android:id="@+id/mark_all_read_item" + android:menuCategory="container" + android:title="@string/mark_all_read_label" /> + + <item + android:id="@+id/remove_item" + android:menuCategory="container" + android:title="@string/remove_feed_label" /> + +</menu> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 04699bac1..9f93662de 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -9,10 +9,29 @@ android:key="prefTheme" android:summary="@string/pref_set_theme_sum" android:defaultValue="0"/> - <Preference - android:key="prefHiddenDrawerItems" - android:summary="@string/pref_nav_drawer_items_sum" - android:title="@string/pref_nav_drawer_items_title" /> + <PreferenceScreen + android:key="prefDrawerSettings" + android:summary="@string/pref_nav_drawer_sum" + android:title="@string/pref_nav_drawer_title"> + <Preference + android:key="prefHiddenDrawerItems" + android:summary="@string/pref_nav_drawer_items_sum" + android:title="@string/pref_nav_drawer_items_title" /> + <ListPreference + android:entryValues="@array/nav_drawer_feed_order_values" + android:entries="@array/nav_drawer_feed_order_options" + android:title="@string/pref_nav_drawer_feed_order_title" + android:key="prefDrawerFeedOrder" + android:summary="@string/pref_nav_drawer_feed_order_sum" + android:defaultValue="0"/> + <ListPreference + android:entryValues="@array/nav_drawer_feed_counter_values" + android:entries="@array/nav_drawer_feed_counter_options" + android:title="@string/pref_nav_drawer_feed_counter_title" + android:key="prefDrawerFeedIndicator" + android:summary="@string/pref_nav_drawer_feed_counter_sum" + android:defaultValue="0"/> + </PreferenceScreen> <CheckBoxPreference android:defaultValue="false" android:enabled="true" |