aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/menu/account_posts_activity.xml8
-rw-r--r--app/src/main/res/menu/account_saved_thing_activity.xml8
-rw-r--r--app/src/main/res/menu/filtered_posts_activity.xml8
-rw-r--r--app/src/main/res/menu/main_activity.xml6
-rw-r--r--app/src/main/res/menu/post_fragment.xml8
-rw-r--r--app/src/main/res/menu/view_multi_reddit_detail_activity.xml12
-rw-r--r--app/src/main/res/menu/view_subreddit_detail_activity.xml18
-rw-r--r--app/src/main/res/menu/view_user_detail_activity.xml20
-rw-r--r--app/src/main/res/values/arrays.xml12
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/xml/miscellaneous_preferences.xml11
11 files changed, 49 insertions, 66 deletions
diff --git a/app/src/main/res/menu/account_posts_activity.xml b/app/src/main/res/menu/account_posts_activity.xml
index 96174315..2d8e6578 100644
--- a/app/src/main/res/menu/account_posts_activity.xml
+++ b/app/src/main/res/menu/account_posts_activity.xml
@@ -8,14 +8,8 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_account_posts_activity"
- android:orderInCategory="2"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_account_posts_activity"
- android:orderInCategory="3"
+ android:orderInCategory="2"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/menu/account_saved_thing_activity.xml b/app/src/main/res/menu/account_saved_thing_activity.xml
index 483c27a3..4efb3689 100644
--- a/app/src/main/res/menu/account_saved_thing_activity.xml
+++ b/app/src/main/res/menu/account_saved_thing_activity.xml
@@ -9,14 +9,8 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_account_saved_thing_activity"
- android:orderInCategory="2"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_account_saved_thing_activity"
- android:orderInCategory="3"
+ android:orderInCategory="2"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/menu/filtered_posts_activity.xml b/app/src/main/res/menu/filtered_posts_activity.xml
index 6e826b5a..d4414d5b 100644
--- a/app/src/main/res/menu/filtered_posts_activity.xml
+++ b/app/src/main/res/menu/filtered_posts_activity.xml
@@ -16,14 +16,8 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_filtered_thing_activity"
- android:orderInCategory="3"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_filtered_post_activity"
- android:orderInCategory="4"
+ android:orderInCategory="3"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/menu/main_activity.xml b/app/src/main/res/menu/main_activity.xml
index f4e275bc..c043a812 100644
--- a/app/src/main/res/menu/main_activity.xml
+++ b/app/src/main/res/menu/main_activity.xml
@@ -25,12 +25,6 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_main_activity"
- android:orderInCategory="4"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_main_activity"
android:orderInCategory="5"
android:title="@string/action_change_post_layout"
diff --git a/app/src/main/res/menu/post_fragment.xml b/app/src/main/res/menu/post_fragment.xml
new file mode 100644
index 00000000..d29054d3
--- /dev/null
+++ b/app/src/main/res/menu/post_fragment.xml
@@ -0,0 +1,8 @@
+<?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/action_lazy_mode_post_fragment"
+ android:orderInCategory="100"
+ app:showAsAction="never" />
+</menu> \ No newline at end of file
diff --git a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
index c214a6d3..aabbdc96 100644
--- a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
@@ -23,26 +23,20 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_view_multi_reddit_detail_activity"
- android:orderInCategory="4"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_view_multi_reddit_detail_activity"
- android:orderInCategory="5"
+ android:orderInCategory="4"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
<item
android:id="@+id/action_edit_view_multi_reddit_detail_activity"
- android:orderInCategory="6"
+ android:orderInCategory="5"
android:title="@string/action_edit_multi_reddit"
app:showAsAction="never" />
<item
android:id="@+id/action_delete_view_multi_reddit_detail_activity"
- android:orderInCategory="7"
+ android:orderInCategory="6"
android:title="@string/action_delete_multi_reddit"
app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index cb92de44..b72aa93f 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -24,44 +24,38 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_view_subreddit_detail_activity"
- android:orderInCategory="4"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_view_subreddit_detail_activity"
- android:orderInCategory="5"
+ android:orderInCategory="4"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
<item
android:id="@+id/action_select_user_flair_view_subreddit_detail_activity"
- android:orderInCategory="6"
+ android:orderInCategory="5"
android:title="@string/action_select_user_flair"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_multireddit_view_subreddit_detail_activity"
- android:orderInCategory="7"
+ android:orderInCategory="6"
android:title="@string/action_add_to_multireddit"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_post_filter_view_subreddit_detail_activity"
- android:orderInCategory="8"
+ android:orderInCategory="7"
android:title="@string/action_add_to_post_filter"
app:showAsAction="never" />
<item
android:id="@+id/action_share_view_subreddit_detail_activity"
- android:orderInCategory="9"
+ android:orderInCategory="8"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_wiki_activity"
- android:orderInCategory="10"
+ android:orderInCategory="9"
android:title="@string/action_go_to_wiki"
app:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml
index 8d89ff08..437c6e23 100644
--- a/app/src/main/res/menu/view_user_detail_activity.xml
+++ b/app/src/main/res/menu/view_user_detail_activity.xml
@@ -21,48 +21,42 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_lazy_mode_view_user_detail_activity"
- android:orderInCategory="4"
- android:title="@string/action_start_lazy_mode"
- app:showAsAction="never" />
-
- <item
android:id="@+id/action_change_post_layout_view_user_detail_activity"
- android:orderInCategory="5"
+ android:orderInCategory="4"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
<item
android:id="@+id/action_send_private_message_view_user_detail_activity"
- android:orderInCategory="6"
+ android:orderInCategory="5"
android:title="@string/action_send_private_message"
app:showAsAction="never" />
<item
android:id="@+id/action_share_view_user_detail_activity"
- android:orderInCategory="7"
+ android:orderInCategory="6"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_multireddit_view_user_detail_activity"
- android:orderInCategory="8"
+ android:orderInCategory="7"
android:title="@string/action_add_to_multireddit"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_post_filter_view_user_detail_activity"
- android:orderInCategory="9"
+ android:orderInCategory="8"
android:title="@string/action_add_to_post_filter"
app:showAsAction="never" />
<item
android:id="@+id/action_report_view_user_detail_activity"
- android:orderInCategory="10"
+ android:orderInCategory="9"
android:title="@string/action_report" />
<item
android:id="@+id/action_block_user_view_user_detail_activity"
- android:orderInCategory="11"
+ android:orderInCategory="10"
android:title="@string/action_block_user" />
</menu>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 330abd60..e59c5abd 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -508,4 +508,16 @@
<item>86400000</item>
</string-array>
+ <string-array name="main_page_back_button_action">
+ <item>@string/default_in_array</item>
+ <item>@string/settings_confirm_to_exit</item>
+ <item>@string/settings_open_navigation_drawer</item>
+ </string-array>
+
+ <string-array name="main_page_back_button_action_values">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a66d129..203126ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,7 +190,7 @@
<string name="send_message_failed">Could not send this message</string>
<string name="select_a_subreddit">Please select a subreddit first</string>
- <string name="title_required">The post need a good title</string>
+ <string name="title_required">The post needs a good title</string>
<string name="link_required">Hey where is the link?</string>
<string name="select_an_image">Please select an image first</string>
<string name="posting">Posting</string>
@@ -391,7 +391,9 @@
<string name="settings_automatically_try_redgifs_title">Automatically Try Accessing Redgifs if Videos on Gfycat are Removed.</string>
<string name="settings_video_player_ignore_nav_bar_title">Ignore Navigation Bar in Video Player</string>
<string name="settings_video_player_ignore_nav_bar_summary">Prevent the Video Controller Having Extra Margin</string>
+ <string name="settings_main_page_back_button_action">Main Page Back Button Action</string>
<string name="settings_confirm_to_exit">Confirm to Exit</string>
+ <string name="settings_open_navigation_drawer">Open Navigation Drawer</string>
<string name="settings_category_comment_title">Comment</string>
<string name="settings_show_top_level_comments_first_title">Show Top-level Comments First</string>
<string name="settings_show_comment_divider_title">Show Comment Divider</string>
diff --git a/app/src/main/res/xml/miscellaneous_preferences.xml b/app/src/main/res/xml/miscellaneous_preferences.xml
index b17e7545..67a78aca 100644
--- a/app/src/main/res/xml/miscellaneous_preferences.xml
+++ b/app/src/main/res/xml/miscellaneous_preferences.xml
@@ -13,11 +13,14 @@
app:key="open_link_in_app"
app:title="@string/settings_open_link_in_app_title" />
- <SwitchPreference
- app:defaultValue="false"
- app:key="confirm_to_exit"
+ <ListPreference
+ app:defaultValue="0"
+ app:entries="@array/main_page_back_button_action"
+ app:entryValues="@array/main_page_back_button_action_values"
+ app:key="main_page_back_button_action"
app:icon="@drawable/ic_exit_24dp"
- app:title="@string/settings_confirm_to_exit" />
+ app:title="@string/settings_main_page_back_button_action"
+ app:useSimpleSummaryProvider="true" />
<SwitchPreference
app:defaultValue="true"