From 54a9f241d473765c963161a5c27d9b03d8b42e1e Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 10 Jun 2020 15:43:34 +0800
Subject: Changing font is available. Fix subtitle on toolbar being cut if the
 font is large.

---
 app/src/main/res/layout/activity_account_posts.xml |  3 +-
 .../res/layout/activity_account_saved_thing.xml    |  3 +-
 app/src/main/res/layout/activity_comment.xml       |  3 +-
 .../res/layout/activity_create_multi_reddit.xml    |  3 +-
 .../res/layout/activity_custom_theme_listing.xml   |  3 +-
 .../main/res/layout/activity_customize_theme.xml   |  3 +-
 app/src/main/res/layout/activity_edit_comment.xml  |  3 +-
 .../main/res/layout/activity_edit_multi_reddit.xml |  3 +-
 app/src/main/res/layout/activity_edit_post.xml     |  3 +-
 .../main/res/layout/activity_filtered_thing.xml    |  3 +-
 app/src/main/res/layout/activity_login.xml         |  3 +-
 .../res/layout/activity_multi_reddit_listing.xml   |  3 +-
 app/src/main/res/layout/activity_post_image.xml    |  4 +-
 app/src/main/res/layout/activity_post_link.xml     |  4 +-
 app/src/main/res/layout/activity_post_text.xml     |  4 +-
 app/src/main/res/layout/activity_post_video.xml    |  4 +-
 app/src/main/res/layout/activity_report.xml        |  3 +-
 app/src/main/res/layout/activity_rules.xml         |  3 +-
 app/src/main/res/layout/activity_search.xml        |  4 +-
 app/src/main/res/layout/activity_search_result.xml |  3 +-
 .../layout/activity_search_subreddits_result.xml   |  3 +-
 .../res/layout/activity_selected_subreddits.xml    |  3 +-
 app/src/main/res/layout/activity_settings.xml      |  3 +-
 .../res/layout/activity_subreddit_selection.xml    |  3 +-
 ...tivity_subscribed_subreddits_multiselection.xml |  3 +-
 .../layout/activity_subscribed_thing_listing.xml   |  3 +-
 app/src/main/res/layout/activity_theme_preview.xml |  4 +-
 app/src/main/res/layout/activity_view_message.xml  |  3 +-
 .../layout/activity_view_multi_reddit_detail.xml   |  3 +-
 .../main/res/layout/activity_view_post_detail.xml  |  3 +-
 app/src/main/res/layout/activity_view_sidebar.xml  |  3 +-
 .../res/layout/activity_view_subreddit_detail.xml  |  4 +-
 .../main/res/layout/activity_view_user_detail.xml  |  3 +-
 app/src/main/res/layout/app_bar_main.xml           |  3 +-
 .../res/layout/fragment_theme_preview_posts.xml    | 20 ++++---
 app/src/main/res/layout/item_footer_error.xml      |  1 -
 app/src/main/res/layout/item_post_compact.xml      |  4 --
 app/src/main/res/layout/item_post_detail_text.xml  |  2 -
 app/src/main/res/values/arrays.xml                 | 12 +++++
 app/src/main/res/values/strings.xml                |  9 +++-
 app/src/main/res/values/styles.xml                 |  9 ++--
 app/src/main/res/xml/font_preferences.xml          | 62 ++++++++++++++++++++++
 app/src/main/res/xml/font_size_preferences.xml     | 29 ----------
 app/src/main/res/xml/interface_preference.xml      |  4 +-
 44 files changed, 167 insertions(+), 94 deletions(-)
 create mode 100644 app/src/main/res/xml/font_preferences.xml
 delete mode 100644 app/src/main/res/xml/font_size_preferences.xml

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

