mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove font: Bad Script. Add some bold fonts.

Browse Source
This commit is contained in:
Alex Ning
2020-07-15 21:40:26 +08:00
parent 2d69170f4f
commit 7742a19abd
12 changed files with 211 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/font/bad_script_regular.ttf
View File

Binary file not shown.

12
app/src/main/res/font/balsamiq_sans_bold_version.xml Normal file
View File

@@ -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="700"
app:font="@font/balsamiq_sans_bold" />
<font
app:fontStyle="italic"
app:fontWeight="700"
app:font="@font/balsamiq_sans_bold_italic" />
</font-family>

12
app/src/main/res/font/noto_sans_bold_version.xml Normal file
View File

@@ -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="700"
app:font="@font/noto_sans_bold" />
<font
app:fontStyle="italic"
app:fontWeight="700"
app:font="@font/noto_sans_bold_italic" />
</font-family>

12
app/src/main/res/font/roboto_condensed_bold_version.xml Normal file
View File

@@ -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="700"
app:font="@font/roboto_condensed_bold" />
<font
app:fontStyle="italic"
app:fontWeight="700"
app:font="@font/roboto_condensed_bold_italic" />
</font-family>

68
app/src/main/res/layout/fragment_font_preview.xml
View File

@@ -29,6 +29,18 @@
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="Balsamiq Sans Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/balsamiq_sans_bold_version" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -48,10 +60,10 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
android:text="Roboto Condensed"
android:text="Noto Sans Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/roboto_condensed" />
android:fontFamily="@font/noto_sans_bold_version" />
<TextView
android:layout_width="match_parent"
@@ -65,6 +77,42 @@
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="Harmonia Sans Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/harmonia_sans_bold" />
<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="Roboto Condensed Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/roboto_condensed_bold_version" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -77,6 +125,18 @@
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="Inter Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/inter_bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -96,10 +156,10 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
android:text="Bad Script"
android:text="Manrope Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/bad_script_regular" />
android:fontFamily="@font/manrope_bold" />
<TextView
android:layout_width="match_parent"

22
app/src/main/res/values/arrays.xml
View File

@@ -130,24 +130,34 @@
<string-array name="settings_font_family">
<item>Default</item>
<item>Balsamiq Sans</item>
<item>Balsamiq Sans Bold</item>
<item>Noto Sans</item>
<item>Roboto Condensed</item>
<item>Noto Sans Bold</item>
<item>Harmonia Sans</item>
<item>Inter</item>
<item>Manrope</item>
<item>Bad Script</item>
<item>Harmonia Sans Bold (No Italic)</item>
<item>Roboto Condensed</item>
<item>Roboto Condensed Bold</item>
<item>Inter (No Italic)</item>
<item>Inter Bold (No Italic)</item>
<item>Manrope (No Italic)</item>
<item>Manrope Bold (No Italic)</item>
<item>Sriracha</item>
</string-array>
<string-array name="settings_font_family_values">
<item>Default</item>
<item>BalsamiqSans</item>
<item>BalsamiqSansBold</item>
<item>NotoSans</item>
<item>RobotoCondensed</item>
<item>NotoSansBold</item>
<item>HarmoniaSans</item>
<item>HarmoniaSansBold</item>
<item>RobotoCondensed</item>
<item>RobotoCondensedBold</item>
<item>Inter</item>
<item>InterBold</item>
<item>Manrope</item>
<item>BadScript</item>
<item>ManropeBold</item>
<item>Sriracha</item>
</string-array>

72
app/src/main/res/values/styles.xml
View File

