letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Timeline permalink : scroll to fetched event when known

Browse Source
This commit is contained in:
ganfra
2024-04-25 17:41:10 +02:00
parent b46f8a5c27
commit 82d833b434
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
View File

@@ -146,7 +146,7 @@ class TimelinePresenter @AssistedInject constructor(
timelineController.focusOnEvent(event.eventId)
.fold(
onSuccess = {
focusRequestState.value = FocusRequestState.None
focusRequestState.value = FocusRequestState.Fetched
},
onFailure = {
focusRequestState.value = FocusRequestState.Failure(it)
@@ -165,15 +165,20 @@ class TimelinePresenter @AssistedInject constructor(
}
}
// Makes sure to get back to live when there is nothing more to load forwards
LaunchedEffect(isLive) {
}
LaunchedEffect(timelineItems.size) {
computeNewItemState(timelineItems, prevMostRecentItemId, newEventState)
}
LaunchedEffect(timelineItems.size, focusRequestState.value, focusedEventId.value) {
val currentFocusedEventId = focusedEventId.value
if (focusRequestState.value is FocusRequestState.Fetched && currentFocusedEventId != null) {
if (timelineItemIndexer.isKnown(currentFocusedEventId)) {
val index = timelineItemIndexer.indexOf(currentFocusedEventId)
focusRequestState.value = FocusRequestState.Cached(index)
}
}
}
LaunchedEffect(Unit) {
combine(timelineController.timelineItems(), room.membersStateFlow) { items, membersState ->
timelineItemsFactory.replaceWith(

1
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt
View File

@@ -40,6 +40,7 @@ sealed interface FocusRequestState {
data object None : FocusRequestState
data class Cached(val index: Int): FocusRequestState
data object Fetching : FocusRequestState
data object Fetched: FocusRequestState
data class Failure(val throwable: Throwable) : FocusRequestState
}

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
View File

@@ -195,7 +195,7 @@ private fun FocusRequestStateView(
FocusRequestState.Fetching -> {
ProgressDialog(modifier = modifier, onDismissRequest = onClearFocusRequestState)
}
is FocusRequestState.Cached, FocusRequestState.None -> Unit
else -> Unit
}
}
@@ -237,7 +237,7 @@ private fun BoxScope.TimelineScrollHelper(
}
}
LaunchedEffect(key1 = focusRequestState) {
LaunchedEffect(focusRequestState) {
if (focusRequestState is FocusRequestState.Cached) {
if (abs(lazyListState.firstVisibleItemIndex - focusRequestState.index) < 10) {
lazyListState.animateScrollToItem(focusRequestState.index)

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt
View File

@@ -51,7 +51,7 @@ fun TimelineItemVirtualRow(
TimelineItemRoomBeginningModel -> TimelineItemRoomBeginningView(roomName = timelineRoomInfo.name)
is TimelineItemLoadingIndicatorModel -> {
TimelineLoadingMoreIndicator()
LaunchedEffect(key1 = virtual.model.timestamp) {
LaunchedEffect(virtual.model.timestamp) {
eventSink(TimelineEvents.LoadMore(virtual.model.direction))
}
}