diff --git a/app/src/main/java/eu/kanade/presentation/reader/settings/TextSettingsPage.kt b/app/src/main/java/eu/kanade/presentation/reader/settings/TextSettingsPage.kt index d3d83df8f..a36c74cf4 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/settings/TextSettingsPage.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/settings/TextSettingsPage.kt @@ -90,6 +90,21 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) { pillColor = MaterialTheme.colorScheme.surfaceContainerHighest, ) + val horizontalMarginPref = viewModel.preferences.textHorizontalMargin + val horizontalMargin by horizontalMarginPref.collectAsState() + SliderItem( + label = stringResource(MR.strings.pref_text_reader_horizontal_margin), + value = horizontalMargin, + valueRange = 0..64, + steps = 15, + valueString = "$horizontalMargin dp", + onChange = { value -> + horizontalMarginPref.set(value) + viewModel.requestTextSettingsReload() + }, + pillColor = MaterialTheme.colorScheme.surfaceContainerHighest, + ) + val fontFamilyPref = viewModel.preferences.textFontFamily val fontFamily by fontFamilyPref.collectAsState() SettingsChipRow(MR.strings.pref_text_reader_font_family) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/TextPageRenderer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/TextPageRenderer.kt index 2da7d230d..8d688372e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/TextPageRenderer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/TextPageRenderer.kt @@ -27,7 +27,7 @@ internal data class PaginatedTextPage( ) internal object TextPageRenderer { - private const val MARGIN_DP = 32f + private const val VERTICAL_MARGIN_DP = 32f private const val STREAM_BUFFER_CHARS = 64 * 1024 private const val STREAM_READ_CHARS = 8 * 1024 @@ -220,9 +220,12 @@ internal object TextPageRenderer { private fun resolveLayoutMetrics(style: TextReaderStyle): LayoutMetrics { val pageWidth = style.pageWidthPx.coerceAtLeast(1) val pageHeight = style.pageHeightPx.coerceAtLeast(1) - val requestedMargin = (MARGIN_DP * style.density).roundToInt().coerceAtLeast(1) - val horizontalMargin = requestedMargin.coerceAtMost(((pageWidth - 1) / 2).coerceAtLeast(0)) - val verticalMargin = requestedMargin.coerceAtMost(((pageHeight - 1) / 2).coerceAtLeast(0)) + val requestedHorizontalMargin = (style.horizontalMarginDp * style.density) + .roundToInt() + .coerceAtLeast(0) + val requestedVerticalMargin = (VERTICAL_MARGIN_DP * style.density).roundToInt().coerceAtLeast(1) + val horizontalMargin = requestedHorizontalMargin.coerceAtMost(((pageWidth - 1) / 2).coerceAtLeast(0)) + val verticalMargin = requestedVerticalMargin.coerceAtMost(((pageHeight - 1) / 2).coerceAtLeast(0)) return LayoutMetrics( pageWidth = pageWidth, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt index d112dbae2..867ab227e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt @@ -120,6 +120,8 @@ class ReaderPreferences( val textParagraphSpacing: Preference = preferenceStore.getInt("reader_text_paragraph_spacing", 4) + val textHorizontalMargin: Preference = preferenceStore.getInt("reader_text_horizontal_margin", 32) + val textFontFamily: Preference = preferenceStore.getEnum( "reader_text_font_family", TextFontFamily.SYSTEM, @@ -161,6 +163,7 @@ class ReaderPreferences( fontSize = textFontSize.get(), lineSpacingPercent = textLineSpacing.get(), paragraphSpacing = textParagraphSpacing.get(), + horizontalMarginDp = textHorizontalMargin.get(), fontFamily = textFontFamily.get(), readerTheme = readerTheme.get(), automaticDark = (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == @@ -435,6 +438,7 @@ data class TextReaderStyle( val fontSize: Int, val lineSpacingPercent: Int, val paragraphSpacing: Int, + val horizontalMarginDp: Int, val fontFamily: ReaderPreferences.TextFontFamily, val readerTheme: Int, val automaticDark: Boolean, diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml index afd87d798..52c97b37c 100644 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -1113,6 +1113,7 @@ Stop TTS Line spacing Paragraph spacing + Side margins Font System Sans-serif diff --git a/i18n/src/commonMain/moko-resources/ko/strings.xml b/i18n/src/commonMain/moko-resources/ko/strings.xml index b213568aa..35ea7b5c4 100644 --- a/i18n/src/commonMain/moko-resources/ko/strings.xml +++ b/i18n/src/commonMain/moko-resources/ko/strings.xml @@ -921,6 +921,7 @@ TTS 정지 행간 문단 간격 + 좌우 여백 글꼴 시스템 고딕