6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Avoid displaying two loaders if there is no elements between them

Browse Source
This commit is contained in:
Benoit Marty 2019-07-15 14:08:51 +02:00
parent 8901a5e09a
commit fc1c0caea3
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
View File

@ -18,7 +18,6 @@ package im.vector.riotx.features.home.room.detail.timeline


import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.LongSparseArray
import android.view.View import android.view.View
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListUpdateCallback import androidx.recyclerview.widget.ListUpdateCallback
@ -84,7 +83,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Tim
} }


private val collapsedEventIds = linkedSetOf<Long>() private val collapsedEventIds = linkedSetOf<Long>()
private val mergeItemCollapseStates = HashMap<Long,Boolean>() private val mergeItemCollapseStates = HashMap<Long, Boolean>()
private val modelCache = arrayListOf<CacheItemData?>() private val modelCache = arrayListOf<CacheItemData?>()


private var currentSnapshot: List<TimelineEvent> = emptyList() private var currentSnapshot: List<TimelineEvent> = emptyList()
@ -178,16 +177,19 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Tim
} }


override fun buildModels() { override fun buildModels() {
LoadingItem_() val loaderAdded = LoadingItem_()
.id("forward_loading_item") .id("forward_loading_item")
.addWhen(Timeline.Direction.FORWARDS) .addWhen(Timeline.Direction.FORWARDS)


val timelineModels = getModels() val timelineModels = getModels()
add(timelineModels) add(timelineModels)


LoadingItem_() // Avoid displaying two loaders if there is no elements between them
.id("backward_loading_item") if (!loaderAdded || timelineModels.isNotEmpty()) {
.addWhen(Timeline.Direction.BACKWARDS) LoadingItem_()
.id("backward_loading_item")
.addWhen(Timeline.Direction.BACKWARDS)
}
} }


// Timeline.LISTENER *************************************************************************** // Timeline.LISTENER ***************************************************************************
@ -310,9 +312,13 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Tim
} }
} }


private fun LoadingItem_.addWhen(direction: Timeline.Direction) { /**
* Return true if added
*/
private fun LoadingItem_.addWhen(direction: Timeline.Direction): Boolean {
val shouldAdd = timeline?.hasMoreToLoad(direction) ?: false val shouldAdd = timeline?.hasMoreToLoad(direction) ?: false
addIf(shouldAdd, this@TimelineEventController) addIf(shouldAdd, this@TimelineEventController)
return shouldAdd
} }


fun searchPositionOfEvent(eventId: String): Int? { fun searchPositionOfEvent(eventId: String): Int? {