diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt index 0910e5d..b53d6e5 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt @@ -21,9 +21,6 @@ import androidx.compose.material3.Typography import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontStyle -import androidx.compose.ui.text.font.FontVariation -import androidx.compose.ui.text.font.FontWeight import org.nsh07.pomodoro.R import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex400 import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600 @@ -50,48 +47,11 @@ val Typography = Typography( @OptIn(ExperimentalTextApi::class) object AppFonts { - val interClock = FontFamily( - Font( - R.font.inter_variable, variationSettings = FontVariation.Settings( - FontWeight.Bold, - FontStyle.Normal - ) - ) - ) + val interClock = FontFamily(Font(R.font.inter_bold)) - val googleFlex400 = FontFamily( - Font( - R.font.google_sans_flex_variable, variationSettings = FontVariation.Settings( - FontVariation.weight(400) - ) - ) - ) + val googleFlex400 = FontFamily(Font(R.font.google_sans_flex_400)) - val googleFlex600 = FontFamily( - Font( - R.font.google_sans_flex_variable, variationSettings = FontVariation.Settings( - FontVariation.weight(600), - FontVariation.Setting("ROND", 100f) - ) - ) - ) + val googleFlex600 = FontFamily(Font(R.font.google_sans_flex_600)) - val robotoFlexTopBar = FontFamily( - Font( - R.font.roboto_flex_variable, - variationSettings = FontVariation.Settings( - FontVariation.width(125f), - FontVariation.weight(1000), - FontVariation.grade(0), - FontVariation.Setting("XOPQ", 96F), - FontVariation.Setting("XTRA", 500F), - FontVariation.Setting("YOPQ", 79F), - FontVariation.Setting("YTAS", 750F), - FontVariation.Setting("YTDE", -203F), - FontVariation.Setting("YTFI", 738F), - FontVariation.Setting("YTLC", 514F), - FontVariation.Setting("YTUC", 712F) - ) - ) - ) + val robotoFlexTopBar = FontFamily(Font(R.font.roboto_flex_logo)) } \ No newline at end of file diff --git a/app/src/main/res/font/google_sans_flex_400.ttf b/app/src/main/res/font/google_sans_flex_400.ttf new file mode 100644 index 0000000..2ec8aa6 Binary files /dev/null and b/app/src/main/res/font/google_sans_flex_400.ttf differ diff --git a/app/src/main/res/font/google_sans_flex_600.ttf b/app/src/main/res/font/google_sans_flex_600.ttf new file mode 100644 index 0000000..560b7d0 Binary files /dev/null and b/app/src/main/res/font/google_sans_flex_600.ttf differ diff --git a/app/src/main/res/font/google_sans_flex_variable.ttf b/app/src/main/res/font/google_sans_flex_variable.ttf deleted file mode 100644 index 83f272d..0000000 Binary files a/app/src/main/res/font/google_sans_flex_variable.ttf and /dev/null differ diff --git a/app/src/main/res/font/inter_bold.ttf b/app/src/main/res/font/inter_bold.ttf new file mode 100644 index 0000000..9fb9b75 Binary files /dev/null and b/app/src/main/res/font/inter_bold.ttf differ diff --git a/app/src/main/res/font/inter_variable.ttf b/app/src/main/res/font/inter_variable.ttf deleted file mode 100644 index 4ab79e0..0000000 Binary files a/app/src/main/res/font/inter_variable.ttf and /dev/null differ diff --git a/app/src/main/res/font/roboto_flex_logo.ttf b/app/src/main/res/font/roboto_flex_logo.ttf new file mode 100644 index 0000000..7169576 Binary files /dev/null and b/app/src/main/res/font/roboto_flex_logo.ttf differ diff --git a/app/src/main/res/font/roboto_flex_variable.ttf b/app/src/main/res/font/roboto_flex_variable.ttf deleted file mode 100644 index 2e5c2a2..0000000 Binary files a/app/src/main/res/font/roboto_flex_variable.ttf and /dev/null differ