aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2021-12-20 14:16:33 +0000
committerAlex Ning <chineseperson5@gmail.com>2021-12-20 14:16:33 +0000
commita83640f01a70eabc53691ccd269711f44fc4dfd1 (patch)
treeec274023059ad1c91a71b1cea43007278f6120f0 /app/src/main/res
parentdc4fa2e6b8e27e987e8730e5d5e26a0dd2a0411d (diff)
downloadinfinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.tar
infinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.tar.gz
infinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.tar.bz2
infinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.tar.lz
infinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.tar.xz
infinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.tar.zst
infinity-for-reddit-a83640f01a70eabc53691ccd269711f44fc4dfd1.zip
Fix NSFW download location option not working. Hide options in Data Saving Mode settings if Data Saving Mode is off.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml5
-rw-r--r--app/src/main/res/xml/download_location_preferences.xml20
2 files changed, 15 insertions, 10 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d795c87..093c6213 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -516,9 +516,10 @@
<string name="settings_image_download_location_title">Image Download Location</string>
<string name="settings_gif_download_location_title">Gif Download Location</string>
<string name="settings_video_download_location_title">Video Download Location</string>
- <string name="settings_nsfw_download_location_title">NSFW Download Location</string>
- <string name="settings_nsfw_separate_folder">Separate Folder for NSFW Posts</string>
<string name="settings_separate_folder_for_each_subreddit">Separate Folder for Each Subreddit</string>
+ <string name="settings_save_nsfw_media_in_different_folder_title">Save NSFW Media in Different Location</string>
+ <string name="settings_save_nsfw_media_in_different_folder_summary">Does not separate folder for NSFW media from different subreddits even if Separate Folder for Each Subreddit is enabled.</string>
+ <string name="settings_nsfw_download_location_title">NSFW Download Location</string>
<string name="settings_swipe_action_title">Swipe Action</string>
<string name="settings_swipe_action_haptic_feedback_title">Haptic Feedback</string>
<string name="settings_disable_swiping_between_tabs_title">Disable Swiping Between Tabs</string>
diff --git a/app/src/main/res/xml/download_location_preferences.xml b/app/src/main/res/xml/download_location_preferences.xml
index 4e2c1f7a..3de56ef3 100644
--- a/app/src/main/res/xml/download_location_preferences.xml
+++ b/app/src/main/res/xml/download_location_preferences.xml
@@ -11,17 +11,21 @@
app:key="video_download_location"
app:title="@string/settings_video_download_location_title" />
- <Preference
- app:key="nsfw_download_location"
- app:title="@string/settings_nsfw_download_location_title" />
-
<SwitchPreference
app:defaultValue="false"
- app:key="separate_nsfw_folder"
- app:title="@string/settings_nsfw_separate_folder" />
+ app:key="separate_folder_for_each_subreddit"
+ app:title="@string/settings_separate_folder_for_each_subreddit" />
+
+ <PreferenceCategory
+ app:title="@string/nsfw" />
<SwitchPreference
app:defaultValue="false"
- app:key="separate_folder_for_each_subreddit"
- app:title="@string/settings_separate_folder_for_each_subreddit" />
+ app:key="save_nsfw_media_in_different_folder"
+ app:title="@string/settings_save_nsfw_media_in_different_folder_title"
+ app:summary="@string/settings_save_nsfw_media_in_different_folder_summary" />
+
+ <Preference
+ app:key="nsfw_download_location"
+ app:title="@string/settings_nsfw_download_location_title" />
</PreferenceScreen> \ No newline at end of file