From 6958cc480bb2f7b4222f236db9dd55f73ff2030d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 12 Mar 2025 12:09:51 +0100 Subject: [PATCH] Ensure the snackbar "No more media to show" is not render after the app is loading the first item. Closes #4345 --- .../mediaviewer/impl/viewer/MediaViewerPresenter.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt index 834edacd76..f897984578 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt @@ -164,7 +164,9 @@ class MediaViewerPresenter @AssistedInject constructor( ) { val isRenderingLoadingBackward by remember { derivedStateOf { - currentIndex.intValue == data.value.lastIndex && data.value.lastOrNull() is MediaViewerPageData.Loading + currentIndex.intValue == data.value.lastIndex && + data.value.size > 1 && + data.value.lastOrNull() is MediaViewerPageData.Loading } } if (isRenderingLoadingBackward) { @@ -186,7 +188,9 @@ class MediaViewerPresenter @AssistedInject constructor( ) { val isRenderingLoadingForward by remember { derivedStateOf { - currentIndex.intValue == 0 && data.value.firstOrNull() is MediaViewerPageData.Loading + currentIndex.intValue == 0 && + data.value.size > 1 && + data.value.firstOrNull() is MediaViewerPageData.Loading } } if (isRenderingLoadingForward) {