diff options
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/directory_chooser.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/menu/downloads_completed.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/menu/downloads_log.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/menu/downloads_running.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/menu/episodes_apply_action_options.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/feeditem_options.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/menu/feedlist.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/menu/mediaplayer.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/menu/subscriptions.xml | 5 |
9 files changed, 55 insertions, 72 deletions
diff --git a/app/src/main/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml deleted file mode 100644 index e6150ac20..000000000 --- a/app/src/main/res/menu/directory_chooser.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/new_folder_item" - android:title="@string/create_folder_label" - app:icon="?attr/content_new" - app:showAsAction="ifRoom|withText" /> - <item - android:id="@+id/set_to_default_folder_item" - android:title="@string/set_to_default_folder" - app:showAsAction="collapseActionView" /> - -</menu> diff --git a/app/src/main/res/menu/downloads_completed.xml b/app/src/main/res/menu/downloads_completed.xml index 8badc4927..e07af520f 100644 --- a/app/src/main/res/menu/downloads_completed.xml +++ b/app/src/main/res/menu/downloads_completed.xml @@ -7,4 +7,10 @@ android:title="@string/multi_select" android:icon="?attr/checkbox_multiple" app:showAsAction="ifRoom" /> + <item + android:id="@+id/refresh_item" + android:title="@string/refresh_label" + android:menuCategory="container" + app:showAsAction="ifRoom" + android:icon="?attr/navigation_refresh"/> </menu> diff --git a/app/src/main/res/menu/downloads_log.xml b/app/src/main/res/menu/downloads_log.xml new file mode 100644 index 000000000..d37d9bf3f --- /dev/null +++ b/app/src/main/res/menu/downloads_log.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/clear_history_item" + android:menuCategory="container" + android:title="@string/clear_history_label" + android:icon="?attr/ic_delete" + app:showAsAction="ifRoom" /> + <item + android:id="@+id/refresh_item" + android:title="@string/refresh_label" + android:menuCategory="container" + app:showAsAction="ifRoom" + android:icon="?attr/navigation_refresh"/> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/downloads_running.xml b/app/src/main/res/menu/downloads_running.xml new file mode 100644 index 000000000..a2240d4aa --- /dev/null +++ b/app/src/main/res/menu/downloads_running.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/refresh_item" + android:title="@string/refresh_label" + android:menuCategory="container" + app:showAsAction="ifRoom" + android:icon="?attr/navigation_refresh"/> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml index c3f117386..181300fc5 100644 --- a/app/src/main/res/menu/episodes_apply_action_options.xml +++ b/app/src/main/res/menu/episodes_apply_action_options.xml @@ -33,7 +33,7 @@ <item android:id="@+id/check_all" android:title="@string/all_label"/> <item android:id="@+id/check_none" - android:title="@string/none_label"/> + android:title="@string/select_none_label"/> <item android:id="@+id/check_played" android:title="@string/played_label"/> <item android:id="@+id/check_unplayed" diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml index e415ff85a..c29229e37 100644 --- a/app/src/main/res/menu/feeditem_options.xml +++ b/app/src/main/res/menu/feeditem_options.xml @@ -71,29 +71,7 @@ <item android:id="@+id/share_item" android:menuCategory="container" - android:title="@string/share_label"> - <menu> - <item - android:id="@+id/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <item - android:id="@+id/share_link_with_position_item" - android:menuCategory="container" - android:title="@string/share_link_with_position_label" /> - <item - android:id="@+id/share_download_url_item" - android:menuCategory="container" - android:title="@string/share_item_url_label" /> - <item - android:id="@+id/share_download_url_with_position_item" - android:menuCategory="container" - android:title="@string/share_item_url_with_position_label" /> - <item - android:id="@+id/share_file" - android:menuCategory="container" - android:title="@string/share_file_label" /> - </menu> + android:title="@string/share_label_with_ellipses"> </item> <item diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 939a51ab2..3614cfffa 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -52,19 +52,25 @@ android:title="@string/visit_website_label" android:visible="true"> </item> + <item - android:id="@+id/share_link_item" - android:menuCategory="container" - custom:showAsAction="collapseActionView" - android:title="@string/share_website_url_label"> - </item> - <item - android:id="@+id/share_download_url_item" + android:id="@+id/share_item" android:menuCategory="container" - custom:showAsAction="collapseActionView" - android:title="@string/share_feed_url_label"> + custom:showAsAction="never" + android:title="@string/share_label_with_ellipses"> + <menu> + <item + android:id="@+id/share_link_item" + android:title="@string/share_website_url_label"> + </item> + <item + android:id="@+id/share_download_url_item" + android:title="@string/share_feed_url_label"> + </item> + </menu> </item> + <item android:id="@+id/rename_item" android:menuCategory="container" diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index a61616ce9..8afdba369 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -62,28 +62,6 @@ android:id="@+id/share_item" android:menuCategory="container" custom:showAsAction="never" - android:title="@string/share_label"> - <menu> - <item - android:id="@+id/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <item - android:id="@+id/share_link_with_position_item" - android:menuCategory="container" - android:title="@string/share_link_with_position_label" /> - <item - android:id="@+id/share_download_url_item" - android:menuCategory="container" - android:title="@string/share_item_url_label" /> - <item - android:id="@+id/share_download_url_with_position_item" - android:menuCategory="container" - android:title="@string/share_item_url_with_position_label" /> - <item - android:id="@+id/share_file" - android:menuCategory="container" - android:title="@string/share_file_label" /> - </menu> + android:title="@string/share_label_with_ellipses"> </item> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index 1780592d5..8009061e5 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -9,6 +9,11 @@ custom:showAsAction="always" android:icon="?attr/navigation_refresh"/> + + <item + android:id="@+id/subscriptions_filter" + android:title="@string/filter" + custom:showAsAction="never" /> <item android:id="@+id/subscription_num_columns" android:title="@string/subscription_num_columns" |