Add character-based text wrapping
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled

This commit is contained in:
BookOasis Reader
2026-09-29 12:36:37 +09:00
parent c622f74c62
commit a7edba607a
5 changed files with 118 additions and 7 deletions
@@ -33,6 +33,11 @@ private val fontFamilies = listOf(
MR.strings.pref_text_reader_font_mono to ReaderPreferences.TextFontFamily.MONOSPACE, MR.strings.pref_text_reader_font_mono to ReaderPreferences.TextFontFamily.MONOSPACE,
) )
private val lineBreakModes = listOf(
MR.strings.pref_text_reader_line_break_word to ReaderPreferences.TextLineBreakMode.WORD,
MR.strings.pref_text_reader_line_break_character to ReaderPreferences.TextLineBreakMode.CHARACTER,
)
@Composable @Composable
internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) { internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
val context = LocalContext.current val context = LocalContext.current
@@ -105,6 +110,21 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
pillColor = MaterialTheme.colorScheme.surfaceContainerHighest, pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
) )
val lineBreakModePref = viewModel.preferences.textLineBreakMode
val lineBreakMode by lineBreakModePref.collectAsState()
SettingsChipRow(MR.strings.pref_text_reader_line_break_mode) {
lineBreakModes.forEach { (label, value) ->
FilterChip(
selected = lineBreakMode == value,
onClick = {
lineBreakModePref.set(value)
viewModel.previewAndRequestTextSettingsReload()
},
label = { Text(stringResource(label)) },
)
}
}
val fontFamilyPref = viewModel.preferences.textFontFamily val fontFamilyPref = viewModel.preferences.textFontFamily
val fontFamily by fontFamilyPref.collectAsState() val fontFamily by fontFamilyPref.collectAsState()
SettingsChipRow(MR.strings.pref_text_reader_font_family) { SettingsChipRow(MR.strings.pref_text_reader_font_family) {
@@ -8,16 +8,20 @@ import android.graphics.Typeface
import android.text.Layout import android.text.Layout
import android.text.Spannable import android.text.Spannable
import android.text.SpannableString import android.text.SpannableString
import android.text.SpannableStringBuilder
import android.text.StaticLayout import android.text.StaticLayout
import android.text.TextPaint import android.text.TextPaint
import android.text.style.BackgroundColorSpan import android.text.style.BackgroundColorSpan
import android.text.style.ForegroundColorSpan import android.text.style.ForegroundColorSpan
import android.text.style.LineHeightSpan import android.text.style.LineHeightSpan
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences.TextLineBreakMode
import eu.kanade.tachiyomi.ui.reader.setting.TextReaderStyle import eu.kanade.tachiyomi.ui.reader.setting.TextReaderStyle
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.InputStream import java.io.InputStream
import java.io.Reader import java.io.Reader
import java.text.BreakIterator
import java.util.Locale
import kotlin.math.roundToInt import kotlin.math.roundToInt
internal data class PaginatedTextPage( internal data class PaginatedTextPage(
@@ -30,6 +34,7 @@ internal object TextPageRenderer {
private const val VERTICAL_MARGIN_DP = 32f private const val VERTICAL_MARGIN_DP = 32f
private const val STREAM_BUFFER_CHARS = 64 * 1024 private const val STREAM_BUFFER_CHARS = 64 * 1024
private const val STREAM_READ_CHARS = 8 * 1024 private const val STREAM_READ_CHARS = 8 * 1024
private const val ZERO_WIDTH_SPACE = "\u200B"
fun paginate(text: String, style: TextReaderStyle): List<PaginatedTextPage> { fun paginate(text: String, style: TextReaderStyle): List<PaginatedTextPage> {
if (text.isBlank()) return emptyList() if (text.isBlank()) return emptyList()
@@ -133,7 +138,8 @@ internal object TextPageRenderer {
if (text.isEmpty()) return emptyList() if (text.isEmpty()) return emptyList()
val metrics = resolveLayoutMetrics(style) val metrics = resolveLayoutMetrics(style)
val layout = createLayout(text, style, metrics.contentWidth) val builtLayout = createLayout(text, style, metrics.contentWidth)
val layout = builtLayout.layout
if (layout.lineCount == 0) return listOf(PageSlice(0, text.length)) if (layout.lineCount == 0) return listOf(PageSlice(0, text.length))
val pages = mutableListOf<PageSlice>() val pages = mutableListOf<PageSlice>()
@@ -148,8 +154,10 @@ internal object TextPageRenderer {
endLine++ endLine++
} }
val start = layout.getLineStart(startLine) val start = builtLayout.originalOffset(layout.getLineStart(startLine))
val end = layout.getLineEnd(endLine).coerceAtLeast(start + 1).coerceAtMost(text.length) val end = builtLayout.originalOffset(layout.getLineEnd(endLine))
.coerceAtLeast(start + 1)
.coerceAtMost(text.length)
pages += PageSlice(start, end) pages += PageSlice(start, end)
startLine = endLine + 1 startLine = endLine + 1
} }
@@ -175,7 +183,7 @@ internal object TextPageRenderer {
contentWidth = metrics.contentWidth, contentWidth = metrics.contentWidth,
sentenceHighlightRange = sentenceHighlightRange, sentenceHighlightRange = sentenceHighlightRange,
activeHighlightRange = activeHighlightRange, activeHighlightRange = activeHighlightRange,
).draw(canvas) ).layout.draw(canvas)
canvas.restore() canvas.restore()
val output = ByteArrayOutputStream() val output = ByteArrayOutputStream()
@@ -190,7 +198,7 @@ internal object TextPageRenderer {
contentWidth: Int, contentWidth: Int,
sentenceHighlightRange: IntRange? = null, sentenceHighlightRange: IntRange? = null,
activeHighlightRange: IntRange? = null, activeHighlightRange: IntRange? = null,
): StaticLayout { ): BuiltLayout {
val (_, textColor) = resolveColors(style) val (_, textColor) = resolveColors(style)
val paint = TextPaint().apply { val paint = TextPaint().apply {
isAntiAlias = true isAntiAlias = true
@@ -206,8 +214,9 @@ internal object TextPageRenderer {
sentenceHighlightRange = sentenceHighlightRange, sentenceHighlightRange = sentenceHighlightRange,
activeHighlightRange = activeHighlightRange, activeHighlightRange = activeHighlightRange,
) )
return StaticLayout.Builder val preparedText = prepareLineBreakText(text, styledText, style.lineBreakMode)
.obtain(styledText, 0, styledText.length, paint, contentWidth) val layout = StaticLayout.Builder
.obtain(preparedText.text, 0, preparedText.text.length, paint, contentWidth)
.setAlignment(Layout.Alignment.ALIGN_NORMAL) .setAlignment(Layout.Alignment.ALIGN_NORMAL)
// Page slices are laid out again when rendered. Keeping font padding // Page slices are laid out again when rendered. Keeping font padding
// here can make the sliced layout taller than the same lines measured // here can make the sliced layout taller than the same lines measured
@@ -215,6 +224,55 @@ internal object TextPageRenderer {
.setIncludePad(false) .setIncludePad(false)
.setLineSpacing(0f, style.lineSpacingPercent / 100f) .setLineSpacing(0f, style.lineSpacingPercent / 100f)
.build() .build()
return BuiltLayout(layout, preparedText.originalOffsetByPreparedOffset)
}
private fun prepareLineBreakText(
originalText: String,
styledText: CharSequence,
mode: TextLineBreakMode,
): PreparedText {
if (mode == TextLineBreakMode.WORD || originalText.length < 2) {
return PreparedText(styledText, null)
}
val breakIterator = BreakIterator.getCharacterInstance(Locale.ROOT).apply {
setText(originalText)
}
val insertionOffsets = mutableListOf<Int>()
var boundary = breakIterator.first()
while (true) {
boundary = breakIterator.next()
if (boundary == BreakIterator.DONE || boundary >= originalText.length) break
if (boundary <= 0) continue
val before = originalText.codePointBefore(boundary)
val after = originalText.codePointAt(boundary)
if (!Character.isWhitespace(before) && !Character.isWhitespace(after)) {
insertionOffsets += boundary
}
}
if (insertionOffsets.isEmpty()) return PreparedText(styledText, null)
val prepared = SpannableStringBuilder(styledText)
insertionOffsets.asReversed().forEach { offset ->
prepared.insert(offset, ZERO_WIDTH_SPACE)
}
val insertedAt = BooleanArray(originalText.length + 1)
insertionOffsets.forEach { insertedAt[it] = true }
val mapping = IntArray(prepared.length + 1)
var preparedOffset = 0
mapping[0] = 0
for (originalOffset in 0 until originalText.length) {
if (insertedAt[originalOffset]) {
preparedOffset++
mapping[preparedOffset] = originalOffset
}
preparedOffset++
mapping[preparedOffset] = originalOffset + 1
}
return PreparedText(prepared, mapping)
} }
private fun resolveLayoutMetrics(style: TextReaderStyle): LayoutMetrics { private fun resolveLayoutMetrics(style: TextReaderStyle): LayoutMetrics {
@@ -340,6 +398,21 @@ internal object TextPageRenderer {
} }
} }
private data class PreparedText(
val text: CharSequence,
val originalOffsetByPreparedOffset: IntArray?,
)
private data class BuiltLayout(
val layout: StaticLayout,
val originalOffsetByLayoutOffset: IntArray?,
) {
fun originalOffset(layoutOffset: Int): Int {
val mapping = originalOffsetByLayoutOffset ?: return layoutOffset
return mapping[layoutOffset.coerceIn(0, mapping.lastIndex)]
}
}
private data class LayoutMetrics( private data class LayoutMetrics(
val pageWidth: Int, val pageWidth: Int,
val pageHeight: Int, val pageHeight: Int,
@@ -122,6 +122,11 @@ class ReaderPreferences(
val textHorizontalMargin: Preference<Int> = preferenceStore.getInt("reader_text_horizontal_margin", 32) val textHorizontalMargin: Preference<Int> = preferenceStore.getInt("reader_text_horizontal_margin", 32)
val textLineBreakMode: Preference<TextLineBreakMode> = preferenceStore.getEnum(
"reader_text_line_break_mode",
TextLineBreakMode.WORD,
)
val textFontFamily: Preference<TextFontFamily> = preferenceStore.getEnum( val textFontFamily: Preference<TextFontFamily> = preferenceStore.getEnum(
"reader_text_font_family", "reader_text_font_family",
TextFontFamily.SYSTEM, TextFontFamily.SYSTEM,
@@ -164,6 +169,7 @@ class ReaderPreferences(
lineSpacingPercent = textLineSpacing.get(), lineSpacingPercent = textLineSpacing.get(),
paragraphSpacing = textParagraphSpacing.get(), paragraphSpacing = textParagraphSpacing.get(),
horizontalMarginDp = textHorizontalMargin.get(), horizontalMarginDp = textHorizontalMargin.get(),
lineBreakMode = textLineBreakMode.get(),
fontFamily = textFontFamily.get(), fontFamily = textFontFamily.get(),
readerTheme = readerTheme.get(), readerTheme = readerTheme.get(),
automaticDark = (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == automaticDark = (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) ==
@@ -304,6 +310,11 @@ class ReaderPreferences(
MONOSPACE("monospace"), MONOSPACE("monospace"),
} }
enum class TextLineBreakMode {
WORD,
CHARACTER,
}
enum class FlashColor { enum class FlashColor {
BLACK, BLACK,
WHITE, WHITE,
@@ -439,6 +450,7 @@ data class TextReaderStyle(
val lineSpacingPercent: Int, val lineSpacingPercent: Int,
val paragraphSpacing: Int, val paragraphSpacing: Int,
val horizontalMarginDp: Int, val horizontalMarginDp: Int,
val lineBreakMode: ReaderPreferences.TextLineBreakMode,
val fontFamily: ReaderPreferences.TextFontFamily, val fontFamily: ReaderPreferences.TextFontFamily,
val readerTheme: Int, val readerTheme: Int,
val automaticDark: Boolean, val automaticDark: Boolean,
@@ -1114,6 +1114,9 @@
<string name="pref_text_reader_line_spacing">Line spacing</string> <string name="pref_text_reader_line_spacing">Line spacing</string>
<string name="pref_text_reader_paragraph_spacing">Paragraph spacing</string> <string name="pref_text_reader_paragraph_spacing">Paragraph spacing</string>
<string name="pref_text_reader_horizontal_margin">Side margins</string> <string name="pref_text_reader_horizontal_margin">Side margins</string>
<string name="pref_text_reader_line_break_mode">Line wrapping</string>
<string name="pref_text_reader_line_break_word">By word</string>
<string name="pref_text_reader_line_break_character">By character</string>
<string name="pref_text_reader_font_family">Font</string> <string name="pref_text_reader_font_family">Font</string>
<string name="pref_text_reader_font_system">System</string> <string name="pref_text_reader_font_system">System</string>
<string name="pref_text_reader_font_sans">Sans-serif</string> <string name="pref_text_reader_font_sans">Sans-serif</string>
@@ -922,6 +922,9 @@
<string name="pref_text_reader_line_spacing">행간</string> <string name="pref_text_reader_line_spacing">행간</string>
<string name="pref_text_reader_paragraph_spacing">문단 간격</string> <string name="pref_text_reader_paragraph_spacing">문단 간격</string>
<string name="pref_text_reader_horizontal_margin">좌우 여백</string> <string name="pref_text_reader_horizontal_margin">좌우 여백</string>
<string name="pref_text_reader_line_break_mode">줄바꿈</string>
<string name="pref_text_reader_line_break_word">단어 단위</string>
<string name="pref_text_reader_line_break_character">글자 단위</string>
<string name="pref_text_reader_font_family">글꼴</string> <string name="pref_text_reader_font_family">글꼴</string>
<string name="pref_text_reader_font_system">시스템</string> <string name="pref_text_reader_font_system">시스템</string>
<string name="pref_text_reader_font_sans">고딕</string> <string name="pref_text_reader_font_sans">고딕</string>