From 47832e1e91db7e355b8122e1b533966c8df5ddba Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 27 Sep 2019 16:58:57 +0800
Subject: Blurring spoiler post images is now available. Change spoiler and
 flair text background colors. Fixed collapsed comments shown after
 orientation change.

---
 app/src/main/res/drawable-night/ic_font_size_24dp.xml | 9 +++++++++
 app/src/main/res/drawable/ic_font_size_24dp.xml       | 9 +++++++++
 app/src/main/res/layout/item_post.xml                 | 8 ++++----
 app/src/main/res/layout/item_post_detail.xml          | 6 ++++--
 app/src/main/res/values/arrays.xml                    | 2 +-
 app/src/main/res/values/colors.xml                    | 4 ++++
 app/src/main/res/values/strings.xml                   | 3 ++-
 app/src/main/res/xml/main_preferences.xml             | 6 ++++++
 8 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/ic_font_size_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_font_size_24dp.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-night/ic_font_size_24dp.xml b/app/src/main/res/drawable-night/ic_font_size_24dp.xml
new file mode 100644
index 00000000..44c361be
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_font_size_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_font_size_24dp.xml b/app/src/main/res/drawable/ic_font_size_24dp.xml
new file mode 100644
index 00000000..b2ef0e15
--- /dev/null
+++ b/app/src/main/res/drawable/ic_font_size_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 058d53ae..624331a6 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -204,8 +204,8 @@
                 android:padding="4dp"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
-                app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
-                app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
+                app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
+                app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
 
@@ -220,8 +220,8 @@
                 android:padding="4dp"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
-                app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
-                app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
+                app:lib_setRoundedBGColor="@color/flairBackgroundColor"
+                app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
 
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 09a99591..d0647265 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -209,7 +209,8 @@
             android:padding="4dp"
             android:visibility="gone"
             app:lib_setRadius="3dp"
-            app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+            app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
+            app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
             app:lib_setRoundedView="true"
             app:lib_setShape="rectangle" />
 
@@ -224,7 +225,8 @@
             android:textColor="@android:color/white"
             android:visibility="gone"
             app:lib_setRadius="3dp"
-            app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+            app:lib_setRoundedBGColor="@color/flairBackgroundColor"
+            app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
             app:lib_setRoundedView="true"
             app:lib_setShape="rectangle" />
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f50fe519..602a3f00 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -90,7 +90,7 @@
         <item>Normal</item>
         <item>Large</item>
         <item>Extra Large</item>
-        <item>Enormous Large</item>
+        <item>Enormously Large</item>
     </string-array>
 
     <string-array name="settings_content_font_size_values">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a08640f7..811089f3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -75,4 +75,8 @@
     <color name="submitter">#EE8A02</color>
 
     <color name="moderator">#00BA81</color>
+
+    <color name="spoilerBackgroundColor">#EE02EB</color>
+
+    <color name="flairBackgroundColor">#00AA8C</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8cba1f9..c898353c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -278,7 +278,8 @@
     <string name="settings_title_font_size_title">Title Font Size</string>
     <string name="settings_content_font_size_title">Content Font Size</string>
     <string name="settings_enable_nsfw_title">Enable NSFW</string>
-    <string name="settings_blur_nsfw_title">Blur NSFW images</string>
+    <string name="settings_blur_nsfw_title">Blur NSFW Images</string>
+    <string name="settings_blur_spoiler_title">Blur Spoiler Images</string>
     <string name="settings_layout_no_limits_title">Display Under Navigation bar and Status Bar</string>
     <string name="settings_about_master_title">About</string>
     <string name="settings_acknowledgement_master_title">Acknowledgement</string>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 6567eb1b..a4b8506f 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -26,6 +26,7 @@
 
     <Preference
         app:title="@string/settings_font_size_title"
+        app:icon="@drawable/ic_font_size_24dp"
         app:fragment="Settings.FontSizePreferenceFragment" />
 
     <SwitchPreference
@@ -39,6 +40,11 @@
         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" />
+
     <Preference
         app:title="@string/settings_about_master_title"
         app:fragment="Settings.AboutPreferenceFragment" />
-- 
cgit v1.2.3