@@ -257,28 +257,48 @@
<item name="font_family">@font/balsamiq_sans</item>
</style>
<style name="FontFamily.BalsamiqSansBold">
<item name="font_family">@font/balsamiq_sans_bold_version</item>
</style>
<style name="FontFamily.NotoSans">
<item name="font_family">@font/noto_sans</item>
</style>
<style name="FontFamily.NotoSansBold">
<item name="font_family">@font/noto_sans_bold_version</item>
</style>
<style name="FontFamily.RobotoCondensed">
<item name="font_family">@font/roboto_condensed</item>
</style>
<style name="FontFamily.RobotoCondensedBold">
<item name="font_family">@font/roboto_condensed_bold_version</item>
</style>
<style name="FontFamily.HarmoniaSans">
<item name="font_family">@font/harmonia_sans</item>
</style>
<style name="FontFamily.HarmoniaSansBold">
<item name="font_family">@font/harmonia_sans_bold</item>
</style>
<style name="FontFamily.Inter">
<item name="font_family">@font/inter</item>
</style>
<style name="FontFamily.InterBold">
<item name="font_family">@font/inter_bold</item>
</style>
<style name="FontFamily.Manrope">
<item name="font_family">@font/manrope</item>
</style>
<style name="FontFamily.BadScript">
<item name="font_family">@font/bad_script_regular</item>
<style name="FontFamily.ManropeBold">
<item name="font_family">@font/manrope_bold</item>
</style>
<style name="FontFamily.Sriracha">
@@ -295,28 +315,48 @@
<item name="title_font_family">@font/balsamiq_sans</item>
</style>
<style name="TitleFontFamily.BalsamiqSansBold">
<item name="title_font_family">@font/balsamiq_sans_bold_version</item>
</style>
<style name="TitleFontFamily.NotoSans">
<item name="title_font_family">@font/noto_sans</item>
</style>
<style name="TitleFontFamily.NotoSansBold">
<item name="title_font_family">@font/noto_sans_bold_version</item>
</style>
<style name="TitleFontFamily.RobotoCondensed">
<item name="title_font_family">@font/roboto_condensed</item>
</style>
<style name="TitleFontFamily.RobotoCondensedBold">
<item name="title_font_family">@font/roboto_condensed_bold_version</item>
</style>
<style name="TitleFontFamily.HarmoniaSans">
<item name="title_font_family">@font/harmonia_sans</item>
</style>
<style name="TitleFontFamily.HarmoniaSansBold">
<item name="title_font_family">@font/harmonia_sans_bold</item>
</style>
<style name="TitleFontFamily.Inter">
<item name="title_font_family">@font/inter</item>
</style>
<style name="TitleFontFamily.InterBold">
<item name="title_font_family">@font/inter_bold</item>
</style>
<style name="TitleFontFamily.Manrope">
<item name="title_font_family">@font/manrope</item>
</style>
<style name="TitleFontFamily.BadScript">
<item name="title_font_family">@font/bad_script_regular</item>
<style name="TitleFontFamily.ManropeBold">
<item name="title_font_family">@font/manrope_bold</item>
</style>
<style name="TitleFontFamily.Sriracha">
@@ -333,28 +373,48 @@
<item name="content_font_family">@font/balsamiq_sans</item>
</style>
<style name="ContentFontFamily.BalsamiqSansBold">
<item name="content_font_family">@font/balsamiq_sans_bold_version</item>
</style>
<style name="ContentFontFamily.NotoSans">
<item name="content_font_family">@font/noto_sans</item>
</style>
<style name="ContentFontFamily.NotoSansBold">
<item name="content_font_family">@font/noto_sans_bold_version</item>
</style>
<style name="ContentFontFamily.RobotoCondensed">
<item name="content_font_family">@font/roboto_condensed</item>
</style>
<style name="ContentFontFamily.RobotoCondensedBold">
<item name="content_font_family">@font/roboto_condensed_bold_version</item>
</style>
<style name="ContentFontFamily.HarmoniaSans">
<item name="content_font_family">@font/harmonia_sans</item>
</style>
<style name="ContentFontFamily.HarmoniaSansBold">
<item name="content_font_family">@font/harmonia_sans_bold</item>
</style>
<style name="ContentFontFamily.Inter">
<item name="content_font_family">@font/inter</item>
</style>
<style name="ContentFontFamily.InterBold">
<item name="content_font_family">@font/inter_bold</item>
</style>
<style name="ContentFontFamily.Manrope">
<item name="content_font_family">@font/manrope</item>
</style>
<style name="ContentFontFamily.BadScript">
<item name="content_font_family">@font/bad_script_regular</item>
<style name="ContentFontFamily.ManropeBold">
<item name="content_font_family">@font/manrope_bold</item>
</style>
<style name="ContentFontFamily.Sriracha">