Skip to content

Commit c122902

Browse files
committed
fix(fonts): replace variable fonts with static versions to reduce apk size
1 parent 8ff166d commit c122902

File tree

8 files changed

+4
-44
lines changed

8 files changed

+4
-44
lines changed

app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ import androidx.compose.material3.Typography
2121
import androidx.compose.ui.text.ExperimentalTextApi
2222
import androidx.compose.ui.text.font.Font
2323
import androidx.compose.ui.text.font.FontFamily
24-
import androidx.compose.ui.text.font.FontStyle
25-
import androidx.compose.ui.text.font.FontVariation
26-
import androidx.compose.ui.text.font.FontWeight
2724
import org.nsh07.pomodoro.R
2825
import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex400
2926
import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
@@ -50,48 +47,11 @@ val Typography = Typography(
5047

5148
@OptIn(ExperimentalTextApi::class)
5249
object AppFonts {
53-
val interClock = FontFamily(
54-
Font(
55-
R.font.inter_variable, variationSettings = FontVariation.Settings(
56-
FontWeight.Bold,
57-
FontStyle.Normal
58-
)
59-
)
60-
)
50+
val interClock = FontFamily(Font(R.font.inter_bold))
6151

62-
val googleFlex400 = FontFamily(
63-
Font(
64-
R.font.google_sans_flex_variable, variationSettings = FontVariation.Settings(
65-
FontVariation.weight(400)
66-
)
67-
)
68-
)
52+
val googleFlex400 = FontFamily(Font(R.font.google_sans_flex_400))
6953

70-
val googleFlex600 = FontFamily(
71-
Font(
72-
R.font.google_sans_flex_variable, variationSettings = FontVariation.Settings(
73-
FontVariation.weight(600),
74-
FontVariation.Setting("ROND", 100f)
75-
)
76-
)
77-
)
54+
val googleFlex600 = FontFamily(Font(R.font.google_sans_flex_600))
7855

79-
val robotoFlexTopBar = FontFamily(
80-
Font(
81-
R.font.roboto_flex_variable,
82-
variationSettings = FontVariation.Settings(
83-
FontVariation.width(125f),
84-
FontVariation.weight(1000),
85-
FontVariation.grade(0),
86-
FontVariation.Setting("XOPQ", 96F),
87-
FontVariation.Setting("XTRA", 500F),
88-
FontVariation.Setting("YOPQ", 79F),
89-
FontVariation.Setting("YTAS", 750F),
90-
FontVariation.Setting("YTDE", -203F),
91-
FontVariation.Setting("YTFI", 738F),
92-
FontVariation.Setting("YTLC", 514F),
93-
FontVariation.Setting("YTUC", 712F)
94-
)
95-
)
96-
)
56+
val robotoFlexTopBar = FontFamily(Font(R.font.roboto_flex_logo))
9757
}
1.34 MB
Binary file not shown.
1.03 MB
Binary file not shown.
-3.81 MB
Binary file not shown.
411 KB
Binary file not shown.
-859 KB
Binary file not shown.
227 KB
Binary file not shown.
-1.61 MB
Binary file not shown.

0 commit comments

Comments
 (0)