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/font/bad_script_regular.ttf       | Bin 0 -> 50768 bytes
 app/src/main/res/font/caveat.xml                   |  12 ++
 app/src/main/res/font/caveat_bold.ttf              | Bin 0 -> 335416 bytes
 app/src/main/res/font/caveat_regular.ttf           | Bin 0 -> 330800 bytes
 app/src/main/res/font/inter.xml                    |   5 -
 app/src/main/res/font/inter_light.ttf              | Bin 288088 -> 0 bytes
 app/src/main/res/font/manrope.xml                  |   5 -
 app/src/main/res/font/manrope_light.ttf            | Bin 92412 -> 0 bytes
 app/src/main/res/font/roboto_condensed.xml         |  10 --
 app/src/main/res/font/roboto_condensed_light.ttf   | Bin 167568 -> 0 bytes
 .../res/font/roboto_condensed_light_italic.ttf     | Bin 174908 -> 0 bytes
 app/src/main/res/font/rubik.xml                    |  32 ------
 app/src/main/res/font/rubik_bold.ttf               | Bin 136068 -> 0 bytes
 app/src/main/res/font/rubik_bold_italic.ttf        | Bin 139280 -> 0 bytes
 app/src/main/res/font/rubik_italic.ttf             | Bin 136160 -> 0 bytes
 app/src/main/res/font/rubik_light.ttf              | Bin 130688 -> 0 bytes
 app/src/main/res/font/rubik_light_italic.ttf       | Bin 133940 -> 0 bytes
 app/src/main/res/font/rubik_regular.ttf            | Bin 133376 -> 0 bytes
 app/src/main/res/font/selawk.xml                   |  17 ---
 app/src/main/res/font/selawk_bold.ttf              | Bin 44068 -> 0 bytes
 app/src/main/res/font/selawk_light.ttf             | Bin 44232 -> 0 bytes
 app/src/main/res/font/selawk_regular.ttf           | Bin 44224 -> 0 bytes
 app/src/main/res/font/sriracha_regular.ttf         | Bin 0 -> 309724 bytes
 app/src/main/res/layout/fragment_font_preview.xml  | 128 +++++++++++++++++++++
 app/src/main/res/values/arrays.xml                 |  10 +-
 app/src/main/res/values/strings.xml                |   5 +
 app/src/main/res/values/styles.xml                 |  48 +++++---
 app/src/main/res/xml/font_preferences.xml          |   4 +
 28 files changed, 185 insertions(+), 91 deletions(-)
 create mode 100644 app/src/main/res/font/bad_script_regular.ttf
 create mode 100644 app/src/main/res/font/caveat.xml
 create mode 100644 app/src/main/res/font/caveat_bold.ttf
 create mode 100644 app/src/main/res/font/caveat_regular.ttf
 delete mode 100644 app/src/main/res/font/inter_light.ttf
 delete mode 100644 app/src/main/res/font/manrope_light.ttf
 delete mode 100644 app/src/main/res/font/roboto_condensed_light.ttf
 delete mode 100644 app/src/main/res/font/roboto_condensed_light_italic.ttf
 delete mode 100644 app/src/main/res/font/rubik.xml
 delete mode 100644 app/src/main/res/font/rubik_bold.ttf
 delete mode 100644 app/src/main/res/font/rubik_bold_italic.ttf
 delete mode 100644 app/src/main/res/font/rubik_italic.ttf
 delete mode 100644 app/src/main/res/font/rubik_light.ttf
 delete mode 100644 app/src/main/res/font/rubik_light_italic.ttf
 delete mode 100644 app/src/main/res/font/rubik_regular.ttf
 delete mode 100644 app/src/main/res/font/selawk.xml
 delete mode 100644 app/src/main/res/font/selawk_bold.ttf
 delete mode 100644 app/src/main/res/font/selawk_light.ttf
 delete mode 100644 app/src/main/res/font/selawk_regular.ttf
 create mode 100644 app/src/main/res/font/sriracha_regular.ttf
 create mode 100644 app/src/main/res/layout/fragment_font_preview.xml

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

