filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-01 19:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix scrolling to bottom if it's not far and it wasn't at bottom initially

Browse Source 
Change-Id: Ifaf2395140d30b456acd9130bd058ed573888423
This commit is contained in:
SpiritCroc 2021-08-01 12:07:21 +02:00
parent 6399e71e25
commit 6c9c2eaef5
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
View File

@ -61,6 +61,11 @@ interface Timeline {
*/
fun getInitialEventId(): String?
/**
* Change initial event id
*/
fun setInitialEventId(eventId: String?)
/**
* Check if the timeline can be enriched by paginating.
* @param direction the direction to check in

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
View File

@ -225,6 +225,10 @@ internal class DefaultTimeline(
return initialEventId
}
override fun setInitialEventId(eventId: String?) {
initialEventId = eventId
}
override fun getTimelineEventAtIndex(index: Int): TimelineEvent? {
return builtEvents.getOrNull(index)
}

1
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -796,6 +796,7 @@ class RoomDetailFragment @Inject constructor(
scrollOnNewMessageCallback.forceScrollOnNextUpdate()
roomDetailViewModel.timeline.restartWithEventId(null)
} else {
roomDetailViewModel.timeline.setInitialEventId(null)
layoutManager.scrollToPosition(0)
}
}

17
vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
View File

@ -54,8 +54,16 @@ class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager,
override fun onInserted(position: Int, count: Int) {
if (initialForceScroll) {
timelineEventController.searchPositionOfEvent(initialForceScrollEventId)?.let {
layoutManager.scrollToPosition(it)
var scrollToEvent = initialForceScrollEventId
if (initialForceScrollEventId == null) {
scrollToEvent = timelineEventController.timeline?.getInitialEventId()
}
if (scrollToEvent == null) {
layoutManager.scrollToPositionWithOffset(0, 0)
} else {
timelineEventController.searchPositionOfEvent(scrollToEvent)?.let {
layoutManager.scrollToPosition(it)
}
}
return
}
@ -64,7 +72,7 @@ class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager,
}
if (forceScroll) {
forceScroll = false
layoutManager.scrollToPosition(0)
layoutManager.scrollToPositionWithOffset(0, 0)
return
}
if (layoutManager.findFirstVisibleItemPosition() > 1) {
@ -79,8 +87,7 @@ class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager,
while (newTimelineEventIds.lastOrNull() != firstNewItemIds) {
newTimelineEventIds.removeLastOrNull()
}
//layoutManager.scrollToPosition(0)
layoutManager.scrollToPositionWithOffset(0, Integer.MAX_VALUE)
layoutManager.scrollToPositionWithOffset(0, 0)
}
}
}