diff --git a/src/main/kotlin/app/theme/Theme.kt b/src/main/kotlin/app/theme/Theme.kt index 5390dea..0583071 100644 --- a/src/main/kotlin/app/theme/Theme.kt +++ b/src/main/kotlin/app/theme/Theme.kt @@ -40,6 +40,7 @@ fun AppTheme(theme: Themes = Themes.LIGHT, content: @Composable() () -> Unit) { MaterialTheme( colors = colors, content = content, + typography = typography, ) } diff --git a/src/main/kotlin/app/theme/Type.kt b/src/main/kotlin/app/theme/Type.kt new file mode 100644 index 0000000..fe6c4c4 --- /dev/null +++ b/src/main/kotlin/app/theme/Type.kt @@ -0,0 +1,24 @@ +package app.theme + +import androidx.compose.material.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontStyle +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 fontFamily = FontFamily( + Font("fonts/OpenSans-Regular.ttf", FontWeight.Normal, FontStyle.Normal), + Font("fonts/OpenSans-Italic.ttf", FontWeight.Normal, FontStyle.Italic), + Font("fonts/OpenSans-Medium.ttf", FontWeight.Medium, FontStyle.Normal), + Font("fonts/OpenSans-MediumItalic.ttf", FontWeight.Medium, FontStyle.Italic), + Font("fonts/OpenSans-SemiBold.ttf", FontWeight.SemiBold, FontStyle.Normal), + Font("fonts/OpenSans-SemiBoldItalic.ttf", FontWeight.SemiBold, FontStyle.Italic), + Font("fonts/OpenSans-Bold.ttf", FontWeight.Bold, FontStyle.Normal), + Font("fonts/OpenSans-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic), +) +val typography = Typography( + defaultFontFamily = fontFamily +) \ No newline at end of file diff --git a/src/main/resources/fonts/OpenSans-Bold.ttf b/src/main/resources/fonts/OpenSans-Bold.ttf new file mode 100644 index 0000000..4d8f3e5 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-Bold.ttf differ diff --git a/src/main/resources/fonts/OpenSans-BoldItalic.ttf b/src/main/resources/fonts/OpenSans-BoldItalic.ttf new file mode 100644 index 0000000..eba75d7 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-BoldItalic.ttf differ diff --git a/src/main/resources/fonts/OpenSans-Italic.ttf b/src/main/resources/fonts/OpenSans-Italic.ttf new file mode 100644 index 0000000..b088474 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-Italic.ttf differ diff --git a/src/main/resources/fonts/OpenSans-Medium.ttf b/src/main/resources/fonts/OpenSans-Medium.ttf new file mode 100644 index 0000000..6b41918 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-Medium.ttf differ diff --git a/src/main/resources/fonts/OpenSans-MediumItalic.ttf b/src/main/resources/fonts/OpenSans-MediumItalic.ttf new file mode 100644 index 0000000..c84fe4f Binary files /dev/null and b/src/main/resources/fonts/OpenSans-MediumItalic.ttf differ diff --git a/src/main/resources/fonts/OpenSans-Regular.ttf b/src/main/resources/fonts/OpenSans-Regular.ttf new file mode 100644 index 0000000..3a29f26 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-Regular.ttf differ diff --git a/src/main/resources/fonts/OpenSans-SemiBold.ttf b/src/main/resources/fonts/OpenSans-SemiBold.ttf new file mode 100644 index 0000000..219f6e8 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-SemiBold.ttf differ diff --git a/src/main/resources/fonts/OpenSans-SemiBoldItalic.ttf b/src/main/resources/fonts/OpenSans-SemiBoldItalic.ttf new file mode 100644 index 0000000..259ac50 Binary files /dev/null and b/src/main/resources/fonts/OpenSans-SemiBoldItalic.ttf differ