diff --git a/app/src/main/res/font/bad_script_regular.ttf b/app/src/main/res/font/bad_script_regular.ttf
new file mode 100644
index 00000000..7dc02d4a
Binary files /dev/null and b/app/src/main/res/font/bad_script_regular.ttf differ
diff --git a/app/src/main/res/font/caveat.xml b/app/src/main/res/font/caveat.xml
new file mode 100644
index 00000000..57393ffd
--- /dev/null
+++ b/app/src/main/res/font/caveat.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="400"
+        app:font="@font/caveat_regular" />
+
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="700"
+        app:font="@font/caveat_bold" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/caveat_bold.ttf b/app/src/main/res/font/caveat_bold.ttf
new file mode 100644
index 00000000..e7e6a837
Binary files /dev/null and b/app/src/main/res/font/caveat_bold.ttf differ
diff --git a/app/src/main/res/font/caveat_regular.ttf b/app/src/main/res/font/caveat_regular.ttf
new file mode 100644
index 00000000..278a61c8
Binary files /dev/null and b/app/src/main/res/font/caveat_regular.ttf differ
diff --git a/app/src/main/res/font/inter.xml b/app/src/main/res/font/inter.xml
index 3a0d1784..6b7e74f3 100644
--- a/app/src/main/res/font/inter.xml
+++ b/app/src/main/res/font/inter.xml
@@ -9,9 +9,4 @@
         app:fontStyle="normal"
         app:fontWeight="700"
         app:font="@font/inter_bold" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="300"
-        app:font="@font/inter_light" />
 </font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/inter_light.ttf b/app/src/main/res/font/inter_light.ttf
deleted file mode 100644
index 8a2b98b5..00000000
Binary files a/app/src/main/res/font/inter_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope.xml b/app/src/main/res/font/manrope.xml
index 0193f184..d9db58d6 100644
--- a/app/src/main/res/font/manrope.xml
+++ b/app/src/main/res/font/manrope.xml
@@ -9,9 +9,4 @@
         app:fontStyle="normal"
         app:fontWeight="700"
         app:font="@font/manrope_bold" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="300"
-        app:font="@font/manrope_light" />
 </font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/manrope_light.ttf b/app/src/main/res/font/manrope_light.ttf
deleted file mode 100644
index 5a771c80..00000000
Binary files a/app/src/main/res/font/manrope_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/roboto_condensed.xml b/app/src/main/res/font/roboto_condensed.xml
index e2a5da42..64811d6e 100644
--- a/app/src/main/res/font/roboto_condensed.xml
+++ b/app/src/main/res/font/roboto_condensed.xml
@@ -10,16 +10,6 @@
         app:fontWeight="700"
         app:font="@font/roboto_condensed_bold" />
 
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="300"
-        app:font="@font/roboto_condensed_light" />
-
-    <font
-        app:fontStyle="italic"
-        app:fontWeight="300"
-        app:font="@font/roboto_condensed_light_italic" />
-
     <font
         app:fontStyle="italic"
         app:fontWeight="400"
