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

🛠️ Fix checkpoint lasts after hiding bottom bar in Reader

Browse source
This commit is contained in:
Acclorite 2024-12-28 15:39:57 +02:00
parent 157c3b3d43
commit a25cb8f3eb
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt
View file

@ -19,7 +19,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@ -69,7 +68,7 @@ fun ReaderBottomBar(
} }
} }
val arrowDirection by remember { val arrowDirection = remember(checkpoint.index, listState.firstVisibleItemIndex) {
derivedStateOf { derivedStateOf {
val checkpointIndex = checkpoint.index val checkpointIndex = checkpoint.index
val index = listState.firstVisibleItemIndex val index = listState.firstVisibleItemIndex
@ -81,7 +80,7 @@ fun ReaderBottomBar(
} }
} }
} }
val checkpointProgress by remember { val checkpointProgress = remember(checkpoint.index, text.lastIndex) {
derivedStateOf { derivedStateOf {
(checkpoint.index / text.lastIndex.toFloat()) * 0.987f (checkpoint.index / text.lastIndex.toFloat()) * 0.987f
} }
@ -109,7 +108,7 @@ fun ReaderBottomBar(
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
HorizontalExpandingTransition( HorizontalExpandingTransition(
visible = arrowDirection == Direction.START, visible = arrowDirection.value == Direction.START,
startDirection = true startDirection = true
) { ) {
IconButton( IconButton(
@ -135,13 +134,13 @@ fun ReaderBottomBar(
changeProgress = changeProgress changeProgress = changeProgress
) )
if (arrowDirection != Direction.NEUTRAL) { if (arrowDirection.value != Direction.NEUTRAL) {
ReaderBottomBarSliderIndicator(progress = checkpointProgress) ReaderBottomBarSliderIndicator(progress = checkpointProgress.value)
} }
} }
HorizontalExpandingTransition( HorizontalExpandingTransition(
visible = arrowDirection == Direction.END, visible = arrowDirection.value == Direction.END,
startDirection = false startDirection = false
) { ) {
IconButton( IconButton(