mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-06-03 13:20:31 +00:00
use default font for titles
This commit is contained in:
parent
875491a0e1
commit
2a7ac3cf79
2 changed files with 4 additions and 18 deletions
|
@ -12,9 +12,6 @@ import androidx.compose.material3.lightColorScheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.res.colorResource
|
import androidx.compose.ui.res.colorResource
|
||||||
import androidx.compose.ui.text.font.DeviceFontFamilyName
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import helium314.keyboard.latin.R
|
import helium314.keyboard.latin.R
|
||||||
|
|
||||||
|
@ -36,20 +33,9 @@ fun Theme(dark: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit
|
||||||
MaterialTheme(
|
MaterialTheme(
|
||||||
colorScheme = colorScheme,
|
colorScheme = colorScheme,
|
||||||
typography = Typography(
|
typography = Typography(
|
||||||
headlineMedium = material3.headlineMedium.copy(fontWeight = FontWeight.Bold),
|
titleLarge = material3.titleLarge.copy(fontWeight = FontWeight.Bold),
|
||||||
headlineSmall = material3.headlineSmall.copy(fontWeight = FontWeight.Bold),
|
titleMedium = material3.titleMedium.copy(fontWeight = FontWeight.Bold),
|
||||||
titleLarge = material3.titleLarge.copy(
|
titleSmall = material3.titleSmall.copy(fontWeight = FontWeight.Bold)
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
fontFamily = FontFamily(Font(DeviceFontFamilyName("sans-serif-condensed"), FontWeight.Bold))
|
|
||||||
),
|
|
||||||
titleMedium = material3.titleMedium.copy(
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
fontFamily = FontFamily(Font(DeviceFontFamilyName("sans-serif-condensed"), FontWeight.Bold))
|
|
||||||
),
|
|
||||||
titleSmall = material3.titleSmall.copy(
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
fontFamily = FontFamily(Font(DeviceFontFamilyName("sans-serif-condensed"), FontWeight.Bold))
|
|
||||||
)
|
|
||||||
),
|
),
|
||||||
//shapes = Shapes(),
|
//shapes = Shapes(),
|
||||||
content = content
|
content = content
|
||||||
|
|
|
@ -64,7 +64,7 @@ fun ThreeButtonAlertDialog(
|
||||||
bottom = if (reducePadding) 2.dp else 6.dp
|
bottom = if (reducePadding) 2.dp else 6.dp
|
||||||
)) {
|
)) {
|
||||||
title?.let {
|
title?.let {
|
||||||
CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.titleLarge) {
|
CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.titleMedium) {
|
||||||
Box(Modifier.padding(PaddingValues(bottom = if (reducePadding) 4.dp else 16.dp))) {
|
Box(Modifier.padding(PaddingValues(bottom = if (reducePadding) 4.dp else 16.dp))) {
|
||||||
title()
|
title()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue