Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-14 04:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Report media editor focus from the pager's settled page.

Browse Source
This commit is contained in:
Alex Hart
2026-08-17 11:12:37 -03:00
parent 3d69317a48
commit b75280483c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditScreen.kt
+11 -4
View File
@@ -124,12 +124,19 @@ internal fun MediaEditScreen(
// Focus belongs to the pager rather than to any one piece of chrome: the thumbnail rail is not composed for
// documents, and a swipe still has to be reported from there.
//
// Observed as the settled page rather than as the falling edge of isScrollInProgress. snapshotFlow re-reads its block
// when it resumes and drops a value equal to the one it last emitted, so a scroll that both starts and finishes
// between two resumptions -- one fling of a fast flick through a long selection, or the instant scroll of
// scrollToPage -- collapses to a single false and reports nothing, leaving focus on the page the user swiped away
// from. A page index cannot collapse that way: whatever the pager last came to rest on is what gets reported.
// Reading the page from the emission rather than from currentPage also keeps the report tied to that resting page
// instead of to wherever a later fling has since moved.
LaunchedEffect(pagerState) {
snapshotFlow { pagerState.isScrollInProgress }
.filter { !it }
snapshotFlow { pagerState.settledPage }
.drop(1)
.collect {
val settledMedia = currentSelectedMedia.getOrNull(pagerState.currentPage)
.collect { settledPage ->
val settledMedia = currentSelectedMedia.getOrNull(settledPage)
if (settledMedia != null) {
onEvent(MediaEditScreenEvents.FocusedMediaChanged(settledMedia))
}