diff --git a/app/src/main/res/layout/activity_account_posts.xml b/app/src/main/res/layout/activity_account_posts.xml
index 0cf8d0ef..396a6ab3 100644
--- a/app/src/main/res/layout/activity_account_posts.xml
+++ b/app/src/main/res/layout/activity_account_posts.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_account_posts_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_account_saved_thing.xml b/app/src/main/res/layout/activity_account_saved_thing.xml
index 9f54be21..57f61d2c 100644
--- a/app/src/main/res/layout/activity_account_saved_thing.xml
+++ b/app/src/main/res/layout/activity_account_saved_thing.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_account_saved_thing_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml
index 0fb6ef04..100db899 100644
--- a/app/src/main/res/layout/activity_comment.xml
+++ b/app/src/main/res/layout/activity_comment.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_comment_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml
index b606221d..20adb1d1 100644
--- a/app/src/main/res/layout/activity_create_multi_reddit.xml
+++ b/app/src/main/res/layout/activity_create_multi_reddit.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_create_multi_reddit_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_custom_theme_listing.xml b/app/src/main/res/layout/activity_custom_theme_listing.xml
index 7a16e736..a569f594 100644
--- a/app/src/main/res/layout/activity_custom_theme_listing.xml
+++ b/app/src/main/res/layout/activity_custom_theme_listing.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_customize_theme_listing_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_customize_theme.xml b/app/src/main/res/layout/activity_customize_theme.xml
index 40358952..9df359c6 100644
--- a/app/src/main/res/layout/activity_customize_theme.xml
+++ b/app/src/main/res/layout/activity_customize_theme.xml
@@ -25,7 +25,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_customize_theme_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml
index 79bc90f3..ba239230 100644
--- a/app/src/main/res/layout/activity_edit_comment.xml
+++ b/app/src/main/res/layout/activity_edit_comment.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_edit_comment_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
diff --git a/app/src/main/res/layout/activity_edit_multi_reddit.xml b/app/src/main/res/layout/activity_edit_multi_reddit.xml
index c037daea..bd6b9a12 100644
--- a/app/src/main/res/layout/activity_edit_multi_reddit.xml
+++ b/app/src/main/res/layout/activity_edit_multi_reddit.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_edit_multi_reddit_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml
index d5ac9360..5d124696 100644
--- a/app/src/main/res/layout/activity_edit_post.xml
+++ b/app/src/main/res/layout/activity_edit_post.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_edit_post_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_filtered_thing.xml b/app/src/main/res/layout/activity_filtered_thing.xml
index dd8e8cb9..a84e5140 100644
--- a/app/src/main/res/layout/activity_filtered_thing.xml
+++ b/app/src/main/res/layout/activity_filtered_thing.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_filtered_posts_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index bceaf7a0..04c07f43 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -15,7 +15,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_login_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_multi_reddit_listing.xml b/app/src/main/res/layout/activity_multi_reddit_listing.xml
index 308374b2..a7c69f72 100644
--- a/app/src/main/res/layout/activity_multi_reddit_listing.xml
+++ b/app/src/main/res/layout/activity_multi_reddit_listing.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_multi_reddit_listing_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index c6367aa1..cacfd04c 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_post_image_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
@@ -67,7 +68,6 @@
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:text="@string/rules"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
 
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 29a0eb7b..076764a2 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_post_link_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
@@ -67,7 +68,6 @@
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:text="@string/rules"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
 
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index e5d9b29d..67ba4234 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_post_text_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
@@ -67,7 +68,6 @@
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:text="@string/rules"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
 
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 49580159..c50c8be1 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_post_video_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
@@ -67,7 +68,6 @@
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:text="@string/rules"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
 
diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
index 845c9ecc..ff8ecb4b 100644
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_report_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml
index 563435fd..377c4fe1 100644
--- a/app/src/main/res/layout/activity_rules.xml
+++ b/app/src/main/res/layout/activity_rules.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_rules_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 3855767b..0048e1fc 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -21,7 +21,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:navigationIcon="?attr/homeAsUpIndicator"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
 
@@ -29,7 +30,6 @@
                 android:id="@+id/search_view_search_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:textColor="@android:color/white"
                 app:backIconAlpha="1"
                 app:backIconTint="@android:color/white"
                 app:cursorColor="@android:color/white"
diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml
index 79859872..cf798b26 100644
--- a/app/src/main/res/layout/activity_search_result.xml
+++ b/app/src/main/res/layout/activity_search_result.xml
@@ -22,7 +22,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_search_result_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_search_subreddits_result.xml b/app/src/main/res/layout/activity_search_subreddits_result.xml
index eaa560e7..b3390378 100644
--- a/app/src/main/res/layout/activity_search_subreddits_result.xml
+++ b/app/src/main/res/layout/activity_search_subreddits_result.xml
@@ -16,7 +16,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_search_subreddits_result_activity"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_selected_subreddits.xml b/app/src/main/res/layout/activity_selected_subreddits.xml
index dc33a69c..4e7a3364 100644
--- a/app/src/main/res/layout/activity_selected_subreddits.xml
+++ b/app/src/main/res/layout/activity_selected_subreddits.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_selected_subreddits_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1bd20c09..99b93a7a 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -19,7 +19,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_settings_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:navigationIcon="?attr/homeAsUpIndicator"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
 
