mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:01:40 +00:00
Increase padding around date in timeline and add Virtual items to the preview.
This commit is contained in:
committed by
Benoit Marty
parent
7aada7db20
commit
9b7f427f20
+14
@@ -23,6 +23,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItemReac
|
|||||||
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
|
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
|
||||||
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent
|
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent
|
||||||
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
|
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
|
||||||
|
import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemLoadingModel
|
||||||
|
import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel
|
||||||
import io.element.android.libraries.designsystem.components.avatar.AvatarData
|
import io.element.android.libraries.designsystem.components.avatar.AvatarData
|
||||||
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
|
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
|
||||||
import io.element.android.libraries.matrix.api.core.EventId
|
import io.element.android.libraries.matrix.api.core.EventId
|
||||||
@@ -88,9 +90,21 @@ internal fun aTimelineItemList(content: TimelineItemEventContent): ImmutableList
|
|||||||
),
|
),
|
||||||
// A grouped event on top of it
|
// A grouped event on top of it
|
||||||
aGroupedEvents(),
|
aGroupedEvents(),
|
||||||
|
// A day separator
|
||||||
|
aTimelineItemDaySeparator(),
|
||||||
|
// Loading
|
||||||
|
aTimelineItemLoading(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun aTimelineItemLoading(): TimelineItem.Virtual {
|
||||||
|
return TimelineItem.Virtual("virtual_loading", TimelineItemLoadingModel)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun aTimelineItemDaySeparator(): TimelineItem.Virtual {
|
||||||
|
return TimelineItem.Virtual("virtual_day", aTimelineItemDaySeparatorModel("Today"))
|
||||||
|
}
|
||||||
|
|
||||||
internal fun aTimelineItemEvent(
|
internal fun aTimelineItemEvent(
|
||||||
eventId: EventId = EventId("\$" + Random.nextInt().toString()),
|
eventId: EventId = EventId("\$" + Random.nextInt().toString()),
|
||||||
transactionId: String? = null,
|
transactionId: String? = null,
|
||||||
|
|||||||
+1
-1
@@ -43,7 +43,7 @@ internal fun TimelineItemDaySeparatorView(
|
|||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.wrapContentHeight()
|
.wrapContentHeight()
|
||||||
.padding(8.dp),
|
.padding(16.dp),
|
||||||
contentAlignment = Alignment.Center,
|
contentAlignment = Alignment.Center,
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
|
|||||||
Reference in New Issue
Block a user