diff --git a/app/src/main/res/font/roboto_condensed_light.ttf b/app/src/main/res/font/roboto_condensed_light.ttf
deleted file mode 100644
index 43dd8f42..00000000
Binary files a/app/src/main/res/font/roboto_condensed_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/roboto_condensed_light_italic.ttf b/app/src/main/res/font/roboto_condensed_light_italic.ttf
deleted file mode 100644
index 99d491b9..00000000
Binary files a/app/src/main/res/font/roboto_condensed_light_italic.ttf and /dev/null differ
diff --git a/app/src/main/res/font/rubik.xml b/app/src/main/res/font/rubik.xml
deleted file mode 100644
index 50596309..00000000
--- a/app/src/main/res/font/rubik.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="400"
-        app:font="@font/rubik_regular" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="700"
-        app:font="@font/rubik_bold" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="300"
-        app:font="@font/rubik_light" />
-
-    <font
-        app:fontStyle="italic"
-        app:fontWeight="300"
-        app:font="@font/rubik_light_italic" />
-
-    <font
-        app:fontStyle="italic"
-        app:fontWeight="400"
-        app:font="@font/rubik_italic" />
-
-    <font
-        app:fontStyle="italic"
-        app:fontWeight="700"
-        app:font="@font/rubik_bold_italic" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/rubik_bold.ttf b/app/src/main/res/font/rubik_bold.ttf
deleted file mode 100644
index 4e77930f..00000000
Binary files a/app/src/main/res/font/rubik_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/rubik_bold_italic.ttf b/app/src/main/res/font/rubik_bold_italic.ttf
deleted file mode 100644
index f6322472..00000000
Binary files a/app/src/main/res/font/rubik_bold_italic.ttf and /dev/null differ
diff --git a/app/src/main/res/font/rubik_italic.ttf b/app/src/main/res/font/rubik_italic.ttf
deleted file mode 100644
index 2ddac98e..00000000
Binary files a/app/src/main/res/font/rubik_italic.ttf and /dev/null differ
diff --git a/app/src/main/res/font/rubik_light.ttf b/app/src/main/res/font/rubik_light.ttf
deleted file mode 100644
index 8189d848..00000000
Binary files a/app/src/main/res/font/rubik_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/rubik_light_italic.ttf b/app/src/main/res/font/rubik_light_italic.ttf
deleted file mode 100644
index 8a9ae95a..00000000
Binary files a/app/src/main/res/font/rubik_light_italic.ttf and /dev/null differ
diff --git a/app/src/main/res/font/rubik_regular.ttf b/app/src/main/res/font/rubik_regular.ttf
deleted file mode 100644
index 52b59ca4..00000000
Binary files a/app/src/main/res/font/rubik_regular.ttf and /dev/null differ
diff --git a/app/src/main/res/font/selawk.xml b/app/src/main/res/font/selawk.xml
deleted file mode 100644
index 28f46f58..00000000
--- a/app/src/main/res/font/selawk.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="400"
-        app:font="@font/selawk_regular" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="700"
-        app:font="@font/selawk_bold" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="300"
-        app:font="@font/selawk_light" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/selawk_bold.ttf b/app/src/main/res/font/selawk_bold.ttf
deleted file mode 100644
index 2134a765..00000000
Binary files a/app/src/main/res/font/selawk_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/selawk_light.ttf b/app/src/main/res/font/selawk_light.ttf
deleted file mode 100644
index cbfaaf99..00000000
Binary files a/app/src/main/res/font/selawk_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/selawk_regular.ttf b/app/src/main/res/font/selawk_regular.ttf
deleted file mode 100644
index 736bac3c..00000000
Binary files a/app/src/main/res/font/selawk_regular.ttf and /dev/null differ
diff --git a/app/src/main/res/font/sriracha_regular.ttf b/app/src/main/res/font/sriracha_regular.ttf
new file mode 100644
index 00000000..cbc699a3
Binary files /dev/null and b/app/src/main/res/font/sriracha_regular.ttf differ
diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml
new file mode 100644
index 00000000..4101473e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_font_preview.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Settings.FontPreviewFragment">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="@string/default_font_font_preview"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Balsamiq Sans"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/balsamiq_sans" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Noto Sans"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/noto_sans" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Roboto Condensed"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/roboto_condensed" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Harmonia Sans"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/harmonia_sans" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Inter"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/inter" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Manrope"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/manrope" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Caveat"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/caveat" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Bad Script"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/bad_script_regular" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="72dp"
+        android:paddingEnd="16dp"
+        android:text="Sriracha"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        android:fontFamily="@font/sriracha_regular" />
+
+</LinearLayout>
\ No newline at end of file
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" />
diff --git a/app/src/main/res/xml/font_preferences.xml b/app/src/main/res/xml/font_preferences.xml
index 317894b0..83264ea0 100644
--- a/app/src/main/res/xml/font_preferences.xml
+++ b/app/src/main/res/xml/font_preferences.xml
@@ -2,6 +2,10 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <Preference
+        app:title="@string/settings_preview_font_title"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreviewFragment" />
+
     <PreferenceCategory
         app:title="@string/settings_font_summary" />
 
-- 
cgit v1.2.3