wbrawner/SimpleMarkdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various fixes for 1.0 release #3

Merged
wbrawner merged 4 commits from workflow into main 2024-07-12 04:34:04 +00:00
Conversation 0 Commits 4 Files changed 10 +6 -1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 06cbc5ec31 - Show all commits

7
app/src/main/java/com/wbrawner/simplemarkdown/ui/MarkdownText.kt
View file

@ -3,6 +3,7 @@ package com.wbrawner.simplemarkdown.ui
import android.view.ViewGroup import android.view.ViewGroup
import android.webkit.WebView import android.webkit.WebView
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
@ -62,8 +63,9 @@ fun MarkdownText(modifier: Modifier = Modifier, markdown: String) {
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.verticalScroll(rememberScrollState()), .verticalScroll(rememberScrollState()),
verticalArrangement = Arrangement.Top
) { ) {
HtmlText(modifier = modifier, html = html) HtmlText(html = html)
} }
} }
@ -76,6 +78,9 @@ fun HtmlText(html: String, modifier: Modifier = Modifier) {
| background: #${materialColors.surface.toArgb().toHexString().substring(2)}; | background: #${materialColors.surface.toArgb().toHexString().substring(2)};
| color: #${materialColors.onSurface.toArgb().toHexString().substring(2)}; | color: #${materialColors.onSurface.toArgb().toHexString().substring(2)};
|} |}
|a {
| color: #${materialColors.secondary.toArgb().toHexString().substring(2)};
|}
|pre { |pre {
| background: #${materialColors.surfaceVariant.toArgb().toHexString().substring(2)}; | background: #${materialColors.surfaceVariant.toArgb().toHexString().substring(2)};
| color: #${materialColors.onSurfaceVariant.toArgb().toHexString().substring(2)}; | color: #${materialColors.onSurfaceVariant.toArgb().toHexString().substring(2)};