filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix / Room list empty state flickering

This commit is contained in:
Valere 2021-04-21 10:47:43 +02:00
parent b45585f7c0
commit d42761f98a
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
View File

@ -251,7 +251,10 @@ class RoomListFragment @Inject constructor(
.also { controller ->
section.livePages.observe(viewLifecycleOwner) { pl ->
controller.submitList(pl)
sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = pl.isEmpty()))
sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
isHidden = pl.isEmpty(),
isLoading = false
))
checkEmptyState()
}
section.notificationCount.observe(viewLifecycleOwner) { counts ->
@ -271,7 +274,10 @@ class RoomListFragment @Inject constructor(
.also { controller ->
section.liveSuggested.observe(viewLifecycleOwner) { info ->
controller.setData(info)
sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = info.rooms.isEmpty()))
sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
isHidden = info.rooms.isEmpty(),
isLoading = false
))
checkEmptyState()
}
section.isExpanded.observe(viewLifecycleOwner) { _ ->
@ -285,7 +291,9 @@ class RoomListFragment @Inject constructor(
.also { controller ->
section.liveList?.observe(viewLifecycleOwner) { list ->
controller.setData(list)
sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = list.isEmpty()))
sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
isHidden = list.isEmpty(),
isLoading = false))
checkEmptyState()
}
section.notificationCount.observe(viewLifecycleOwner) { counts ->
@ -393,8 +401,9 @@ class RoomListFragment @Inject constructor(
}
private fun checkEmptyState() {
val hasNoRoom = adapterInfosList.all { it.headerHeaderAdapter.roomsSectionData.isHidden }
if (hasNoRoom) {
val shouldShowEmpty = adapterInfosList.all { it.headerHeaderAdapter.roomsSectionData.isHidden }
&& !adapterInfosList.any { it.headerHeaderAdapter.roomsSectionData.isLoading }
if (shouldShowEmpty) {
val emptyState = when (roomListParams.displayMode) {
RoomListDisplayMode.NOTIFICATIONS -> {
StateView.State.Empty(
@ -422,7 +431,12 @@ class RoomListFragment @Inject constructor(
}
views.stateView.state = emptyState
} else {
// is there something to show already?
if (adapterInfosList.any { !it.headerHeaderAdapter.roomsSectionData.isHidden }) {
views.stateView.state = StateView.State.Content
} else {
views.stateView.state = StateView.State.Loading
}
}
}

4
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
View File

@ -35,7 +35,9 @@ class SectionHeaderAdapter constructor(
val isExpanded: Boolean = true,
val notificationCount: Int = 0,
val isHighlighted: Boolean = false,
val isHidden: Boolean = true
val isHidden: Boolean = true,
// This will be false until real data has been submitted once
val isLoading: Boolean = true
)
lateinit var roomsSectionData: RoomsSectionData