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

Add blank item to use pagedlist load around method

This commit is contained in:
ganfra 2018-11-02 09:52:10 +01:00
parent 6d9907563e
commit eda88030a3
3 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/im/vector/riotredesign/features/home/RoomSummaryViewHelper.kt
View File

@ -1,19 +0,0 @@
package im.vector.riotredesign.features.home

import android.content.Context
import android.graphics.drawable.Drawable
import android.support.v4.content.ContextCompat
import com.amulyakhare.textdrawable.TextDrawable
import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.riotredesign.R
import im.vector.riotredesign.core.extensions.firstCharAsString

class RoomSummaryViewHelper(private val roomSummary: RoomSummary) {

fun avatarDrawable(context: Context): Drawable {
val avatarColor = ContextCompat.getColor(context, R.color.pale_teal)
return TextDrawable.builder().buildRound(roomSummary.displayName.firstCharAsString().toUpperCase(), avatarColor)
}


}

8
app/src/main/java/im/vector/riotredesign/features/home/room/detail/BlankItem.kt Normal file
View File

@ -0,0 +1,8 @@
package im.vector.riotredesign.features.home.room.detail

import android.content.Context
import android.widget.FrameLayout
import com.airbnb.epoxy.ModelView

@ModelView(autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT)
class BlankItem(context: Context) : FrameLayout(context)

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

@ -53,6 +53,10 @@ class TimelineEventController(private val context: Context) : EpoxyController(
val event = data[index]
val nextEvent = if (index + 1 < data.size) data[index + 1] else null

val date = event.root.localDateTime()
val nextDate = nextEvent?.root?.localDateTime()
val addDaySeparator = date.toLocalDate() != nextDate?.toLocalDate()

if (event.root.type == EventType.MESSAGE) {
val messageContent = event.root.content<MessageContent>()
val roomMember = event.roomMember()
@ -60,10 +64,6 @@ class TimelineEventController(private val context: Context) : EpoxyController(
continue
}

val date = event.root.localDateTime()
val nextDate = nextEvent?.root?.localDateTime()
val addDaySeparator = date.toLocalDate() != nextDate?.toLocalDate()

val nextRoomMember = nextEvent?.roomMember()
if (addDaySeparator || nextRoomMember != roomMember) {
messagesDisplayedWithInformation.add(event.root.eventId)
@ -80,12 +80,15 @@ class TimelineEventController(private val context: Context) : EpoxyController(
.onBind { timeline?.loadAround(index) }
.id(event.root.eventId)
.addTo(this)


if (addDaySeparator) {
val formattedDay = date.toLocalDate().format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
TimelineDaySeparatorItem(formattedDay).id(formattedDay).addTo(this)
}
} else {
BlankItemModel_()
.id(event.root.eventId)
.onBind { _, _, _ -> timeline?.loadAround(index) }
.addTo(this)
}
if (addDaySeparator) {
val formattedDay = date.toLocalDate().format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
TimelineDaySeparatorItem(formattedDay).id(formattedDay).addTo(this)
}
}