diff --git a/app/src/main/java/helium314/keyboard/settings/Theme.kt b/app/src/main/java/helium314/keyboard/settings/Theme.kt index e8924a300..32d8121b9 100644 --- a/app/src/main/java/helium314/keyboard/settings/Theme.kt +++ b/app/src/main/java/helium314/keyboard/settings/Theme.kt @@ -12,9 +12,6 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext 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 helium314.keyboard.latin.R @@ -36,20 +33,9 @@ fun Theme(dark: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit MaterialTheme( colorScheme = colorScheme, typography = Typography( - headlineMedium = material3.headlineMedium.copy(fontWeight = FontWeight.Bold), - headlineSmall = material3.headlineSmall.copy(fontWeight = FontWeight.Bold), - titleLarge = material3.titleLarge.copy( - 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)) - ) + titleLarge = material3.titleLarge.copy(fontWeight = FontWeight.Bold), + titleMedium = material3.titleMedium.copy(fontWeight = FontWeight.Bold), + titleSmall = material3.titleSmall.copy(fontWeight = FontWeight.Bold) ), //shapes = Shapes(), content = content diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt index 2b34bcd89..a299c90ba 100644 --- a/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt +++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt @@ -64,7 +64,7 @@ fun ThreeButtonAlertDialog( bottom = if (reducePadding) 2.dp else 6.dp )) { 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))) { title() }