aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2021-10-08 12:21:08 +0000
committerAlex Ning <chineseperson5@gmail.com>2021-10-08 12:21:08 +0000
commit723f1c0713c9c79ac005992dfcf32a52d858dee3 (patch)
treeb6e8f4bd7b0c936aa5ee3c6c2950bd4d002da99c /app/src/main/res
parentf5a333e2ac3c3032f787d6b7f66b751aa70767ef (diff)
downloadinfinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.tar
infinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.tar.gz
infinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.tar.bz2
infinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.tar.lz
infinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.tar.xz
infinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.tar.zst
infinity-for-reddit-723f1c0713c9c79ac005992dfcf32a52d858dee3.zip
New option: Main Page Back Button Action. It replaces Confirm to Exit.
Diffstat (limited to 'app/src/main/res')
-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
3 files changed, 22 insertions, 5 deletions
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"