dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-26 13:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed small issue with the first page

Browse Source
This commit is contained in:
Avently
2022-10-12 14:11:36 +03:00
parent b94cdc2a62
commit c0fc0f0d7b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt
View File

@@ -42,6 +42,14 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
val pagerState = rememberPagerState(provider.initialIndex)
val goBack = { provider.onDismiss(pagerState.currentPage); close() }
BackHandler(onBack = goBack)
// Pager doesn't ask previous page at initialization step who knows why. By not doing this, prev page is not checked and can be blank,
// which makes this blank page visible for a moment. Prevent it by doing the check ourselves
LaunchedEffect(Unit) {
if (provider.getImage(provider.initialIndex - 1) == null) {
provider.scrollToStart()
pagerState.scrollToPage(0)
}
}
val scope = rememberCoroutineScope()
HorizontalPager(count = remember { provider.totalImagesSize }.value, state = pagerState) { index ->
Column(
@@ -59,10 +67,12 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
if (image == null) {
// No such image. Let's shrink total pages size or scroll to start of the list of pages to remove blank page automatically
scope.launch {
if (currentPage == index - 1) provider.totalImagesSize.value = currentPage + 1
else if (currentPage == index + 1) {
provider.scrollToStart()
pagerState.scrollToPage(0)
when (currentPage) {
index - 1 -> provider.totalImagesSize.value = currentPage + 1
index + 1 -> {
provider.scrollToStart()
pagerState.scrollToPage(0)
}
}
}
} else {