kopia lustrzana https://github.com/vitorpamplona/amethyst
Refining some of the Markdown to match Material3 Style
rodzic
3222f88999
commit
e91e5c366d
|
@ -637,7 +637,7 @@ private fun RenderLongFormHeaderForThread(noteEvent: LongTextNoteEvent) {
|
|||
Text(
|
||||
text = it,
|
||||
fontSize = 28.sp,
|
||||
fontWeight = FontWeight.Light,
|
||||
fontWeight = FontWeight.Bold,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
|
|
|
@ -25,6 +25,7 @@ import androidx.compose.ui.text.SpanStyle
|
|||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.core.view.WindowCompat
|
||||
import com.halilibo.richtext.ui.RichTextStyle
|
||||
import com.halilibo.richtext.ui.resolveDefaults
|
||||
|
@ -177,6 +178,9 @@ val RichTextDefaults = RichTextStyle().resolveDefaults()
|
|||
val MarkDownStyleOnDark = RichTextDefaults.copy(
|
||||
paragraphSpacing = DefaultParagraphSpacing,
|
||||
headingStyle = DefaultHeadingStyle,
|
||||
listStyle = RichTextDefaults.listStyle?.copy(
|
||||
itemSpacing = 10.sp
|
||||
),
|
||||
codeBlockStyle = RichTextDefaults.codeBlockStyle?.copy(
|
||||
textStyle = TextStyle(
|
||||
fontFamily = FontFamily.Monospace,
|
||||
|
@ -208,6 +212,9 @@ val MarkDownStyleOnDark = RichTextDefaults.copy(
|
|||
val MarkDownStyleOnLight = RichTextDefaults.copy(
|
||||
paragraphSpacing = DefaultParagraphSpacing,
|
||||
headingStyle = DefaultHeadingStyle,
|
||||
listStyle = RichTextDefaults.listStyle?.copy(
|
||||
itemSpacing = 10.sp
|
||||
),
|
||||
codeBlockStyle = RichTextDefaults.codeBlockStyle?.copy(
|
||||
textStyle = TextStyle(
|
||||
fontFamily = FontFamily.Monospace,
|
||||
|
|
|
@ -36,33 +36,32 @@ val Font17SP = 17.sp
|
|||
|
||||
val MarkdownTextStyle = TextStyle(lineHeight = 1.30.em)
|
||||
|
||||
val DefaultParagraphSpacing: TextUnit = 12.sp
|
||||
val DefaultParagraphSpacing: TextUnit = 16.sp
|
||||
|
||||
internal val DefaultHeadingStyle: HeadingStyle = { level, textStyle ->
|
||||
when (level) {
|
||||
0 -> textStyle.copy(
|
||||
fontSize = 30.sp,
|
||||
fontWeight = FontWeight.Light
|
||||
0 -> Typography.displayLarge.copy(
|
||||
fontSize = 32.sp,
|
||||
lineHeight = 40.sp
|
||||
)
|
||||
1 -> textStyle.copy(
|
||||
fontSize = 26.sp,
|
||||
fontWeight = FontWeight.Light
|
||||
1 -> Typography.displayMedium.copy(
|
||||
fontSize = 28.sp,
|
||||
lineHeight = 36.sp
|
||||
)
|
||||
2 -> textStyle.copy(
|
||||
2 -> Typography.displaySmall.copy(
|
||||
fontSize = 24.sp,
|
||||
lineHeight = 32.sp
|
||||
)
|
||||
3 -> Typography.headlineLarge.copy(
|
||||
fontSize = 22.sp,
|
||||
fontWeight = FontWeight.Light
|
||||
lineHeight = 26.sp
|
||||
)
|
||||
3 -> textStyle.copy(
|
||||
4 -> Typography.headlineMedium.copy(
|
||||
fontSize = 20.sp,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
4 -> textStyle.copy(
|
||||
fontSize = 18.sp,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
5 -> textStyle.copy(
|
||||
fontWeight = FontWeight.Bold
|
||||
lineHeight = 24.sp
|
||||
)
|
||||
5 -> Typography.headlineSmall
|
||||
6 -> Typography.titleLarge
|
||||
else -> textStyle
|
||||
}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue