aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2020-06-10 13:08:13 +0000
committerAlex Ning <chineseperson5@gmail.com>2020-06-10 13:08:13 +0000
commit2277c97cc0f922c527e5fbf16d6b468c558b953f (patch)
treee75014c471d87666289bd2e3cc305a87787641c9
parent54a9f241d473765c963161a5c27d9b03d8b42e1e (diff)
downloadinfinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.tar
infinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.tar.gz
infinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.tar.bz2
infinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.tar.lz
infinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.tar.xz
infinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.tar.zst
infinity-for-reddit-2277c97cc0f922c527e5fbf16d6b468c558b953f.zip
Add more fonts.
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java6
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java6
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java6
-rw-r--r--app/src/main/res/font/harmonia_sans.xml17
-rw-r--r--app/src/main/res/font/harmonia_sans_bold.ttfbin0 -> 29976 bytes
-rw-r--r--app/src/main/res/font/harmonia_sans_italic.ttfbin0 -> 166500 bytes
-rw-r--r--app/src/main/res/font/harmonia_sans_regular.ttfbin0 -> 30640 bytes
-rw-r--r--app/src/main/res/font/inter.xml17
-rw-r--r--app/src/main/res/font/inter_bold.ttfbin0 -> 293452 bytes
-rw-r--r--app/src/main/res/font/inter_light.ttfbin0 -> 288088 bytes
-rw-r--r--app/src/main/res/font/inter_regular.ttfbin0 -> 287928 bytes
-rw-r--r--app/src/main/res/font/roboto_condensed.xml32
-rw-r--r--app/src/main/res/font/roboto_condensed_bold.ttfbin0 -> 169352 bytes
-rw-r--r--app/src/main/res/font/roboto_condensed_bold_italic.ttfbin0 -> 175420 bytes
-rw-r--r--app/src/main/res/font/roboto_condensed_italic.ttfbin0 -> 174736 bytes
-rw-r--r--app/src/main/res/font/roboto_condensed_light.ttfbin0 -> 167568 bytes
-rw-r--r--app/src/main/res/font/roboto_condensed_light_italic.ttfbin0 -> 174908 bytes
-rw-r--r--app/src/main/res/font/roboto_condensed_regular.ttfbin0 -> 169848 bytes
-rw-r--r--app/src/main/res/font/selawk.xml17
-rw-r--r--app/src/main/res/font/selawk_bold.ttfbin0 -> 44068 bytes
-rw-r--r--app/src/main/res/font/selawk_light.ttfbin0 -> 44232 bytes
-rw-r--r--app/src/main/res/font/selawk_regular.ttfbin0 -> 44224 bytes
-rw-r--r--app/src/main/res/values/arrays.xml8
-rw-r--r--app/src/main/res/values/styles.xml48
24 files changed, 154 insertions, 3 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
index 1ef28bbe..8b43545f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
@@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R;
public enum ContentFontFamily {
Default(R.style.ContentFontFamily, "Default"),
BalsamiqSans(R.style.ContentFontFamily_BalsamiqSans, "BalsamiqSans"),
- NotoSans(R.style.ContentFontFamily_NotoSans, "NotoSans");
+ NotoSans(R.style.ContentFontFamily_NotoSans, "NotoSans"),
+ RobotoCondensed(R.style.ContentFontFamily_RobotoCondensed, "RobotoCondensed"),
+ HarmoniaSans(R.style.ContentFontFamily_HarmoniaSans, "HarmoniaSans"),
+ Selawk(R.style.ContentFontFamily_Selawk, "Selawk"),
+ Inter(R.style.ContentFontFamily_Inter, "Inter");
private int resId;
private String title;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
index f33873b2..40540060 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
@@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R;
public enum FontFamily {
Default(R.style.FontFamily, "Default"),
BalsamiqSans(R.style.FontFamily_BalsamiqSans, "BalsamiqSans"),
- NotoSans(R.style.FontFamily_NotoSans, "NotoSans");
+ NotoSans(R.style.FontFamily_NotoSans, "NotoSans"),
+ RobotoCondensed(R.style.FontFamily_RobotoCondensed, "RobotoCondensed"),
+ HarmoniaSans(R.style.FontFamily_HarmoniaSans, "HarmoniaSans"),
+ Selawk(R.style.FontFamily_Selawk, "Selawk"),
+ Inter(R.style.FontFamily_Inter, "Inter");
private int resId;
private String title;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
index 2b9a73b0..9e348bec 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
@@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R;
public enum TitleFontFamily {
Default(R.style.TitleFontFamily, "Default"),
BalsamiqSans(R.style.TitleFontFamily_BalsamiqSans, "BalsamiqSans"),
- NotoSans(R.style.TitleFontFamily_NotoSans, "NotoSans");
+ NotoSans(R.style.TitleFontFamily_NotoSans, "NotoSans"),
+ RobotoCondensed(R.style.TitleFontFamily_RobotoCondensed, "RobotoCondensed"),
+ HarmoniaSans(R.style.TitleFontFamily_HarmoniaSans, "HarmoniaSans"),
+ Selawk(R.style.TitleFontFamily_Selawk, "Selawk"),
+ Inter(R.style.TitleFontFamily_Inter, "Inter");
private int resId;
private String title;
diff --git a/app/src/main/res/font/harmonia_sans.xml b/app/src/main/res/font/harmonia_sans.xml
new file mode 100644
index 00000000..4dff085f
--- /dev/null
+++ b/app/src/main/res/font/harmonia_sans.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="400"
+ app:font="@font/harmonia_sans_regular" />
+
+ <font
+ app:fontStyle="normal"
+ app:fontWeight="700"
+ app:font="@font/harmonia_sans_bold" />
+
+ <font
+ app:fontStyle="italic"
+ app:fontWeight="400"
+ app:font="@font/harmonia_sans_italic" />
+</font-family> \ No newline at end of file
diff --git a/app/src/main/res/font/harmonia_sans_bold.ttf b/app/src/main/res/font/harmonia_sans_bold.ttf
new file mode 100644
index 00000000..c5668b6c
--- /dev/null
+++ b/app/src/main/res/font/harmonia_sans_bold.ttf
Binary files differ
diff --git a/app/src/main/res/font/harmonia_sans_italic.ttf b/app/src/main/res/font/harmonia_sans_italic.ttf
new file mode 100644
index 00000000..bc9f13a4
--- /dev/null
+++ b/app/src/main/res/font/harmonia_sans_italic.ttf
Binary files differ
diff --git a/app/src/main/res/font/harmonia_sans_regular.ttf b/app/src/main/res/font/harmonia_sans_regular.ttf
new file mode 100644
index 00000000..dbaed744
--- /dev/null
+++ b/app/src/main/res/font/harmonia_sans_regular.ttf
Binary files differ
diff --git a/app/src/main/res/font/inter.xml b/app/src/main/res/font/inter.xml
new file mode 100644
index 00000000..3a0d1784
--- /dev/null
+++ b/app/src/main/res/font/inter.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="400"
+ app:font="@font/inter_regular" />
+
+ <font
+ 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_bold.ttf b/app/src/main/res/font/inter_bold.ttf
new file mode 100644
index 00000000..5b3865c8
--- /dev/null
+++ b/app/src/main/res/font/inter_bold.ttf
Binary files differ
diff --git a/app/src/main/res/font/inter_light.ttf b/app/src/main/res/font/inter_light.ttf
new file mode 100644
index 00000000..8a2b98b5
--- /dev/null
+++ b/app/src/main/res/font/inter_light.ttf
Binary files differ
diff --git a/app/src/main/res/font/inter_regular.ttf b/app/src/main/res/font/inter_regular.ttf
new file mode 100644
index 00000000..b1965d40
--- /dev/null
+++ b/app/src/main/res/font/inter_regular.ttf
Binary files differ
diff --git a/app/src/main/res/font/roboto_condensed.xml b/app/src/main/res/font/roboto_condensed.xml
new file mode 100644
index 00000000..e2a5da42
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed.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/roboto_condensed_regular" />
+
+ <font
+ app:fontStyle="normal"
+ 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"
+ app:font="@font/roboto_condensed_italic" />
+
+ <font
+ app:fontStyle="italic"
+ app:fontWeight="700"
+ app:font="@font/roboto_condensed_bold_italic" />
+</font-family> \ No newline at end of file
diff --git a/app/src/main/res/font/roboto_condensed_bold.ttf b/app/src/main/res/font/roboto_condensed_bold.ttf
new file mode 100644
index 00000000..7fe31289
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed_bold.ttf
Binary files differ
diff --git a/app/src/main/res/font/roboto_condensed_bold_italic.ttf b/app/src/main/res/font/roboto_condensed_bold_italic.ttf
new file mode 100644
index 00000000..52ef6f37
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed_bold_italic.ttf
Binary files differ
diff --git a/app/src/main/res/font/roboto_condensed_italic.ttf b/app/src/main/res/font/roboto_condensed_italic.ttf
new file mode 100644
index 00000000..12216d67
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed_italic.ttf
Binary files differ
diff --git a/app/src/main/res/font/roboto_condensed_light.ttf b/app/src/main/res/font/roboto_condensed_light.ttf
new file mode 100644
index 00000000..43dd8f42
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed_light.ttf
Binary files 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
new file mode 100644
index 00000000..99d491b9
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed_light_italic.ttf
Binary files differ
diff --git a/app/src/main/res/font/roboto_condensed_regular.ttf b/app/src/main/res/font/roboto_condensed_regular.ttf
new file mode 100644
index 00000000..62dd61e5
--- /dev/null
+++ b/app/src/main/res/font/roboto_condensed_regular.ttf
Binary files differ
diff --git a/app/src/main/res/font/selawk.xml b/app/src/main/res/font/selawk.xml
new file mode 100644
index 00000000..28f46f58
--- /dev/null
+++ b/app/src/main/res/font/selawk.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="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
new file mode 100644
index 00000000..2134a765
--- /dev/null
+++ b/app/src/main/res/font/selawk_bold.ttf
Binary files differ
diff --git a/app/src/main/res/font/selawk_light.ttf b/app/src/main/res/font/selawk_light.ttf
new file mode 100644
index 00000000..cbfaaf99
--- /dev/null
+++ b/app/src/main/res/font/selawk_light.ttf
Binary files differ
diff --git a/app/src/main/res/font/selawk_regular.ttf b/app/src/main/res/font/selawk_regular.ttf
new file mode 100644
index 00000000..736bac3c
--- /dev/null
+++ b/app/src/main/res/font/selawk_regular.ttf
Binary files differ
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index feb9b16e..5040291b 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -127,12 +127,20 @@
<item>Default</item>
<item>Balsamiq Sans</item>
<item>Noto Sans</item>
+ <item>Roboto Condensed</item>
+ <item>Harmonia Sans</item>
+ <item>Selawk</item>
+ <item>Inter</item>
</string-array>
<string-array name="settings_font_family_values">
<item>Default</item>
<item>BalsamiqSans</item>
<item>NotoSans</item>
+ <item>RobotoCondensed</item>
+ <item>HarmoniaSans</item>
+ <item>Selawk</item>
+ <item>Inter</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 cec4a93e..214e9a66 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -246,6 +246,22 @@
<item name="font_family">@font/noto_sans</item>
</style>
+ <style name="FontFamily.RobotoCondensed">
+ <item name="font_family">@font/roboto_condensed</item>
+ </style>
+
+ <style name="FontFamily.HarmoniaSans">
+ <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>
+
<style name="TitleFontFamily" />
<style name="TitleFontFamily.Default">
@@ -260,6 +276,22 @@
<item name="title_font_family">@font/noto_sans</item>
</style>
+ <style name="TitleFontFamily.RobotoCondensed">
+ <item name="title_font_family">@font/roboto_condensed</item>
+ </style>
+
+ <style name="TitleFontFamily.HarmoniaSans">
+ <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>
+
<style name="ContentFontFamily" />
<style name="ContentFontFamily.Default">
@@ -274,6 +306,22 @@
<item name="content_font_family">@font/noto_sans</item>
</style>
+ <style name="ContentFontFamily.RobotoCondensed">
+ <item name="content_font_family">@font/roboto_condensed</item>
+ </style>
+
+ <style name="ContentFontFamily.HarmoniaSans">
+ <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>
+
<style name="Theme" />
<style name="Theme.Normal">