diff --git a/app/src/main/res/layout/activity_subreddit_selection.xml b/app/src/main/res/layout/activity_subreddit_selection.xml
index 630f2af4..fddc0f8e 100644
--- a/app/src/main/res/layout/activity_subreddit_selection.xml
+++ b/app/src/main/res/layout/activity_subreddit_selection.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_subreddit_selection_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml
index 9b53ac6c..506375e7 100644
--- a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml
+++ b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_subscribed_subreddits_multiselection_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
diff --git a/app/src/main/res/layout/activity_subscribed_thing_listing.xml b/app/src/main/res/layout/activity_subscribed_thing_listing.xml
index db10bdc8..bad81ce5 100644
--- a/app/src/main/res/layout/activity_subscribed_thing_listing.xml
+++ b/app/src/main/res/layout/activity_subscribed_thing_listing.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_subscribed_thing_listing_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
diff --git a/app/src/main/res/layout/activity_theme_preview.xml b/app/src/main/res/layout/activity_theme_preview.xml
index 2a03432a..853c8b0d 100644
--- a/app/src/main/res/layout/activity_theme_preview.xml
+++ b/app/src/main/res/layout/activity_theme_preview.xml
@@ -70,7 +70,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe"
-                        android:textColor="@android:color/white"
                         android:layout_gravity="center_horizontal"/>
 
                 </LinearLayout>
@@ -107,7 +106,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
diff --git a/app/src/main/res/layout/activity_view_message.xml b/app/src/main/res/layout/activity_view_message.xml
index b50842c3..1ce1e9db 100644
--- a/app/src/main/res/layout/activity_view_message.xml
+++ b/app/src/main/res/layout/activity_view_message.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_view_message_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
index dbe8875b..28577883 100644
--- a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_view_multi_reddit_detail_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index e4928bae..621903a8 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_view_post_detail_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_view_sidebar.xml b/app/src/main/res/layout/activity_view_sidebar.xml
index 301b04cc..94a120ef 100644
--- a/app/src/main/res/layout/activity_view_sidebar.xml
+++ b/app/src/main/res/layout/activity_view_sidebar.xml
@@ -23,7 +23,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_view_sidebar_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:navigationIcon="?attr/homeAsUpIndicator" />
 
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index 27dceb9f..69680dbe 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -72,7 +72,6 @@
                         android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@android:color/white"
                         android:layout_gravity="center_horizontal"/>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
@@ -151,7 +150,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml
index c56aa0fe..1835e0c1 100644
--- a/app/src/main/res/layout/activity_view_user_detail.xml
+++ b/app/src/main/res/layout/activity_view_user_detail.xml
@@ -116,7 +116,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar_view_user_detail_activity"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index bcc7afb8..981e788a 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -24,7 +24,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml
index 760d412d..7e384540 100644
--- a/app/src/main/res/layout/fragment_theme_preview_posts.xml
+++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml
@@ -133,7 +133,6 @@
                     android:layout_height="wrap_content"
                     android:padding="4dp"
                     android:text="@string/post_type_preview"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_12"
                     android:fontFamily="?attr/font_family"
                     app:lib_setRadius="3dp"
@@ -147,7 +146,6 @@
                     android:layout_gravity="center"
                     android:padding="4dp"
                     android:text="@string/spoiler"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_12"
                     android:fontFamily="?attr/font_family"
                     app:lib_setRadius="3dp"
@@ -160,7 +158,6 @@
                     android:layout_height="wrap_content"
                     android:padding="4dp"
                     android:text="@string/nsfw"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_12"
                     android:fontFamily="?attr/font_family"
                     app:lib_setRadius="3dp"
@@ -174,22 +171,23 @@
                     android:layout_gravity="center"
                     android:padding="4dp"
                     android:text="@string/flair_preview"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_12"
                     android:fontFamily="?attr/font_family"
                     app:lib_setRadius="3dp"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
