diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt index 0b1a77f..001630e 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt @@ -10,16 +10,15 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.platform.Font import androidx.compose.ui.unit.sp -// Set of Material typography styles to start with -val openSansFontFamily = FontFamily( - Font("fonts/OpenSans/OpenSans-Regular.ttf", FontWeight.Normal, FontStyle.Normal), - Font("fonts/OpenSans/OpenSans-Italic.ttf", FontWeight.Normal, FontStyle.Italic), - Font("fonts/OpenSans/OpenSans-Medium.ttf", FontWeight.Medium, FontStyle.Normal), - Font("fonts/OpenSans/OpenSans-MediumItalic.ttf", FontWeight.Medium, FontStyle.Italic), - Font("fonts/OpenSans/OpenSans-SemiBold.ttf", FontWeight.SemiBold, FontStyle.Normal), - Font("fonts/OpenSans/OpenSans-SemiBoldItalic.ttf", FontWeight.SemiBold, FontStyle.Italic), - Font("fonts/OpenSans/OpenSans-Bold.ttf", FontWeight.Bold, FontStyle.Normal), - Font("fonts/OpenSans/OpenSans-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic), +val interFontFamily = FontFamily( + Font("fonts/Inter/Inter_18pt-Regular.ttf", FontWeight.Normal, FontStyle.Normal), + Font("fonts/Inter/Inter_18pt-Italic.ttf", FontWeight.Normal, FontStyle.Italic), + Font("fonts/Inter/Inter_18pt-Medium.ttf", FontWeight.Medium, FontStyle.Normal), + Font("fonts/Inter/Inter_18pt-MediumItalic.ttf", FontWeight.Medium, FontStyle.Italic), + Font("fonts/Inter/Inter_18pt-SemiBold.ttf", FontWeight.SemiBold, FontStyle.Normal), + Font("fonts/Inter/Inter_18pt-SemiBoldItalic.ttf", FontWeight.SemiBold, FontStyle.Italic), + Font("fonts/Inter/Inter_18pt-Bold.ttf", FontWeight.Bold, FontStyle.Normal), + Font("fonts/Inter/Inter_18pt-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic), ) val notoSansMonoFontFamily = FontFamily( @@ -37,7 +36,7 @@ const val LETTER_SPACING = 0.5 @Composable fun typography(composeColors: Colors) = Typography( - defaultFontFamily = openSansFontFamily, + defaultFontFamily = interFontFamily, h1 = TextStyle( fontSize = 32.sp, color = composeColors.onBackground, diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Black.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Black.ttf new file mode 100644 index 0000000..89673de Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Black.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-BlackItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-BlackItalic.ttf new file mode 100644 index 0000000..b33602f Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-BlackItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Bold.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Bold.ttf new file mode 100644 index 0000000..cd13f60 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Bold.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-BoldItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-BoldItalic.ttf new file mode 100644 index 0000000..0d19c1a Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-BoldItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-ExtraBold.ttf b/src/main/resources/fonts/Inter/Inter_18pt-ExtraBold.ttf new file mode 100644 index 0000000..e71c601 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-ExtraBold.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-ExtraBoldItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-ExtraBoldItalic.ttf new file mode 100644 index 0000000..df45062 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-ExtraBoldItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-ExtraLight.ttf b/src/main/resources/fonts/Inter/Inter_18pt-ExtraLight.ttf new file mode 100644 index 0000000..f9c6cfc Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-ExtraLight.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-ExtraLightItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-ExtraLightItalic.ttf new file mode 100644 index 0000000..275f305 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-ExtraLightItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Italic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Italic.ttf new file mode 100644 index 0000000..14d3595 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Italic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Light.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Light.ttf new file mode 100644 index 0000000..acae361 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Light.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-LightItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-LightItalic.ttf new file mode 100644 index 0000000..f69e18b Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-LightItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Medium.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Medium.ttf new file mode 100644 index 0000000..71d9017 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Medium.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-MediumItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-MediumItalic.ttf new file mode 100644 index 0000000..5c8c8b1 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-MediumItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Regular.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Regular.ttf new file mode 100644 index 0000000..ce097c8 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Regular.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-SemiBold.ttf b/src/main/resources/fonts/Inter/Inter_18pt-SemiBold.ttf new file mode 100644 index 0000000..053185e Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-SemiBold.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-SemiBoldItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-SemiBoldItalic.ttf new file mode 100644 index 0000000..d9c9896 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-SemiBoldItalic.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-Thin.ttf b/src/main/resources/fonts/Inter/Inter_18pt-Thin.ttf new file mode 100644 index 0000000..e68ec47 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-Thin.ttf differ diff --git a/src/main/resources/fonts/Inter/Inter_18pt-ThinItalic.ttf b/src/main/resources/fonts/Inter/Inter_18pt-ThinItalic.ttf new file mode 100644 index 0000000..134e837 Binary files /dev/null and b/src/main/resources/fonts/Inter/Inter_18pt-ThinItalic.ttf differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-Bold.ttf b/src/main/resources/fonts/OpenSans/OpenSans-Bold.ttf deleted file mode 100644 index 4d8f3e5..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-Bold.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf b/src/main/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf deleted file mode 100644 index eba75d7..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-Italic.ttf b/src/main/resources/fonts/OpenSans/OpenSans-Italic.ttf deleted file mode 100644 index b088474..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-Italic.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-Medium.ttf b/src/main/resources/fonts/OpenSans/OpenSans-Medium.ttf deleted file mode 100644 index 6b41918..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-Medium.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-MediumItalic.ttf b/src/main/resources/fonts/OpenSans/OpenSans-MediumItalic.ttf deleted file mode 100644 index c84fe4f..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-MediumItalic.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-Regular.ttf b/src/main/resources/fonts/OpenSans/OpenSans-Regular.ttf deleted file mode 100644 index 3a29f26..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-Regular.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-SemiBold.ttf b/src/main/resources/fonts/OpenSans/OpenSans-SemiBold.ttf deleted file mode 100644 index 219f6e8..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-SemiBold.ttf and /dev/null differ diff --git a/src/main/resources/fonts/OpenSans/OpenSans-SemiBoldItalic.ttf b/src/main/resources/fonts/OpenSans/OpenSans-SemiBoldItalic.ttf deleted file mode 100644 index 259ac50..0000000 Binary files a/src/main/resources/fonts/OpenSans/OpenSans-SemiBoldItalic.ttf and /dev/null differ