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

Add marging around item

This commit is contained in:
Benoit Marty 2019-05-24 15:57:28 +02:00
parent 2404eeadf0
commit bbf2f96288
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt
View File

@ -16,9 +16,11 @@

package im.vector.riotredesign.core.epoxy

import android.content.Context
import android.widget.ProgressBar
import com.airbnb.epoxy.ModelView
import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotredesign.R

@ModelView(autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT)
class LoadingItem(context: Context) : ProgressBar(context)
@EpoxyModelClass(layout = R.layout.item_loading)
abstract class LoadingItem : VectorEpoxyModel<LoadingItem.Holder>() {

class Holder : VectorEpoxyHolder()
}

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

@ -30,7 +30,7 @@ import im.vector.matrix.android.api.session.room.model.RoomMember
import im.vector.matrix.android.api.session.room.model.message.*
import im.vector.matrix.android.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
import im.vector.riotredesign.core.epoxy.LoadingItemModel_
import im.vector.riotredesign.core.epoxy.LoadingItem_
import im.vector.riotredesign.core.extensions.localDateTime
import im.vector.riotredesign.features.home.room.detail.timeline.factory.TimelineItemFactory
import im.vector.riotredesign.features.home.room.detail.timeline.helper.*
@ -131,14 +131,14 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
}

override fun buildModels() {
LoadingItemModel_()
LoadingItem_()
.id("forward_loading_item")
.addWhen(Timeline.Direction.FORWARDS)

val timelineModels = getModels()
add(timelineModels)

LoadingItemModel_()
LoadingItem_()
.id("backward_loading_item")
.addWhen(Timeline.Direction.BACKWARDS)
}
@ -261,7 +261,7 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
}
}

private fun LoadingItemModel_.addWhen(direction: Timeline.Direction) {
private fun LoadingItem_.addWhen(direction: Timeline.Direction) {
val shouldAdd = timeline?.hasMoreToLoad(direction) ?: false
addIf(shouldAdd, this@TimelineEventController)
}

16
vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewModel.kt
View File

@ -76,18 +76,14 @@ class RoomDirectoryViewModel(initialState: PublicRoomsViewState,
.liveRoomSummaries()
.execute { async ->
val joinedRoomIds = async.invoke()
?.filter {
// Keep only joined room
it.membership == Membership.JOIN
}
?.map {
it.roomId
}
// Keep only joined room
?.filter { it.membership == Membership.JOIN }
?.map { it.roomId }
?.toList()
?: emptyList()


copy(joinedRoomsIds = joinedRoomIds,
copy(
joinedRoomsIds = joinedRoomIds,
// Remove (newly) joined room id from the joining room list
joiningRoomsIds = joiningRoomsIds.toMutableList().apply { removeAll(joinedRoomIds) }
)
@ -102,7 +98,6 @@ class RoomDirectoryViewModel(initialState: PublicRoomsViewState,
this.roomDirectoryData = roomDirectoryData

reset()

load()
}

@ -116,7 +111,6 @@ class RoomDirectoryViewModel(initialState: PublicRoomsViewState,
currentFilter = filter

reset()

load()
}