Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: scrollToItem does not work correctly

Browse source
This commit is contained in:
Acclorite 2025-10-13 14:35:21 +03:00
parent 5a943185d8
commit b0a21c116f
No known key found for this signature in database
GPG key ID: 6E54C611F6EE8593
7 changed files with 23 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEffect.kt
View file

@ -16,11 +16,6 @@ sealed class ReaderEffect {
data object OnResetBrightness : ReaderEffect() data object OnResetBrightness : ReaderEffect()
data class OnScroll(
val scrollIndex: Int,
val scrollOffset: Int
) : ReaderEffect()
data class OnOpenTranslator( data class OnOpenTranslator(
val textToTranslate: String, val textToTranslate: String,
val translateWholeParagraph: Boolean val translateWholeParagraph: Boolean

24
app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt
View file

@ -111,12 +111,10 @@ class ReaderModel @Inject constructor(
is ReaderEvent.OnRestoreScroll -> { is ReaderEvent.OnRestoreScroll -> {
snapshotFlow { _state.value.listState.layoutInfo.totalItemsCount }.first { it > 0 } snapshotFlow { _state.value.listState.layoutInfo.totalItemsCount }.first { it > 0 }
_effects.emit( _state.value.listState.requestScrollToItem(
ReaderEffect.OnScroll( index = _state.value.book.scrollIndex,
scrollIndex = _state.value.book.scrollIndex,
scrollOffset = _state.value.book.scrollOffset scrollOffset = _state.value.book.scrollOffset
) )
)
_state.update { _state.update {
val (currentChapter, currentChapterProgress) = getChapterProgressUseCase( val (currentChapter, currentChapterProgress) = getChapterProgressUseCase(
@ -205,12 +203,10 @@ class ReaderModel @Inject constructor(
.takeIf { it != -1 } .takeIf { it != -1 }
if (chapterIndex == null) return@withContext if (chapterIndex == null) return@withContext
_effects.emit( _state.value.listState.requestScrollToItem(
ReaderEffect.OnScroll( index = chapterIndex,
scrollIndex = chapterIndex,
scrollOffset = 0 scrollOffset = 0
) )
)
onEvent(ReaderEvent.OnUpdateChapter(chapterIndex)) onEvent(ReaderEvent.OnUpdateChapter(chapterIndex))
onEvent( onEvent(
@ -230,12 +226,10 @@ class ReaderModel @Inject constructor(
val scrollTo = (_state.value.text.lastIndex * event.progress).roundToInt() val scrollTo = (_state.value.text.lastIndex * event.progress).roundToInt()
_effects.emit( _state.value.listState.requestScrollToItem(
ReaderEffect.OnScroll( index = scrollTo,
scrollIndex = scrollTo,
scrollOffset = 0 scrollOffset = 0
) )
)
onEvent(ReaderEvent.OnUpdateChapter(scrollTo)) onEvent(ReaderEvent.OnUpdateChapter(scrollTo))
} }
@ -252,12 +246,10 @@ class ReaderModel @Inject constructor(
) )
} }
_effects.emit( _state.value.listState.requestScrollToItem(
ReaderEffect.OnScroll( index = event.checkpoint.index,
scrollIndex = event.checkpoint.index,
scrollOffset = event.checkpoint.offset scrollOffset = event.checkpoint.offset
) )
)
onEvent(ReaderEvent.OnUpdateChapter(event.checkpoint.index)) onEvent(ReaderEvent.OnUpdateChapter(event.checkpoint.index))
onEvent( onEvent(

1
app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt
View file

@ -380,7 +380,6 @@ data class ReaderScreen(val bookId: Int) : Screen, Parcelable {
ReaderEffects( ReaderEffects(
effects = screenModel.effects, effects = screenModel.effects,
book = state.value.book, book = state.value.book,
listState = listState,
fullscreen = settings.fullscreen.value fullscreen = settings.fullscreen.value
) )

7
app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEffect.kt
View file

@ -6,18 +6,11 @@
package ua.acclorite.book_story.presentation.settings package ua.acclorite.book_story.presentation.settings
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.model.reader.ColorPreset
@Immutable @Immutable
sealed class SettingsEffect { sealed class SettingsEffect {
data class OnScroll(
val listState: LazyListState,
val index: Int,
val offset: Int
) : SettingsEffect()
data class OnSwitchedColorPreset( data class OnSwitchedColorPreset(
val newColorPreset: ColorPreset val newColorPreset: ColorPreset
) : SettingsEffect() ) : SettingsEffect()

21
app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt
View file

@ -80,12 +80,9 @@ class SettingsModel @Inject constructor(
val scrollIndex = colorPresets.indexOfFirst { it.isSelected } val scrollIndex = colorPresets.indexOfFirst { it.isSelected }
if (scrollIndex != -1) { if (scrollIndex != -1) {
_effects.emit( _state.value.colorPresetListState.requestScrollToItem(
SettingsEffect.OnScroll(
listState = _state.value.colorPresetListState,
index = scrollIndex, index = scrollIndex,
offset = 0 scrollOffset = 0
)
) )
} }
@ -258,12 +255,9 @@ class SettingsModel @Inject constructor(
) )
} }
_effects.emit( _state.value.colorPresetListState.requestScrollToItem(
SettingsEffect.OnScroll(
listState = _state.value.colorPresetListState,
index = nextPosition, index = nextPosition,
offset = 0 scrollOffset = 0
)
) )
} }
} }
@ -348,12 +342,9 @@ class SettingsModel @Inject constructor(
) )
} }
_effects.emit( _state.value.colorPresetListState.requestScrollToItem(
SettingsEffect.OnScroll(
listState = _state.value.colorPresetListState,
index = colorPresets.lastIndex, index = colorPresets.lastIndex,
offset = 0 scrollOffset = 0
)
) )
} }
} }

11
app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEffects.kt
View file

@ -8,7 +8,6 @@ package ua.acclorite.book_story.ui.reader
import android.app.SearchManager import android.app.SearchManager
import android.content.Intent import android.content.Intent
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.core.net.toUri import androidx.core.net.toUri
@ -30,13 +29,12 @@ import ua.acclorite.book_story.ui.navigator.LocalNavigator
fun ReaderEffects( fun ReaderEffects(
effects: SharedFlow<ReaderEffect>, effects: SharedFlow<ReaderEffect>,
book: Book, book: Book,
listState: LazyListState,
fullscreen: Boolean fullscreen: Boolean
) { ) {
val navigator = LocalNavigator.current val navigator = LocalNavigator.current
val activity = LocalActivity.current val activity = LocalActivity.current
LaunchedEffect(effects, book, listState, fullscreen) { LaunchedEffect(effects, book, fullscreen) {
effects.collect { effect -> effects.collect { effect ->
when (effect) { when (effect) {
is ReaderEffect.OnSystemBarsVisibility -> { is ReaderEffect.OnSystemBarsVisibility -> {
@ -55,13 +53,6 @@ fun ReaderEffects(
activity.setBrightness(brightness = null) activity.setBrightness(brightness = null)
} }
is ReaderEffect.OnScroll -> {
listState.requestScrollToItem(
effect.scrollIndex,
effect.scrollOffset
)
}
is ReaderEffect.OnOpenTranslator -> { is ReaderEffect.OnOpenTranslator -> {
val translatorIntent = Intent() val translatorIntent = Intent()
val browserIntent = Intent() val browserIntent = Intent()

8
app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEffects.kt
View file

@ -21,20 +21,14 @@ fun SettingsEffects(effects: SharedFlow<SettingsEffect>) {
LaunchedEffect(effects) { LaunchedEffect(effects) {
effects.collect { effect -> effects.collect { effect ->
when (effect) { when (effect) {
is SettingsEffect.OnScroll -> {
effect.listState.requestScrollToItem(effect.index, effect.offset)
}
is SettingsEffect.OnSwitchedColorPreset -> { is SettingsEffect.OnSwitchedColorPreset -> {
context.getString( context.getString(
R.string.color_preset_selected_query, R.string.color_preset_selected_query,
if (effect.newColorPreset.name.isBlank()) { effect.newColorPreset.name.ifBlank {
context.getString( context.getString(
R.string.color_preset_query, R.string.color_preset_query,
effect.newColorPreset.id.toString() effect.newColorPreset.id.toString()
) )
} else {
effect.newColorPreset.name
}.trim() }.trim()
).showToast(context, longToast = false) ).showToast(context, longToast = false)
} }