Changed default font to Inter
This commit is contained in:
parent
94536acf40
commit
57e3ba4aa7
@ -10,16 +10,15 @@ import androidx.compose.ui.text.font.FontWeight
|
|||||||
import androidx.compose.ui.text.platform.Font
|
import androidx.compose.ui.text.platform.Font
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
|
||||||
// Set of Material typography styles to start with
|
val interFontFamily = FontFamily(
|
||||||
val openSansFontFamily = FontFamily(
|
Font("fonts/Inter/Inter_18pt-Regular.ttf", FontWeight.Normal, FontStyle.Normal),
|
||||||
Font("fonts/OpenSans/OpenSans-Regular.ttf", FontWeight.Normal, FontStyle.Normal),
|
Font("fonts/Inter/Inter_18pt-Italic.ttf", FontWeight.Normal, FontStyle.Italic),
|
||||||
Font("fonts/OpenSans/OpenSans-Italic.ttf", FontWeight.Normal, FontStyle.Italic),
|
Font("fonts/Inter/Inter_18pt-Medium.ttf", FontWeight.Medium, FontStyle.Normal),
|
||||||
Font("fonts/OpenSans/OpenSans-Medium.ttf", FontWeight.Medium, FontStyle.Normal),
|
Font("fonts/Inter/Inter_18pt-MediumItalic.ttf", FontWeight.Medium, FontStyle.Italic),
|
||||||
Font("fonts/OpenSans/OpenSans-MediumItalic.ttf", FontWeight.Medium, FontStyle.Italic),
|
Font("fonts/Inter/Inter_18pt-SemiBold.ttf", FontWeight.SemiBold, FontStyle.Normal),
|
||||||
Font("fonts/OpenSans/OpenSans-SemiBold.ttf", FontWeight.SemiBold, FontStyle.Normal),
|
Font("fonts/Inter/Inter_18pt-SemiBoldItalic.ttf", FontWeight.SemiBold, FontStyle.Italic),
|
||||||
Font("fonts/OpenSans/OpenSans-SemiBoldItalic.ttf", FontWeight.SemiBold, FontStyle.Italic),
|
Font("fonts/Inter/Inter_18pt-Bold.ttf", FontWeight.Bold, FontStyle.Normal),
|
||||||
Font("fonts/OpenSans/OpenSans-Bold.ttf", FontWeight.Bold, FontStyle.Normal),
|
Font("fonts/Inter/Inter_18pt-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic),
|
||||||
Font("fonts/OpenSans/OpenSans-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
val notoSansMonoFontFamily = FontFamily(
|
val notoSansMonoFontFamily = FontFamily(
|
||||||
@ -37,7 +36,7 @@ const val LETTER_SPACING = 0.5
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun typography(composeColors: Colors) = Typography(
|
fun typography(composeColors: Colors) = Typography(
|
||||||
defaultFontFamily = openSansFontFamily,
|
defaultFontFamily = interFontFamily,
|
||||||
h1 = TextStyle(
|
h1 = TextStyle(
|
||||||
fontSize = 32.sp,
|
fontSize = 32.sp,
|
||||||
color = composeColors.onBackground,
|
color = composeColors.onBackground,
|
||||||
|
BIN
src/main/resources/fonts/Inter/Inter_18pt-Black.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Black.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-BlackItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-BlackItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-Bold.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Bold.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-BoldItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraBold.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraBold.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraBoldItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraBoldItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraLight.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraLight.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraLightItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-ExtraLightItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-Italic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Italic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-Light.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Light.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-LightItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-LightItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-Medium.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Medium.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-MediumItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-MediumItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-Regular.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Regular.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-SemiBold.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-SemiBold.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-SemiBoldItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-SemiBoldItalic.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-Thin.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-Thin.ttf
Normal file
Binary file not shown.
BIN
src/main/resources/fonts/Inter/Inter_18pt-ThinItalic.ttf
Normal file
BIN
src/main/resources/fonts/Inter/Inter_18pt-ThinItalic.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user