-                <TextView
+                <com.libRG.CustomTextView
+                    android:id="@+id/awards_text_view_theme_preview_posts_fragment"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/gold"
-                    android:drawablePadding="4dp"
-                    android:text="@string/gilded_preview"
-                    android:textColor="@color/gold"
-                    android:textSize="?attr/font_default"
-                    android:fontFamily="?attr/font_family" />
+                    android:padding="4dp"
+                    android:text="@string/awards_preview"
+                    android:textSize="?attr/font_12"
+                    android:fontFamily="?attr/font_family"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
 
                 <ImageView
                     android:id="@+id/archived_image_view_theme_preview_posts_fragment"
diff --git a/app/src/main/res/layout/item_footer_error.xml b/app/src/main/res/layout/item_footer_error.xml
index b72b74fa..71eef915 100644
--- a/app/src/main/res/layout/item_footer_error.xml
+++ b/app/src/main/res/layout/item_footer_error.xml
@@ -23,7 +23,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:textColor="@android:color/white"
         android:text="@string/retry"
         android:textSize="?attr/font_default"
         android:fontFamily="?attr/font_family" />
diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml
index f23220d7..a8f3d262 100644
--- a/app/src/main/res/layout/item_post_compact.xml
+++ b/app/src/main/res/layout/item_post_compact.xml
@@ -114,7 +114,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="4dp"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_10"
                     android:fontFamily="?attr/font_family"
                     app:lib_setRadius="3dp"
@@ -128,7 +127,6 @@
                     android:layout_gravity="center"
                     android:padding="4dp"
                     android:text="@string/spoiler"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_10"
                     android:fontFamily="?attr/font_family"
                     android:visibility="gone"
@@ -142,7 +140,6 @@
                     android:layout_height="wrap_content"
                     android:padding="4dp"
                     android:text="@string/nsfw"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_10"
                     android:fontFamily="?attr/font_family"
                     android:visibility="gone"
@@ -156,7 +153,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:padding="4dp"
-                    android:textColor="@android:color/white"
                     android:textSize="?attr/font_10"
                     android:fontFamily="?attr/font_family"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml
index c7d02b7f..08a4598a 100644
--- a/app/src/main/res/layout/item_post_detail_text.xml
+++ b/app/src/main/res/layout/item_post_detail_text.xml
@@ -128,7 +128,6 @@
             android:padding="4dp"
             android:text="@string/text"
             android:textSize="?attr/font_12"
-            android:textColor="@android:color/white"
             android:fontFamily="?attr/font_family"
             app:lib_setRadius="3dp"
             app:lib_setRoundedView="true"
@@ -141,7 +140,6 @@
             android:layout_gravity="center"
             android:text="@string/spoiler"
             android:textSize="?attr/font_12"
-            android:textColor="@android:color/white"
             android:fontFamily="?attr/font_family"
             android:padding="4dp"
             android:visibility="gone"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5fce9e21..feb9b16e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -122,6 +122,18 @@
         <item>XLarge</item>
         <item>XXLarge</item>
     </string-array>
+
+    <string-array name="settings_font_family">
+        <item>Default</item>
+        <item>Balsamiq Sans</item>
+        <item>Noto Sans</item>
+    </string-array>
+
+    <string-array name="settings_font_family_values">
+        <item>Default</item>
+        <item>BalsamiqSans</item>
+        <item>NotoSans</item>
+    </string-array>
     
     <string-array name="settings_tab_post_type">
         <item>Home</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bdd8df76..a8d9f21f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -348,6 +348,13 @@
     <string name="settings_lock_bottom_app_bar_title">Lock Bottom Navigation Bar</string>
     <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_font_summary">Font</string>
+    <string name="settings_title_font_summary">Title</string>
+    <string name="settings_content_font_summary">Content</string>
+    <string name="settings_font_family_title">Font Family</string>
+    <string name="settings_title_font_family_title">Title Font Family</string>
+    <string name="settings_content_font_family_title">Content Font Family</string>
     <string name="settings_font_size_title">Font Size</string>
     <string name="settings_title_font_size_title">Title Font Size</string>
     <string name="settings_content_font_size_title">Content Font Size</string>
@@ -711,7 +718,7 @@
     <string name="post_content_preview">This gravity joke is getting a bit old, but I fall for it every time.</string>
     <string name="post_type_preview">POST</string>
     <string name="flair_preview">Flair</string>
