Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: re-add inter

Browse source 
Re-add the inter typeface.

It's not good design to have two similar typefaces, so I may as well
revert back to Inter once and for all. It's too good of a typeface
compared to the mess of Roboto and other native fonts.
This commit is contained in:
OxygenCobalt 2022-01-30 20:31:40 -07:00
parent 9514f17bc7
commit 3c9ffd5946
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
View file

@ -170,6 +170,8 @@ class MusicLoader {
private fun buildAlbums(songs: List<Song>): List<Album> { private fun buildAlbums(songs: List<Song>): List<Album> {
// Group up songs by their album ids and then link them with their albums // Group up songs by their album ids and then link them with their albums
// TODO: Figure out how to group up songs by album in a way that does not accidentally
// split songs by album.
val albums = mutableListOf<Album>() val albums = mutableListOf<Album>()
val songsByAlbum = songs.groupBy { it.albumId } val songsByAlbum = songs.groupBy { it.albumId }

BIN
app/src/main/res/font/inter.ttf Normal file
View file

Binary file not shown.

56
app/src/main/res/values/typography.xml
View file

@ -4,81 +4,95 @@
<style name="TextAppearance.Auxio.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge"> <style name="TextAppearance.Auxio.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge">
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="TextAppearance.Auxio.DisplayMedium" parent="TextAppearance.Material3.DisplayMedium"> <style name="TextAppearance.Auxio.DisplayMedium" parent="TextAppearance.Material3.DisplayMedium">
<item name="fontFamily">sans-serif</item> <item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.Auxio.DisplaySmall" parent="TextAppearance.Material3.DisplaySmall"> <style name="TextAppearance.Auxio.DisplaySmall" parent="TextAppearance.Material3.DisplaySmall">
<item name="fontFamily">sans-serif</item> <item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.Auxio.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge"> <style name="TextAppearance.Auxio.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="TextAppearance.Auxio.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium"> <style name="TextAppearance.Auxio.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
<item name="fontFamily">sans-serif</item> <item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.Auxio.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall"> <style name="TextAppearance.Auxio.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
<item name="fontFamily">sans-serif</item> <item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.Auxio.TitleLarge" parent="TextAppearance.Material3.TitleLarge"> <style name="TextAppearance.Auxio.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="TextAppearance.Auxio.TitleMedium" parent="TextAppearance.Material3.TitleMedium"> <style name="TextAppearance.Auxio.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">sans-serif</item> <item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.Auxio.TitleSmall" parent="TextAppearance.Material3.TitleSmall"> <style name="TextAppearance.Auxio.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
<item name="fontFamily">sans-serif</item> <item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge"> <style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">bold</item>
<item name="android:letterSpacing">0.01</item> <item name="android:letterSpacing">0.01</item>
</style> </style>
<style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium"> <style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">bold</item>
<item name="android:letterSpacing">0.01</item> <item name="android:letterSpacing">0.01</item>
</style> </style>
<style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall"> <style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">bold</item>
<item name="android:letterSpacing">0.01</item> <item name="android:letterSpacing">0.01</item>
</style> </style>
<style name="TextAppearance.Auxio.BodyLarge" parent="TextAppearance.Material3.BodyLarge" /> <style name="TextAppearance.Auxio.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
<style name="TextAppearance.Auxio.BodyMedium" parent="TextAppearance.Material3.BodyMedium" /> <item name="fontFamily">@font/inter</item>
<style name="TextAppearance.Auxio.BodySmall" parent="TextAppearance.Material3.BodySmall" /> <item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.Auxio.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
<item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.Auxio.BodySmall" parent="TextAppearance.Material3.BodySmall">
<item name="fontFamily">@font/inter</item>
<item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">normal</item>
</style>
<!-- <!--
Text extensions Text extensions