From 396501e350b23667bb70728fbd60b715beffe489 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 23 Sep 2020 19:20:41 +0800 Subject: Set NSFW, NSFW blurring and spoiler blurring on a per-user basis. Only close the account section in the navigation drawer after dismissing if the account section is open. --- .../main/res/layout/fragment_nsfw_and_spoiler.xml | 113 +++++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/main_preferences.xml | 18 +--- 3 files changed, 117 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/layout/fragment_nsfw_and_spoiler.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml new file mode 100644 index 00000000..a1f53ee2 --- /dev/null +++ b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b1c6893c..b2b67754 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -392,6 +392,7 @@ Font Size Title Font Size Content Font Size + NSFW & Spoiler Enable NSFW Blur NSFW Images Blur Spoiler Images diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index f2990908..68c407ae 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -65,22 +65,10 @@ app:icon="@drawable/ic_exit_24dp" app:title="@string/settings_confirm_to_exit" /> - - - - - + app:title="@string/settings_nsfw_and_spoiler_title" + app:fragment="ml.docilealligator.infinityforreddit.Settings.NsfwAndBlurringFragment"/>