filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix space swipes not persisting across DM/group tab changes

Browse Source 
Change-Id: I0785dee62d4bb3d1ad3cdd877b164de16af99f33
This commit is contained in:
SpiritCroc 2022-06-15 11:20:59 +02:00
parent 2ac877fe74
commit 7f9a3dfbe6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
View File

@ -112,6 +112,7 @@ class HomeDetailFragment @Inject constructor(
private var pagerSpaces: List<String?>? = null private var pagerSpaces: List<String?>? = null
private var pagerTab: HomeTab? = null private var pagerTab: HomeTab? = null
private var pagerPagingEnabled: Boolean = false private var pagerPagingEnabled: Boolean = false
private var previousRoomGroupingMethodPair: Pair<RoomGroupingMethod, SelectSpaceFrom>? = null
override fun getMenuRes() = R.menu.room_list override fun getMenuRes() = R.menu.room_list
@ -238,6 +239,7 @@ class HomeDetailFragment @Inject constructor(
return@onEach return@onEach
} }
setupViewPager(roomGroupingMethod, rootSpacesOrdered, currentTab) setupViewPager(roomGroupingMethod, rootSpacesOrdered, currentTab)
previousRoomGroupingMethodPair = roomGroupingMethod
} }
sharedCallActionViewModel sharedCallActionViewModel
@ -578,7 +580,12 @@ class HomeDetailFragment @Inject constructor(
viewPagerDimber.i{"Home pager: setup, old adapter: $oldAdapter"} viewPagerDimber.i{"Home pager: setup, old adapter: $oldAdapter"}
val unsafeSpaces = spaces?.map { it.roomId } ?: listOf() val unsafeSpaces = spaces?.map { it.roomId } ?: listOf()
val selectedSpaceId = (roomGroupingMethod as? RoomGroupingMethod.BySpace)?.spaceSummary?.roomId val selectedSpaceId = (roomGroupingMethod as? RoomGroupingMethod.BySpace)?.spaceSummary?.roomId
val selectedIndex = getPageIndexForSpaceId(selectedSpaceId, unsafeSpaces) val selectedIndex = if (previousRoomGroupingMethodPair == roomGroupingMethodPair && tab != pagerTab) {
// Stick with previously selected space for tab changes
views.roomListContainerPager.currentItem
} else {
getPageIndexForSpaceId(selectedSpaceId, unsafeSpaces)
}
val pagingEnabled = pagingAllowed && roomGroupingMethod is RoomGroupingMethod.BySpace && unsafeSpaces.isNotEmpty() && selectedIndex != null val pagingEnabled = pagingAllowed && roomGroupingMethod is RoomGroupingMethod.BySpace && unsafeSpaces.isNotEmpty() && selectedIndex != null
val safeSpaces = if (pagingEnabled) unsafeSpaces else listOf() val safeSpaces = if (pagingEnabled) unsafeSpaces else listOf()
// Check if we need to recreate the adapter for a new tab // Check if we need to recreate the adapter for a new tab
@ -599,7 +606,8 @@ class HomeDetailFragment @Inject constructor(
return return
} }
if (selectedIndex != null) { if (selectedIndex != null) {
if (selectedIndex != views.roomListContainerPager.currentItem) { // Somehow, currentItem sometimes claims to be 0 after tab changes even if it is not right after that, so enforce setting that either way
if (selectedIndex != views.roomListContainerPager.currentItem || selectedIndex == 0) {
// post() mitigates a case where we could end up in an endless loop circling around the same few spaces // post() mitigates a case where we could end up in an endless loop circling around the same few spaces
views.roomListContainerPager.post { views.roomListContainerPager.post {
// Do not smooth scroll large distances to avoid loading unnecessary many room lists // Do not smooth scroll large distances to avoid loading unnecessary many room lists