-    <string name="gilded_preview">x4</string>
+    <string name="awards_preview">4 Awards</string>
     <string name="author_flair_preview">Author Flair</string>
     <string name="comment_content_preview">I got my girlfriend a “Get better soon” card.\nShe\'s not ill or anything, but she could definitely get better.</string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d09b0c72..cec4a93e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,14 +39,15 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:fontFamily">?attr/font_family</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+        <item name="android:fontFamily">?attr/font_family</item>
+    </style>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
 
-    <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
     <style name="CustomTabLayout" parent="Widget.Design.TabLayout">
         <item name="tabIndicatorColor">@android:color/white</item>
         <item name="tabIndicatorHeight">3dp</item>
@@ -105,10 +106,12 @@
     <style name="PreferenceTitleTextStyle">
         <item name="android:textSize">?attr/font_16</item>
         <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:fontFamily">?attr/font_family</item>
     </style>
 
     <style name="PreferenceSubtitleTextStyle">
         <item name="android:textSize">?attr/font_default</item>
+        <item name="android:fontFamily">?attr/font_family</item>
     </style>
 
     <style name="ListPreferenceStyle" parent="ThemeOverlay.AppCompat.Dialog.Alert">
diff --git a/app/src/main/res/xml/font_preferences.xml b/app/src/main/res/xml/font_preferences.xml
new file mode 100644
index 00000000..317894b0
--- /dev/null
+++ b/app/src/main/res/xml/font_preferences.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:title="@string/settings_font_summary" />
+
+    <ListPreference
+        app:defaultValue="Default"
+        android:entries="@array/settings_font_family"
+        app:entryValues="@array/settings_font_family_values"
+        app:key="font_family"
+        app:title="@string/settings_font_family_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="Normal"
+        android:entries="@array/settings_font_size"
+        app:entryValues="@array/settings_font_size_values"
+        app:key="font_size"
+        app:title="@string/settings_font_size_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <PreferenceCategory
+        app:title="@string/settings_title_font_summary" />
+
+    <ListPreference
+        app:defaultValue="Default"
+        android:entries="@array/settings_font_family"
+        app:entryValues="@array/settings_font_family_values"
+        app:key="title_font_family"
+        app:title="@string/settings_title_font_family_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="Normal"
+        android:entries="@array/settings_title_font_size"
+        app:entryValues="@array/settings_title_font_size_values"
+        app:key="title_font_size"
+        app:title="@string/settings_title_font_size_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <PreferenceCategory
+        app:title="@string/settings_content_font_summary" />
+
+    <ListPreference
+        app:defaultValue="Default"
+        android:entries="@array/settings_font_family"
+        app:entryValues="@array/settings_font_family_values"
+        app:key="content_font_family"
+        app:title="@string/settings_content_font_family_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="Normal"
+        android:entries="@array/settings_content_font_size"
+        app:entryValues="@array/settings_content_font_size_values"
+        app:key="content_font_size"
+        app:title="@string/settings_content_font_size_title"
+        app:useSimpleSummaryProvider="true" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/font_size_preferences.xml b/app/src/main/res/xml/font_size_preferences.xml
deleted file mode 100644
index 40695b92..00000000
--- a/app/src/main/res/xml/font_size_preferences.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <ListPreference
-        app:defaultValue="Normal"
-        android:entries="@array/settings_font_size"
-        app:entryValues="@array/settings_font_size_values"
-        app:key="font_size"
-        app:title="@string/settings_font_size_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <ListPreference
-        app:defaultValue="Normal"
-        android:entries="@array/settings_title_font_size"
-        app:entryValues="@array/settings_title_font_size_values"
-        app:key="title_font_size"
-        app:title="@string/settings_title_font_size_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <ListPreference
-        app:defaultValue="Normal"
-        android:entries="@array/settings_content_font_size"
-        app:entryValues="@array/settings_content_font_size_values"
-        app:key="content_font_size"
-        app:title="@string/settings_content_font_size_title"
-        app:useSimpleSummaryProvider="true" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index 58de9ef4..1d77970c 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        app:title="@string/settings_font_size_title"
+        app:title="@string/settings_font_title"
         app:icon="@drawable/ic_font_size_24dp"
-        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" />
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreferenceFragment" />
 
     <SwitchPreference
         app:defaultValue="true"
-- 
cgit v1.2.3