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

🚀 Improve progress display in Reader

Browse source 
* Book and chapter (in "($cp)") progress
* Sync chapter & book progress calculation

Resolves: #103
This commit is contained in:
Acclorite 2024-10-11 20:06:11 +03:00
parent 2e2dee9e26
commit 7690cafec5
3 changed files with 50 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,6 @@ fun ReaderScreenRoot(screen: Screen.Reader) {
onLibraryEvent(LibraryEvent.OnUpdateBook(it))
onHistoryEvent(HistoryEvent.OnUpdateBook(it))
}
viewModel.onUpdateCurrentChapter()
}
DisposableEffect(mainState.value.screenOrientation) {
context.requestedOrientation = mainState.value.screenOrientation.code

16
app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderBottomBar.kt
View file

@ -53,11 +53,23 @@ fun ReaderBottomBar() {
val onLibraryEvent = LocalLibraryViewModel.current.onEvent
val onHistoryEvent = LocalHistoryViewModel.current.onEvent
val progress by remember {
val bookProgress by remember {
derivedStateOf {
"${state.value.book.progress.calculateProgress(4)}%"
"${state.value.book.progress.calculateProgress(2)}%"
}
}
val chapterProgress by remember {
derivedStateOf {
if (state.value.currentChapter == null) return@derivedStateOf ""
" (${state.value.currentChapterProgress.calculateProgress(2)}%)"
}
}
val progress by remember {
derivedStateOf {
"$bookProgress$chapterProgress"
}
}
val arrowDirection by remember {
derivedStateOf {
val checkpoint = state.value.checkpoint.first

85
app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
View file

@ -26,6 +26,7 @@ import kotlinx.coroutines.withContext
import kotlinx.coroutines.yield
import ua.acclorite.book_story.R
import ua.acclorite.book_story.domain.model.Book
import ua.acclorite.book_story.domain.model.Chapter
import ua.acclorite.book_story.domain.use_case.book.CheckForTextUpdate
import ua.acclorite.book_story.domain.use_case.book.GetBookById
import ua.acclorite.book_story.domain.use_case.book.GetText
@ -96,10 +97,13 @@ class ReaderViewModel @Inject constructor(
}.collectLatest { itemsCount ->
if (itemsCount < _state.value.text.size) return@collectLatest
_state.value.listState.requestScrollToItem(
_state.value.book.scrollIndex,
_state.value.book.scrollOffset
)
_state.value.book.apply {
_state.value.listState.requestScrollToItem(
scrollIndex,
scrollOffset
)
updateChapter(index = scrollIndex)
}
event.checkForUpdate()
@ -564,53 +568,41 @@ class ReaderViewModel @Inject constructor(
fun onUpdateProgress(refreshList: (Book) -> Unit) {
viewModelScope.launch(Dispatchers.Main) {
snapshotFlow {
_state.value.listState.firstVisibleItemIndex to _state.value.listState.firstVisibleItemScrollOffset
}
.distinctUntilChanged()
.debounce(300)
.collectLatest { (firstVisibleItemIndex, firstVisibleItemOffset) ->
calculateProgress(firstVisibleItemIndex).apply {
if (this == _state.value.book.progress) return@apply
_state.value.listState.run { firstVisibleItemIndex to firstVisibleItemScrollOffset }
}.distinctUntilChanged().debounce(300).collectLatest { (index, offset) ->
val progress = calculateProgress(index)
if (progress == _state.value.book.progress) return@collectLatest
val (currentChapter, currentChapterProgress) = calculateCurrentChapter(index)
onEvent(
ReaderEvent.OnChangeProgress(
progress = this,
firstVisibleItemIndex = firstVisibleItemIndex,
firstVisibleItemOffset = firstVisibleItemOffset,
refreshList = { book ->
refreshList(book)
}
)
)
}
_state.update {
it.copy(
book = it.book.copy(
progress = progress,
scrollIndex = index,
scrollOffset = offset
),
currentChapter = currentChapter,
currentChapterProgress = currentChapterProgress
)
}
}
}
@OptIn(FlowPreview::class)
fun onUpdateCurrentChapter() {
viewModelScope.launch(Dispatchers.Main) {
snapshotFlow {
_state.value.listState.firstVisibleItemIndex
updateBook.execute(_state.value.book)
refreshList(_state.value.book)
}
.distinctUntilChanged()
.debounce(300)
.collectLatest { index ->
if (_state.value.book.chapters.isEmpty()) {
_state.update {
it.copy(
currentChapter = null
)
}
return@collectLatest
}
updateChapter(index)
}
}
}
private fun updateChapter(index: Int) {
val (currentChapter, currentChapterProgress) = calculateCurrentChapter(index)
_state.update {
it.copy(
currentChapter = currentChapter,
currentChapterProgress = currentChapterProgress
)
}
}
private fun calculateCurrentChapter(index: Int): Pair<Chapter?, Float> {
val currentChapter = _state.value.book.chapters.find { chapter ->
index in chapter.startIndex..chapter.endIndex
}
@ -622,12 +614,7 @@ class ReaderViewModel @Inject constructor(
(currentIndex / endIndex.toFloat())
}.coerceAndPreventNaN()
_state.update {
it.copy(
currentChapter = currentChapter,
currentChapterProgress = currentChapterProgress
)
}
return currentChapter to currentChapterProgress
}
private fun calculateProgress(firstVisibleItemIndex: Int? = null): Float {