feat: add Kavita document fallback and live text settings
Build & Test / Build & Test App (push) Has been cancelled
Build & Test / Build & Test App (push) Has been cancelled
This commit is contained in:
@@ -9,7 +9,6 @@ import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalView
|
||||
import androidx.compose.ui.window.DialogWindowProvider
|
||||
@@ -33,15 +32,11 @@ fun ReaderSettingsDialog(
|
||||
stringResource(MR.strings.pref_category_text_reader),
|
||||
)
|
||||
val pagerState = rememberPagerState { tabTitles.size }
|
||||
val initialTextStyle = remember { viewModel.preferences.textReaderStyle() }
|
||||
|
||||
BoxWithConstraints {
|
||||
TabbedDialog(
|
||||
modifier = Modifier.heightIn(max = maxHeight * 0.75f),
|
||||
onDismissRequest = {
|
||||
if (viewModel.preferences.textReaderStyle() != initialTextStyle) {
|
||||
viewModel.onTextSettingsChanged()
|
||||
}
|
||||
viewModel.flushTextSettingsReload()
|
||||
onDismissRequest()
|
||||
onShowMenus()
|
||||
},
|
||||
@@ -51,7 +46,7 @@ fun ReaderSettingsDialog(
|
||||
val window = (LocalView.current.parent as? DialogWindowProvider)?.window
|
||||
|
||||
LaunchedEffect(pagerState.currentPage) {
|
||||
if (pagerState.currentPage == 2) {
|
||||
if (pagerState.currentPage == 2 || pagerState.currentPage == 3) {
|
||||
window?.setDimAmount(0f)
|
||||
onHideMenus()
|
||||
} else {
|
||||
|
||||
@@ -34,7 +34,10 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
|
||||
valueRange = 32..72,
|
||||
steps = 19,
|
||||
valueString = fontSize.toString(),
|
||||
onChange = fontSizePref::set,
|
||||
onChange = { value ->
|
||||
fontSizePref.set(value)
|
||||
viewModel.requestTextSettingsReload()
|
||||
},
|
||||
pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
|
||||
)
|
||||
|
||||
@@ -46,7 +49,10 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
|
||||
valueRange = 90..180,
|
||||
steps = 17,
|
||||
valueString = "$lineSpacing%",
|
||||
onChange = lineSpacingPref::set,
|
||||
onChange = { value ->
|
||||
lineSpacingPref.set(value)
|
||||
viewModel.requestTextSettingsReload()
|
||||
},
|
||||
pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
|
||||
)
|
||||
|
||||
@@ -58,7 +64,10 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
|
||||
valueRange = 0..48,
|
||||
steps = 11,
|
||||
valueString = paragraphSpacing.toString(),
|
||||
onChange = paragraphSpacingPref::set,
|
||||
onChange = { value ->
|
||||
paragraphSpacingPref.set(value)
|
||||
viewModel.requestTextSettingsReload()
|
||||
},
|
||||
pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
|
||||
)
|
||||
|
||||
@@ -68,7 +77,10 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
|
||||
fontFamilies.forEach { (label, value) ->
|
||||
FilterChip(
|
||||
selected = fontFamily == value,
|
||||
onClick = { fontFamilyPref.set(value) },
|
||||
onClick = {
|
||||
fontFamilyPref.set(value)
|
||||
viewModel.requestTextSettingsReload()
|
||||
},
|
||||
label = { Text(stringResource(label)) },
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user