From 396501e350b23667bb70728fbd60b715beffe489 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
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.

---
 app/src/main/res/xml/main_preferences.xml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'app/src/main/res/xml/main_preferences.xml')

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" />
 
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="nsfw"
+    <Preference
         app:icon="@drawable/ic_nsfw_on_24dp"
-        app:title="@string/settings_enable_nsfw_title" />
-
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="blur_nsfw"
-        app:title="@string/settings_blur_nsfw_title"
-        app:isPreferenceVisible="false" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="blur_spoiler"
-        app:title="@string/settings_blur_spoiler_title" />
+        app:title="@string/settings_nsfw_and_spoiler_title"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.NsfwAndBlurringFragment"/>
 
     <Preference
         app:title="@string/settings_advanced_master_title"
-- 
cgit v1.2.3