yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes for new reader

Browse Source
This commit is contained in:
FooIbar authored and renovate[bot] committed 2024-02-28 18:28:19 +08:00
1 parent 5982bd2d4b
commit 01aa7af175
2 files changed
+27 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt
+7 -2
View File
@@ -78,6 +78,7 @@ fun ReaderScreen(info: BaseGalleryInfo, page: Int = -1) {
}
val showSeekbar by Settings.showReaderSeekbar.collectAsState()
val readingMode by Settings.readingMode.collectAsState { ReadingModeType.fromPreference(it) }
val defaultError = stringResource(id = R.string.decode_image_error)
Deferred({ pageLoader.awaitReady() }) {
val lazyListState = rememberLazyListState()
val pagerState = rememberPagerState { pageLoader.size }
@@ -134,7 +135,11 @@ fun ReaderScreen(info: BaseGalleryInfo, page: Int = -1) {
painter = painter,
contentDescription = null,
modifier = Modifier.fillMaxWidth(),
contentScale = ContentScale.FillWidth,
contentScale = if (readingMode == ReadingModeType.VERTICAL) {
ContentScale.Fit
} else {
ContentScale.FillWidth
},
)
}
ERROR -> {
@@ -143,7 +148,7 @@ fun ReaderScreen(info: BaseGalleryInfo, page: Int = -1) {
modifier = Modifier.align(Companion.Center),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(text = page.errorMsg.orEmpty())
Text(text = page.errorMsg ?: defaultError)
Button(onClick = { }) {
Text(text = stringResource(id = R.string.action_retry))
}
app/src/main/kotlin/com/hippo/ehviewer/ui/reader/SliderPagerDoubleSync.kt
+20 -9
View File
@@ -13,6 +13,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import com.hippo.ehviewer.gallery.PageLoader2
import kotlin.math.absoluteValue
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.mapNotNull
@@ -41,7 +42,9 @@ class SliderPagerDoubleSync(
snapshotFlow {
lazyListState.layoutInfo
}.mapNotNull { info ->
info.visibleItemsInfo.lastOrNull()
info.visibleItemsInfo.lastOrNull {
it.offset <= maxOf(info.viewportStartOffset, info.viewportEndOffset - it.size)
}
}.collect { info ->
sliderValue = info.index + 1
pageLoader.startPage = info.index
@@ -49,24 +52,30 @@ class SliderPagerDoubleSync(
}
LaunchedEffect(Unit) {
snapshotFlow {
pagerState.layoutInfo
}.mapNotNull { info ->
info.visiblePagesInfo.lastOrNull()
}.collect { info ->
sliderValue = info.index + 1
pageLoader.startPage = info.index
pagerState.currentPage
}.collect { index ->
sliderValue = index + 1
pageLoader.startPage = index
}
}
} else {
LaunchedEffect(Unit) {
snapshotFlow { sliderValue - 1 }.collectLatest { index ->
pagerState.animateScrollToPage(index)
if ((index - pagerState.currentPage).absoluteValue > SMOOTH_SCROLL_THRESHOLD) {
pagerState.scrollToPage(index)
} else {
pagerState.animateScrollToPage(index)
}
pageLoader.startPage = index
}
}
LaunchedEffect(Unit) {
snapshotFlow { sliderValue - 1 }.collectLatest { index ->
lazyListState.animateScrollToItem(index)
if ((index - lazyListState.firstVisibleItemIndex).absoluteValue > SMOOTH_SCROLL_THRESHOLD) {
lazyListState.scrollToItem(index)
} else {
lazyListState.animateScrollToItem(index)
}
pageLoader.startPage = index
}
}
@@ -91,3 +100,5 @@ fun rememberSliderPagerDoubleSyncState(
SliderPagerDoubleSync(lazyListState, pagerState, pageLoader)
}
}
private const val SMOOTH_SCROLL_THRESHOLD = 50