mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-07 03:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add some padding between markdown paragraghs. Delete Caveat font.

Browse Source
This commit is contained in:
Alex Ning 2020-06-17 19:23:44 +08:00
parent 513d926770
commit 0df0482d45
12 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
View File

@ -10,7 +10,6 @@ public enum ContentFontFamily {
HarmoniaSans(R.style.ContentFontFamily_HarmoniaSans, "HarmoniaSans"),
Inter(R.style.ContentFontFamily_Inter, "Inter"),
Manrope(R.style.ContentFontFamily_Manrope, "Manrope"),
Caveat(R.style.ContentFontFamily_Caveat, "Caveat"),
BadScript(R.style.ContentFontFamily_BadScript, "BadScript"),
Sriracha(R.style.ContentFontFamily_Sriracha, "Sriracha");

1
app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
View File

@ -10,7 +10,6 @@ public enum FontFamily {
HarmoniaSans(R.style.FontFamily_HarmoniaSans, "HarmoniaSans"),
Inter(R.style.FontFamily_Inter, "Inter"),
Manrope(R.style.FontFamily_Manrope, "Manrope"),
Caveat(R.style.FontFamily_Caveat, "Caveat"),
BadScript(R.style.FontFamily_BadScript, "BadScript"),
Sriracha(R.style.FontFamily_Sriracha, "Sriracha");

1
app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
View File

@ -10,7 +10,6 @@ public enum TitleFontFamily {
HarmoniaSans(R.style.TitleFontFamily_HarmoniaSans, "HarmoniaSans"),
Inter(R.style.TitleFontFamily_Inter, "Inter"),
Manrope(R.style.TitleFontFamily_Manrope, "Manrope"),
Caveat(R.style.TitleFontFamily_Caveat, "Caveat"),
BadScript(R.style.TitleFontFamily_BadScript, "BadScript"),
Sriracha(R.style.TitleFontFamily_Sriracha, "Sriracha");

12
app/src/main/res/font/caveat.xml
View File

@ -1,12 +0,0 @@
<?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/caveat_regular" />
<font
app:fontStyle="normal"
app:fontWeight="700"
app:font="@font/caveat_bold" />
</font-family>

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

Binary file not shown.

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

Binary file not shown.

1
app/src/main/res/layout/adapter_default_entry.xml
View File

@ -3,5 +3,6 @@
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:textSize="?attr/content_font_default"
android:fontFamily="?attr/content_font_family" />

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

@ -89,18 +89,6 @@
android:textSize="?attr/font_default"
android:fontFamily="@font/manrope" />
<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="Caveat"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="@font/caveat" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/layout/item_post_detail_no_preview_link.xml
View File

@ -109,8 +109,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
<com.nex3z.flowlayout.FlowLayout

4
app/src/main/res/layout/item_post_detail_text.xml
View File

@ -109,8 +109,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
<com.nex3z.flowlayout.FlowLayout

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

@ -131,7 +131,6 @@
<item>Harmonia Sans</item>
<item>Inter</item>
<item>Manrope</item>
<item>Caveat</item>
<item>Bad Script</item>
<item>Sriracha</item>
</string-array>
@ -144,7 +143,6 @@
<item>HarmoniaSans</item>
<item>Inter</item>
<item>Manrope</item>
<item>Caveat</item>
<item>BadScript</item>
<item>Sriracha</item>
</string-array>

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

@ -262,10 +262,6 @@
<item name="font_family">@font/manrope</item>
</style>
<style name="FontFamily.Caveat">
<item name="font_family">@font/caveat</item>
</style>
<style name="FontFamily.BadScript">
<item name="font_family">@font/bad_script_regular</item>
</style>
@ -304,10 +300,6 @@
<item name="title_font_family">@font/manrope</item>
</style>
<style name="TitleFontFamily.Caveat">
<item name="title_font_family">@font/caveat</item>
</style>
<style name="TitleFontFamily.BadScript">
<item name="title_font_family">@font/bad_script_regular</item>
</style>
@ -346,10 +338,6 @@
<item name="content_font_family">@font/manrope</item>
</style>
<style name="ContentFontFamily.Caveat">
<item name="content_font_family">@font/caveat</item>
</style>
<style name="ContentFontFamily.BadScript">
<item name="content_font_family">@font/bad_script_regular</item>
</style>