From 72f176201ee4bdb2b7057f5b5443cf232debd0c2 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 17 Jun 2020 09:38:36 +0800
Subject: Add FontPreviewFragment. Add some fonts and delete some.

---
 app/src/main/res/values/arrays.xml  | 10 ++++----
 app/src/main/res/values/strings.xml |  5 ++++
 app/src/main/res/values/styles.xml  | 48 +++++++++++++++++++++++--------------
 3 files changed, 41 insertions(+), 22 deletions(-)

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

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index e5bcf611..768f5d0c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -129,10 +129,11 @@
         <item>Noto Sans</item>
         <item>Roboto Condensed</item>
         <item>Harmonia Sans</item>
-        <item>Selawk</item>
         <item>Inter</item>
         <item>Manrope</item>
-        <item>Rubik</item>
+        <item>Caveat</item>
+        <item>Bad Script</item>
+        <item>Sriracha</item>
     </string-array>
 
     <string-array name="settings_font_family_values">
@@ -141,10 +142,11 @@
         <item>NotoSans</item>
         <item>RobotoCondensed</item>
         <item>HarmoniaSans</item>
-        <item>Selawk</item>
         <item>Inter</item>
         <item>Manrope</item>
-        <item>Rubik</item>
+        <item>Caveat</item>
+        <item>BadScript</item>
+        <item>Sriracha</item>
     </string-array>
     
     <string-array name="settings_tab_post_type">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 032a47eb..7adda6a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -352,6 +352,7 @@
     <string name="settings_swipe_up_to_hide_jump_to_next_top_level_comment_button_title">Swipe Up to Hide Jump to Next Top-level Comment Button</string>
     <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string>
     <string name="settings_font_title">Font</string>
+    <string name="settings_preview_font_title">Font Preview</string>
     <string name="settings_font_summary">Font</string>
     <string name="settings_title_font_summary">Title</string>
     <string name="settings_content_font_summary">Content</string>
@@ -772,4 +773,8 @@
     <string name="set_to_lock_screen">Set to Lock Screen</string>
     <string name="set_to_both">Set to Both</string>
 
+    <string name="default_font_font_preview">Default</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6e46c6cf..770fc6b9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -254,10 +254,6 @@
         <item name="font_family">@font/harmonia_sans</item>
     </style>
 
-    <style name="FontFamily.Selawk">
-        <item name="font_family">@font/selawk</item>
-    </style>
-
     <style name="FontFamily.Inter">
         <item name="font_family">@font/inter</item>
     </style>
@@ -266,8 +262,16 @@
         <item name="font_family">@font/manrope</item>
     </style>
 
-    <style name="FontFamily.Rubik">
-        <item name="font_family">@font/rubik</item>
+    <style name="FontFamily.Caveat">
+        <item name="font_family">@font/caveat</item>
+    </style>
+
+    <style name="FontFamily.BadScript">
+        <item name="font_family">@font/bad_script_regular</item>
+    </style>
+
+    <style name="FontFamily.Sriracha">
+        <item name="font_family">@font/sriracha_regular</item>
     </style>
 
     <style name="TitleFontFamily" />
@@ -292,10 +296,6 @@
         <item name="title_font_family">@font/harmonia_sans</item>
     </style>
 
-    <style name="TitleFontFamily.Selawk">
-        <item name="title_font_family">@font/selawk</item>
-    </style>
-
     <style name="TitleFontFamily.Inter">
         <item name="title_font_family">@font/inter</item>
     </style>
@@ -304,8 +304,16 @@
         <item name="title_font_family">@font/manrope</item>
     </style>
 
-    <style name="TitleFontFamily.Rubik">
-        <item name="title_font_family">@font/rubik</item>
+    <style name="TitleFontFamily.Caveat">
+        <item name="title_font_family">@font/caveat</item>
+    </style>
+
+    <style name="TitleFontFamily.BadScript">
+        <item name="title_font_family">@font/bad_script_regular</item>
+    </style>
+
+    <style name="TitleFontFamily.Sriracha">
+        <item name="title_font_family">@font/sriracha_regular</item>
     </style>
 
     <style name="ContentFontFamily" />
@@ -330,10 +338,6 @@
         <item name="content_font_family">@font/harmonia_sans</item>
     </style>
 
-    <style name="ContentFontFamily.Selawk">
-        <item name="content_font_family">@font/selawk</item>
-    </style>
-
     <style name="ContentFontFamily.Inter">
         <item name="content_font_family">@font/inter</item>
     </style>
@@ -342,8 +346,16 @@
         <item name="content_font_family">@font/manrope</item>
     </style>
 
-    <style name="ContentFontFamily.Rubik">
-        <item name="content_font_family">@font/rubik</item>
+    <style name="ContentFontFamily.Caveat">
+        <item name="content_font_family">@font/caveat</item>
+    </style>
+
+    <style name="ContentFontFamily.BadScript">
+        <item name="content_font_family">@font/bad_script_regular</item>
+    </style>
+
+    <style name="ContentFontFamily.Sriracha">
+        <item name="content_font_family">@font/sriracha_regular</item>
     </style>
 
     <style name="Theme" />
-- 
cgit v1.2.3