Add more fonts.

This commit is contained in:
Alex Ning 2020-06-10 21:08:13 +08:00
parent 54a9f241d4
commit 2277c97cc0
24 changed files with 154 additions and 3 deletions

View File

@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R;
public enum ContentFontFamily { public enum ContentFontFamily {
Default(R.style.ContentFontFamily, "Default"), Default(R.style.ContentFontFamily, "Default"),
BalsamiqSans(R.style.ContentFontFamily_BalsamiqSans, "BalsamiqSans"), 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 int resId;
private String title; private String title;

View File

@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R;
public enum FontFamily { public enum FontFamily {
Default(R.style.FontFamily, "Default"), Default(R.style.FontFamily, "Default"),
BalsamiqSans(R.style.FontFamily_BalsamiqSans, "BalsamiqSans"), 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 int resId;
private String title; private String title;

View File

@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R;
public enum TitleFontFamily { public enum TitleFontFamily {
Default(R.style.TitleFontFamily, "Default"), Default(R.style.TitleFontFamily, "Default"),
BalsamiqSans(R.style.TitleFontFamily_BalsamiqSans, "BalsamiqSans"), 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 int resId;
private String title; private String title;

View File

@ -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>

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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>

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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>

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -127,12 +127,20 @@
<item>Default</item> <item>Default</item>
<item>Balsamiq Sans</item> <item>Balsamiq Sans</item>
<item>Noto Sans</item> <item>Noto Sans</item>
<item>Roboto Condensed</item>
<item>Harmonia Sans</item>
<item>Selawk</item>
<item>Inter</item>
</string-array> </string-array>
<string-array name="settings_font_family_values"> <string-array name="settings_font_family_values">
<item>Default</item> <item>Default</item>
<item>BalsamiqSans</item> <item>BalsamiqSans</item>
<item>NotoSans</item> <item>NotoSans</item>
<item>RobotoCondensed</item>
<item>HarmoniaSans</item>
<item>Selawk</item>
<item>Inter</item>
</string-array> </string-array>
<string-array name="settings_tab_post_type"> <string-array name="settings_tab_post_type">

View File

@ -246,6 +246,22 @@
<item name="font_family">@font/noto_sans</item> <item name="font_family">@font/noto_sans</item>
</style> </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" />
<style name="TitleFontFamily.Default"> <style name="TitleFontFamily.Default">
@ -260,6 +276,22 @@
<item name="title_font_family">@font/noto_sans</item> <item name="title_font_family">@font/noto_sans</item>
</style> </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" />
<style name="ContentFontFamily.Default"> <style name="ContentFontFamily.Default">
@ -274,6 +306,22 @@
<item name="content_font_family">@font/noto_sans</item> <item name="content_font_family">@font/noto_sans</item>
</style> </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" />
<style name="Theme.Normal"> <style name="Theme.Normal">