Compare commits
5
Commits
586852073e
..
1.6.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7c080939c | ||
|
|
2c8668dab3 | ||
|
|
e4e50db08e | ||
|
|
98ec38f272 | ||
|
|
6040ca8db5 |
No files matched your search
@@ -14,7 +14,6 @@ import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.luminance
|
||||
import androidx.compose.ui.layout.onSizeChanged
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.platform.testTag
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
@@ -22,12 +21,9 @@ import androidx.compose.ui.semantics.semantics
|
||||
import androidx.compose.ui.semantics.testTagsAsResourceId
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.text.AnnotatedString
|
||||
import androidx.compose.ui.text.SpanStyle
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.style.BaselineShift
|
||||
import androidx.compose.ui.text.style.LineHeightStyle
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.Density
|
||||
import androidx.compose.ui.unit.isUnspecified
|
||||
import androidx.compose.ui.unit.IntSize
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.example.research.R
|
||||
@@ -60,17 +56,8 @@ fun ArticleRoute(
|
||||
private const val MERGED_BLOCK_MAX_CHARS = 1500
|
||||
private const val MERGED_BLOCK_MAX_ITEMS = 12
|
||||
|
||||
private fun mergeDslBlocks(
|
||||
blocks: List<DslBlock>,
|
||||
density: Density,
|
||||
baseStyle: TextStyle,
|
||||
): List<DslBlock> {
|
||||
private fun mergeDslBlocks(blocks: List<DslBlock>): List<DslBlock> {
|
||||
if (blocks.size <= MERGED_BLOCK_MAX_ITEMS) return blocks
|
||||
val gapShift = with(density) {
|
||||
val fontPx =
|
||||
if (baseStyle.fontSize.isUnspecified) 0f else baseStyle.fontSize.toPx()
|
||||
if (fontPx > 0f) 8.dp.toPx() / (0.534f * fontPx) else 0.94f
|
||||
}
|
||||
val merged = ArrayList<DslBlock>(blocks.size / 4)
|
||||
var i = 0
|
||||
while (i < blocks.size) {
|
||||
@@ -93,15 +80,6 @@ private fun mergeDslBlocks(
|
||||
val more = j + 1 < blocks.size &&
|
||||
(j + 1 - i) < MERGED_BLOCK_MAX_ITEMS &&
|
||||
builder.length < MERGED_BLOCK_MAX_CHARS
|
||||
if (more && !blocks[j + 1].continuesPrevious) {
|
||||
val shiftPos = builder.length
|
||||
builder.append('')
|
||||
builder.addStyle(
|
||||
SpanStyle(baselineShift = BaselineShift(-gapShift)),
|
||||
shiftPos,
|
||||
shiftPos + 1
|
||||
)
|
||||
}
|
||||
if (more) {
|
||||
builder.append('\n')
|
||||
}
|
||||
@@ -138,7 +116,11 @@ fun ArticleContent(
|
||||
is ArticleState.Success -> {
|
||||
val articleSaveKey = "${articleState.dictionaryPath}:${articleState.title}"
|
||||
val baseTextStyle = MaterialTheme.typography.bodyLarge.copy(
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
lineHeightStyle = LineHeightStyle(
|
||||
alignment = LineHeightStyle.Alignment.Proportional,
|
||||
trim = LineHeightStyle.Trim.Both,
|
||||
),
|
||||
)
|
||||
val indentStep = 16.dp
|
||||
|
||||
@@ -198,16 +180,14 @@ fun ArticleContent(
|
||||
val isHeavyArticle =
|
||||
articleState.dslContent.size > HEAVY_ARTICLE_BLOCK_COUNT
|
||||
|
||||
val density = LocalDensity.current
|
||||
val darkTheme = MaterialTheme.colorScheme.background.luminance() < 0.5f
|
||||
val displayBlocks = remember(
|
||||
articleState.dslContent,
|
||||
density,
|
||||
baseTextStyle,
|
||||
darkTheme
|
||||
) {
|
||||
val merged =
|
||||
mergeDslBlocks(articleState.dslContent, density, baseTextStyle)
|
||||
mergeDslBlocks(articleState.dslContent)
|
||||
if (darkTheme) {
|
||||
merged.map {
|
||||
it.copy(text = DslAnnotatedParser.remapForDarkTheme(it.text))
|
||||
@@ -233,32 +213,24 @@ fun ArticleContent(
|
||||
},
|
||||
contentType = { _, _ -> "article_block" }
|
||||
) { index, block ->
|
||||
val followedByContinuation =
|
||||
displayBlocks.getOrNull(index + 1)?.continuesPrevious == true
|
||||
val textContent = @Composable {
|
||||
Box(
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(start = Spacing.contentStart + indentStep * block.indent)
|
||||
) {
|
||||
ArticleLinkText(
|
||||
block = block,
|
||||
linksEnabled = true,
|
||||
preferDirectHitTesting = isHeavyArticle,
|
||||
style = baseTextStyle,
|
||||
onRefClick = refClickHandler,
|
||||
onTextLayout = {},
|
||||
modifier = Modifier
|
||||
.padding(
|
||||
start = Spacing.contentStart + indentStep * block.indent
|
||||
)
|
||||
.padding(bottom = if (followedByContinuation) 0.dp else 8.dp)
|
||||
) {
|
||||
ArticleLinkText(
|
||||
block = block,
|
||||
linksEnabled = true,
|
||||
preferDirectHitTesting = isHeavyArticle,
|
||||
style = baseTextStyle,
|
||||
onRefClick = refClickHandler,
|
||||
onTextLayout = {},
|
||||
modifier = Modifier
|
||||
.testTag("article_block_$index")
|
||||
.semantics {
|
||||
testTagsAsResourceId = true
|
||||
}
|
||||
)
|
||||
}
|
||||
.testTag("article_block_$index")
|
||||
.semantics {
|
||||
testTagsAsResourceId = true
|
||||
}
|
||||
)
|
||||
}
|
||||
textContent()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ aboutlibraries = "15.2.0"
|
||||
activity_compose = "1.13.0"
|
||||
agp = "9.4.1"
|
||||
compose_bom = "2026.09.00"
|
||||
core = "1.19.0"
|
||||
core = "1.19.1"
|
||||
datastore_preferences = "1.2.1"
|
||||
documentfile = "1.1.0"
|
||||
kotlin = "2.4.20"
|
||||
|
||||
Reference in new issue
Block a user