aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2022-02-11 15:08:16 +0000
committerAlex <docilealligator.app@gmail.com>2022-02-12 14:05:22 +0000
commitc64b6ef2293754b337d7b0a91358a819cd77ffd9 (patch)
treeb2302a2183731e3e4c521ddfdcc6b6852268d92e /app/src/main/res
parent79cc6ddf1ee979d9a5c3cac2d426bf94813cef1f (diff)
downloadinfinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.tar
infinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.tar.gz
infinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.tar.bz2
infinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.tar.lz
infinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.tar.xz
infinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.tar.zst
infinity-for-reddit-c64b6ef2293754b337d7b0a91358a819cd77ffd9.zip
Version 5.1.8. Add Reddit User Agreement to settings. Move Privacy Policy option from About to main settings page.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml6
-rw-r--r--app/src/main/res/xml/about_preferences.xml4
-rw-r--r--app/src/main/res/xml/main_preferences.xml8
3 files changed, 14 insertions, 4 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcb4d083..ce9583e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -630,6 +630,7 @@
<string name="settings_show_fewer_toolbar_options_threshold_title">Show Fewer Toolbar Options Starting From</string>
<string name="settings_show_fewer_toolbar_options_threshold_summary">Level %1$d</string>
<string name="settings_show_author_avatar_title">Hide Author Avatar</string>
+ <string name="settings_reddit_user_agreement_title">Reddit User Agreement</string>
<string name="no_link_available">Cannot get the link</string>
@@ -1264,4 +1265,9 @@
<string name="reddit_gallery_item_caption_hint">Caption (max 180 characters)</string>
<string name="reddit_gallery_item_url_hint">Url</string>
+ <string name="user_agreement_dialog_title">User Agreement</string>
+ <string name="user_agreement_message">You need to agree to Reddit User Agreement (%1$s) and Infinity for Reddit\'s Privacy Policy (%2$s) before logging in.</string>
+ <string name="agree">Agree</string>
+ <string name="do_not_agree">Don\'t Agree</string>
+
</resources>
diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml
index cff7c151..6503e6fa 100644
--- a/app/src/main/res/xml/about_preferences.xml
+++ b/app/src/main/res/xml/about_preferences.xml
@@ -47,10 +47,6 @@
app:summary="@string/settings_share_summary" />
<ml.docilealligator.infinityforreddit.customviews.CustomFontPreference
- android:key="privacy_policy"
- app:title="@string/settings_privacy_policy_title" />
-
- <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference
android:key="version"
app:title="@string/settings_version_title"
app:summary="@string/settings_version_summary" />
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 0fdba51b..107e9e52 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -87,4 +87,12 @@
app:title="@string/settings_about_master_title"
app:fragment="ml.docilealligator.infinityforreddit.settings.AboutPreferenceFragment" />
+ <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference
+ android:key="privacy_policy"
+ app:title="@string/settings_privacy_policy_title" />
+
+ <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference
+ android:key="reddit_user_agreement"
+ app:title="@string/settings_reddit_user_agreement_title" />
+
</androidx.preference.PreferenceScreen> \ No newline at end of file