Fix bugs related to favoriting multireddits. Add some fonts.

14 files changed, 77 insertions, 0 deletions

diff --git a/app/src/main/res/font/manrope.xml b/app/src/main/res/font/manrope.xml
new file mode 100644
index 00000000..0193f184
--- /dev/null
+++ b/app/src/main/res/font/manrope.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="500"
+        app:font="@font/manrope_medium" />
+
+    <font
+        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_bold.ttf b/app/src/main/res/font/manrope_bold.ttf
new file mode 100644
index 00000000..0b2be328
--- /dev/null
+++ b/app/src/main/res/font/manrope_bold.ttf
diff --git a/app/src/main/res/font/manrope_light.ttf b/app/src/main/res/font/manrope_light.ttf
new file mode 100644
index 00000000..5a771c80
--- /dev/null
+++ b/app/src/main/res/font/manrope_light.ttf
diff --git a/app/src/main/res/font/manrope_medium.ttf b/app/src/main/res/font/manrope_medium.ttf
new file mode 100644
index 00000000..e704d983
--- /dev/null
+++ b/app/src/main/res/font/manrope_medium.ttf
diff --git a/app/src/main/res/font/manrope_regular.ttf b/app/src/main/res/font/manrope_regular.ttf
new file mode 100644
index 00000000..8f414180
--- /dev/null
+++ b/app/src/main/res/font/manrope_regular.ttf
diff --git a/app/src/main/res/font/rubik.xml b/app/src/main/res/font/rubik.xml
new file mode 100644
index 00000000..50596309
--- /dev/null
+++ b/app/src/main/res/font/rubik.xml
@@ -0,0 +1,32 @@
+<?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
new file mode 100644
index 00000000..4e77930f
--- /dev/null
+++ b/app/src/main/res/font/rubik_bold.ttf
diff --git a/app/src/main/res/font/rubik_bold_italic.ttf b/app/src/main/res/font/rubik_bold_italic.ttf
new file mode 100644
index 00000000..f6322472
--- /dev/null
+++ b/app/src/main/res/font/rubik_bold_italic.ttf
diff --git a/app/src/main/res/font/rubik_italic.ttf b/app/src/main/res/font/rubik_italic.ttf
new file mode 100644
index 00000000..2ddac98e
--- /dev/null
+++ b/app/src/main/res/font/rubik_italic.ttf
diff --git a/app/src/main/res/font/rubik_light.ttf b/app/src/main/res/font/rubik_light.ttf
new file mode 100644
index 00000000..8189d848
--- /dev/null
+++ b/app/src/main/res/font/rubik_light.ttf
diff --git a/app/src/main/res/font/rubik_light_italic.ttf b/app/src/main/res/font/rubik_light_italic.ttf
new file mode 100644
index 00000000..8a9ae95a
--- /dev/null
+++ b/app/src/main/res/font/rubik_light_italic.ttf
diff --git a/app/src/main/res/font/rubik_regular.ttf b/app/src/main/res/font/rubik_regular.ttf
new file mode 100644
index 00000000..52b59ca4
--- /dev/null
+++ b/app/src/main/res/font/rubik_regular.ttf
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5040291b..e5bcf611 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -131,6 +131,8 @@
         <item>Harmonia Sans</item>
         <item>Selawk</item>
         <item>Inter</item>
+        <item>Manrope</item>
+        <item>Rubik</item>
     </string-array>
 
     <string-array name="settings_font_family_values">
@@ -141,6 +143,8 @@
         <item>HarmoniaSans</item>
         <item>Selawk</item>
         <item>Inter</item>
+        <item>Manrope</item>
+        <item>Rubik</item>
     </string-array>
     
     <string-array name="settings_tab_post_type">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 214e9a66..6e46c6cf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -262,6 +262,14 @@
         <item name="font_family">@font/inter</item>
     </style>
 
+    <style name="FontFamily.Manrope">
+        <item name="font_family">@font/manrope</item>
+    </style>
+
+    <style name="FontFamily.Rubik">
+        <item name="font_family">@font/rubik</item>
+    </style>
+
     <style name="TitleFontFamily" />
 
     <style name="TitleFontFamily.Default">
@@ -292,6 +300,14 @@
         <item name="title_font_family">@font/inter</item>
     </style>
 
+    <style name="TitleFontFamily.Manrope">
+        <item name="title_font_family">@font/manrope</item>
+    </style>
+
+    <style name="TitleFontFamily.Rubik">
+        <item name="title_font_family">@font/rubik</item>
+    </style>
+
     <style name="ContentFontFamily" />
 
     <style name="ContentFontFamily.Default">
@@ -322,6 +338,14 @@
         <item name="content_font_family">@font/inter</item>
     </style>
 
+    <style name="ContentFontFamily.Manrope">
+        <item name="content_font_family">@font/manrope</item>
+    </style>
+
+    <style name="ContentFontFamily.Rubik">
+        <item name="content_font_family">@font/rubik</item>
+    </style>
+
     <style name="Theme" />
 
     <style name="Theme.Normal">