From f0db8b00eadd0b5d73d316619be608621b937681 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 3 Feb 2023 10:35:30 +0100 Subject: [PATCH 01/25] Start integrating uptodate rust sdk and make it compile (WIP) --- .../features/messages/MessagesEvents.kt | 2 +- .../features/messages/MessagesPresenter.kt | 10 +- .../android/features/messages/MessagesView.kt | 18 +- .../messages/actionlist/ActionListEvents.kt | 2 +- .../actionlist/ActionListPresenter.kt | 4 +- .../messages/actionlist/ActionListState.kt | 4 +- .../messages/actionlist/ActionListView.kt | 8 +- .../messages/timeline/TimelineItemsFactory.kt | 252 ------------------ .../messages/timeline/TimelinePresenter.kt | 24 +- .../messages/timeline/TimelineState.kt | 1 - .../messages/timeline/TimelineView.kt | 58 ++-- .../factories/TimelineItemContentFactory.kt | 50 ++++ ...eItemContentFailedToParseMessageFactory.kt | 29 ++ ...ineItemContentFailedToParseStateFactory.kt | 29 ++ .../TimelineItemContentMessageFactory.kt | 68 +++++ ...TimelineItemContentProfileChangeFactory.kt | 30 +++ .../TimelineItemContentRedactedFactory.kt | 29 ++ ...imelineItemContentRoomMembershipFactory.kt | 29 ++ .../TimelineItemContentStateFactory.kt | 29 ++ .../TimelineItemContentStickerFactory.kt | 29 ++ .../TimelineItemContentUTDFactory.kt | 29 ++ .../factories/TimelineItemEventFactory.kt | 90 +++++++ .../factories/TimelineItemVirtualFactory.kt | 34 +++ .../factories/TimelineItemsFactory.kt | 117 ++++++++ .../messages/timeline/model/TimelineItem.kt | 2 +- .../messages/timeline/util/toHtmlDocument.kt | 28 ++ .../libraries/matrix/di/MatrixModule.kt | 2 +- .../matrix/room/RoomSummaryDataSource.kt | 6 + .../matrix/room/message/RoomMessageFactory.kt | 2 +- .../matrix/timeline/MatrixTimeline.kt | 3 +- .../matrix/timeline/MatrixTimelineItem.kt | 7 +- .../matrix/timeline/RustMatrixTimeline.kt | 28 +- .../matrix/util/StoppableSpawnBag.kt | 33 +++ .../matrixtest/timeline/FakeMatrixTimeline.kt | 5 +- 34 files changed, 739 insertions(+), 352 deletions(-) delete mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/toHtmlDocument.kt create mode 100644 libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/StoppableSpawnBag.kt diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt index d8d5c0c795..4e6505f31c 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt @@ -20,5 +20,5 @@ import io.element.android.features.messages.actionlist.model.TimelineItemAction import io.element.android.features.messages.timeline.model.TimelineItem sealed interface MessagesEvents { - data class HandleAction(val action: TimelineItemAction, val messageEvent: TimelineItem.MessageEvent) : MessagesEvents + data class HandleAction(val action: TimelineItemAction, val event: TimelineItem.Event) : MessagesEvents } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt index 44d6f0b7a1..ccfb58b5f8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt @@ -78,7 +78,7 @@ class MessagesPresenter @Inject constructor( } fun handleEvents(event: MessagesEvents) { when (event) { - is MessagesEvents.HandleAction -> localCoroutineScope.handleTimelineAction(event.action, event.messageEvent, composerState) + is MessagesEvents.HandleAction -> localCoroutineScope.handleTimelineAction(event.action, event.event, composerState) } } return MessagesState( @@ -94,7 +94,7 @@ class MessagesPresenter @Inject constructor( fun CoroutineScope.handleTimelineAction( action: TimelineItemAction, - targetEvent: TimelineItem.MessageEvent, + targetEvent: TimelineItem.Event, composerState: MessageComposerState, ) = launch { when (action) { @@ -110,11 +110,11 @@ class MessagesPresenter @Inject constructor( Timber.v("NotImplementedYet") } - private suspend fun handleActionRedact(event: TimelineItem.MessageEvent) { + private suspend fun handleActionRedact(event: TimelineItem.Event) { room.redactEvent(event.id) } - private fun handleActionEdit(targetEvent: TimelineItem.MessageEvent, composerState: MessageComposerState) { + private fun handleActionEdit(targetEvent: TimelineItem.Event, composerState: MessageComposerState) { val composerMode = MessageComposerMode.Edit( targetEvent.id, (targetEvent.content as? TimelineItemTextBasedContent)?.body.orEmpty() @@ -124,7 +124,7 @@ class MessagesPresenter @Inject constructor( ) } - private fun handleActionReply(targetEvent: TimelineItem.MessageEvent, composerState: MessageComposerState) { + private fun handleActionReply(targetEvent: TimelineItem.Event, composerState: MessageComposerState) { val composerMode = MessageComposerMode.Reply(targetEvent.safeSenderName, targetEvent.id, "") composerState.eventSink( MessageComposerEvents.SetMode(composerMode) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt index 706dc48c43..ef47416b48 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt @@ -84,21 +84,21 @@ fun MessagesView( LogCompositions(tag = "MessagesScreen", msg = "Content") - fun onMessageClicked(messageEvent: TimelineItem.MessageEvent) { - Timber.v("OnMessageClicked= ${messageEvent.id}") + fun onMessageClicked(event: TimelineItem.Event) { + Timber.v("OnMessageClicked= ${event.id}") } - fun onMessageLongClicked(messageEvent: TimelineItem.MessageEvent) { - Timber.v("OnMessageLongClicked= ${messageEvent.id}") + fun onMessageLongClicked(event: TimelineItem.Event) { + Timber.v("OnMessageLongClicked= ${event.id}") focusManager.clearFocus(force = true) - state.actionListState.eventSink(ActionListEvents.ComputeForMessage(messageEvent)) + state.actionListState.eventSink(ActionListEvents.ComputeForMessage(event)) coroutineScope.launch { itemActionsBottomSheetState.show() } } - fun onActionSelected(action: TimelineItemAction, messageEvent: TimelineItem.MessageEvent) { - state.eventSink(MessagesEvents.HandleAction(action, messageEvent)) + fun onActionSelected(action: TimelineItemAction, event: TimelineItem.Event) { + state.eventSink(MessagesEvents.HandleAction(action, event)) } Scaffold( @@ -138,8 +138,8 @@ fun MessagesView( fun MessagesViewContent( state: MessagesState, modifier: Modifier = Modifier, - onMessageClicked: (TimelineItem.MessageEvent) -> Unit = {}, - onMessageLongClicked: (TimelineItem.MessageEvent) -> Unit = {}, + onMessageClicked: (TimelineItem.Event) -> Unit = {}, + onMessageLongClicked: (TimelineItem.Event) -> Unit = {}, ) { Column( modifier = modifier diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt index f760f08640..99e41de3e1 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt @@ -20,5 +20,5 @@ import io.element.android.features.messages.timeline.model.TimelineItem sealed interface ActionListEvents { object Clear : ActionListEvents - data class ComputeForMessage(val messageEvent: TimelineItem.MessageEvent) : ActionListEvents + data class ComputeForMessage(val event: TimelineItem.Event) : ActionListEvents } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt index a0114f2420..f02f21bcbc 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt @@ -43,7 +43,7 @@ class ActionListPresenter @Inject constructor() : Presenter { fun handleEvents(event: ActionListEvents) { when (event) { ActionListEvents.Clear -> target.value = ActionListState.Target.None - is ActionListEvents.ComputeForMessage -> localCoroutineScope.computeForMessage(event.messageEvent, target) + is ActionListEvents.ComputeForMessage -> localCoroutineScope.computeForMessage(event.event, target) } } @@ -53,7 +53,7 @@ class ActionListPresenter @Inject constructor() : Presenter { ) } - fun CoroutineScope.computeForMessage(timelineItem: TimelineItem.MessageEvent, target: MutableState) = launch { + fun CoroutineScope.computeForMessage(timelineItem: TimelineItem.Event, target: MutableState) = launch { target.value = ActionListState.Target.Loading(timelineItem) val actions = if (timelineItem.content is TimelineItemRedactedContent) { diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt index 6bc7630ec8..96134e1207 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt @@ -29,9 +29,9 @@ data class ActionListState( sealed interface Target { object None : Target - data class Loading(val messageEvent: TimelineItem.MessageEvent) : Target + data class Loading(val event: TimelineItem.Event) : Target data class Success( - val messageEvent: TimelineItem.MessageEvent, + val event: TimelineItem.Event, val actions: ImmutableList, ) : Target } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt index 53df8d4b40..b5d7428d56 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt @@ -51,7 +51,7 @@ import kotlinx.coroutines.launch fun ActionListView( state: ActionListState, modalBottomSheetState: ModalBottomSheetState, - onActionSelected: (action: TimelineItemAction, TimelineItem.MessageEvent) -> Unit, + onActionSelected: (action: TimelineItemAction, TimelineItem.Event) -> Unit, modifier: Modifier = Modifier ) { val coroutineScope = rememberCoroutineScope() @@ -65,7 +65,7 @@ fun ActionListView( fun onItemActionClicked( itemAction: TimelineItemAction, - targetItem: TimelineItem.MessageEvent + targetItem: TimelineItem.Event ) { onActionSelected(itemAction, targetItem) coroutineScope.launch { @@ -92,7 +92,7 @@ fun ActionListView( private fun SheetContent( state: ActionListState, modifier: Modifier = Modifier, - onActionClicked: (TimelineItemAction, TimelineItem.MessageEvent) -> Unit = { _, _ -> }, + onActionClicked: (TimelineItemAction, TimelineItem.Event) -> Unit = { _, _ -> }, ) { when (val target = state.target) { is ActionListState.Target.Loading, @@ -110,7 +110,7 @@ private fun SheetContent( ) { action -> ListItem( modifier = Modifier.clickable { - onActionClicked(action, target.messageEvent) + onActionClicked(action, target.event) }, text = { Text( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt deleted file mode 100644 index ce945f1e88..0000000000 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (c) 2023 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.features.messages.timeline - -import androidx.recyclerview.widget.DiffUtil -import io.element.android.features.messages.timeline.diff.CacheInvalidator -import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback -import io.element.android.features.messages.timeline.model.AggregatedReaction -import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition -import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.features.messages.timeline.model.TimelineItemReactions -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemEmoteContent -import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent -import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.features.messages.timeline.model.content.TimelineItemNoticeContent -import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent -import io.element.android.features.messages.timeline.util.invalidateLast -import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.libraries.matrix.core.EventId -import io.element.android.libraries.matrix.media.MediaResolver -import io.element.android.libraries.matrix.room.MatrixRoom -import io.element.android.libraries.matrix.timeline.MatrixTimelineItem -import io.element.android.libraries.matrix.ui.MatrixItemHelper -import kotlinx.collections.immutable.toImmutableList -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.sync.Mutex -import kotlinx.coroutines.sync.withLock -import kotlinx.coroutines.withContext -import org.jsoup.Jsoup -import org.jsoup.nodes.Document -import org.matrix.rustcomponents.sdk.FormattedBody -import org.matrix.rustcomponents.sdk.MessageFormat -import org.matrix.rustcomponents.sdk.MessageType -import timber.log.Timber -import javax.inject.Inject -import kotlin.system.measureTimeMillis - -class TimelineItemsFactory @Inject constructor( - private val matrixItemHelper: MatrixItemHelper, - private val room: MatrixRoom, - private val dispatcher: CoroutineDispatcher, -) { - - private val timelineItems = MutableStateFlow>(emptyList()) - private val timelineItemsCache = arrayListOf() - - // Items from rust sdk, used for diffing - private var matrixTimelineItems: List = emptyList() - - private val lock = Mutex() - private val cacheInvalidator = CacheInvalidator(timelineItemsCache) - - fun flow(): StateFlow> = timelineItems.asStateFlow() - - suspend fun replaceWith( - timelineItems: List, - ) = withContext(dispatcher) { - lock.withLock { - calculateAndApplyDiff(timelineItems) - buildAndEmitTimelineItemStates(timelineItems) - } - } - - suspend fun pushItem( - timelineItem: MatrixTimelineItem, - ) = withContext(dispatcher) { - lock.withLock { - // Makes sure to invalidate last as we need to recompute some data (like groupPosition) - timelineItemsCache.invalidateLast() - timelineItemsCache.add(null) - matrixTimelineItems = matrixTimelineItems + timelineItem - buildAndEmitTimelineItemStates(matrixTimelineItems) - } - } - - private suspend fun buildAndEmitTimelineItemStates(timelineItems: List) { - val newTimelineItemStates = ArrayList() - for (index in timelineItemsCache.indices.reversed()) { - val cacheItem = timelineItemsCache[index] - if (cacheItem == null) { - buildAndCacheItem(timelineItems, index)?.also { timelineItemState -> - newTimelineItemStates.add(timelineItemState) - } - } else { - newTimelineItemStates.add(cacheItem) - } - } - this.timelineItems.emit(newTimelineItemStates) - } - - private fun calculateAndApplyDiff(newTimelineItems: List) { - val timeToDiff = measureTimeMillis { - val diffCallback = - MatrixTimelineItemsDiffCallback( - oldList = matrixTimelineItems, - newList = newTimelineItems - ) - val diffResult = DiffUtil.calculateDiff(diffCallback, false) - matrixTimelineItems = newTimelineItems - diffResult.dispatchUpdatesTo(cacheInvalidator) - } - Timber.v("Time to apply diff on new list of ${newTimelineItems.size} items: $timeToDiff ms") - } - - private suspend fun buildAndCacheItem( - timelineItems: List, - index: Int - ): TimelineItem? { - val timelineItemState = - when (val currentTimelineItem = timelineItems[index]) { - is MatrixTimelineItem.Event -> { - buildMessageEvent( - currentTimelineItem, - index, - timelineItems, - ) - } - is MatrixTimelineItem.Virtual -> TimelineItem.Virtual( - "virtual_item_$index" - ) - MatrixTimelineItem.Other -> null - } - timelineItemsCache[index] = timelineItemState - return timelineItemState - } - - private suspend fun buildMessageEvent( - currentTimelineItem: MatrixTimelineItem.Event, - index: Int, - timelineItems: List, - ): TimelineItem.MessageEvent { - val currentSender = currentTimelineItem.event.sender() - val groupPosition = - computeGroupPosition(currentTimelineItem, timelineItems, index) - val senderDisplayName = room.userDisplayName(currentSender).getOrNull() - val senderAvatarUrl = room.userAvatarUrl(currentSender).getOrNull() - val senderAvatarData = AvatarData( - name = senderDisplayName ?: currentSender, - url = senderAvatarUrl, - size = AvatarSize.SMALL - ) - return TimelineItem.MessageEvent( - id = EventId(currentTimelineItem.uniqueId), - senderId = currentSender, - senderDisplayName = senderDisplayName, - senderAvatar = senderAvatarData, - content = currentTimelineItem.computeContent(), - isMine = currentTimelineItem.event.isOwn(), - groupPosition = groupPosition, - reactionsState = currentTimelineItem.computeReactionsState() - ) - } - - private fun MatrixTimelineItem.Event.computeReactionsState(): TimelineItemReactions { - val aggregatedReactions = event.reactions().map { - AggregatedReaction(key = it.key, count = it.count.toString(), isHighlighted = false) - } - return TimelineItemReactions(aggregatedReactions.toImmutableList()) - } - - private fun MatrixTimelineItem.Event.computeContent(): TimelineItemContent { - val content = event.content() - content.asUnableToDecrypt()?.let { encryptedMessage -> - return TimelineItemEncryptedContent(encryptedMessage) - } - if (content.isRedactedMessage()) { - return TimelineItemRedactedContent - } - val contentAsMessage = content.asMessage() - return when (val messageType = contentAsMessage?.msgtype()) { - is MessageType.Emote -> TimelineItemEmoteContent( - body = messageType.content.body, - htmlDocument = messageType.content.formatted?.toHtmlDocument() - ) - is MessageType.Image -> { - val height = messageType.content.info?.height?.toFloat() - val width = messageType.content.info?.width?.toFloat() - val aspectRatio = if (height != null && width != null) { - width / height - } else { - 0.7f - } - TimelineItemImageContent( - body = messageType.content.body, - imageMeta = MediaResolver.Meta( - source = messageType.content.source, - kind = MediaResolver.Kind.Content - ), - blurhash = messageType.content.info?.blurhash, - aspectRatio = aspectRatio - ) - } - is MessageType.Notice -> TimelineItemNoticeContent( - body = messageType.content.body, - htmlDocument = messageType.content.formatted?.toHtmlDocument() - ) - is MessageType.Text -> TimelineItemTextContent( - body = messageType.content.body, - htmlDocument = messageType.content.formatted?.toHtmlDocument() - ) - else -> TimelineItemUnknownContent - } - } - - private fun FormattedBody.toHtmlDocument(): Document? { - return takeIf { it.format == MessageFormat.HTML }?.body?.let { formattedBody -> - Jsoup.parse(formattedBody) - } - } - - private fun computeGroupPosition( - currentTimelineItem: MatrixTimelineItem.Event, - timelineItems: List, - index: Int - ): MessagesItemGroupPosition { - val prevTimelineItem = - timelineItems.getOrNull(index - 1) as? MatrixTimelineItem.Event - val nextTimelineItem = - timelineItems.getOrNull(index + 1) as? MatrixTimelineItem.Event - val currentSender = currentTimelineItem.event.sender() - val previousSender = prevTimelineItem?.event?.sender() - val nextSender = nextTimelineItem?.event?.sender() - - return when { - previousSender != currentSender && nextSender == currentSender -> MessagesItemGroupPosition.First - previousSender == currentSender && nextSender == currentSender -> MessagesItemGroupPosition.Middle - previousSender == currentSender && nextSender != currentSender -> MessagesItemGroupPosition.Last - else -> MessagesItemGroupPosition.None - } - } -} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt index 18ce07896e..d1b9145586 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt @@ -24,14 +24,12 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable +import io.element.android.features.messages.timeline.factories.TimelineItemsFactory import io.element.android.libraries.architecture.Presenter -import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.timeline.MatrixTimeline import io.element.android.libraries.matrix.timeline.MatrixTimelineItem -import io.element.android.libraries.matrix.ui.MatrixItemHelper import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn @@ -39,18 +37,15 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import javax.inject.Inject -private const val PAGINATION_COUNT = 50 +private const val backPaginationEventLimit = 20 +private const val backPaginationPageSize = 50 class TimelinePresenter @Inject constructor( - coroutineDispatchers: CoroutineDispatchers, - client: MatrixClient, + private val timelineItemsFactory: TimelineItemsFactory, room: MatrixRoom, ) : Presenter { private val timeline = room.timeline() - private val matrixItemHelper = MatrixItemHelper(client) - private val timelineItemsFactory = - TimelineItemsFactory(matrixItemHelper, room, coroutineDispatchers.computation) private class TimelineCallback( private val coroutineScope: CoroutineScope, @@ -66,9 +61,6 @@ class TimelinePresenter @Inject constructor( @Composable override fun present(): TimelineState { val localCoroutineScope = rememberCoroutineScope() - val hasMoreToLoad = rememberSaveable { - mutableStateOf(timeline.hasMoreToLoad) - } val highlightedEventId: MutableState = rememberSaveable { mutableStateOf(null) } @@ -78,7 +70,7 @@ class TimelinePresenter @Inject constructor( fun handleEvents(event: TimelineEvents) { when (event) { - TimelineEvents.LoadMore -> localCoroutineScope.loadMore(hasMoreToLoad) + TimelineEvents.LoadMore -> localCoroutineScope.loadMore() is TimelineEvents.SetHighlightedEvent -> highlightedEventId.value = event.eventId } } @@ -102,13 +94,11 @@ class TimelinePresenter @Inject constructor( return TimelineState( highlightedEventId = highlightedEventId.value, timelineItems = timelineItems.value.toImmutableList(), - hasMoreToLoad = hasMoreToLoad.value, eventSink = ::handleEvents ) } - private fun CoroutineScope.loadMore(hasMoreToLoad: MutableState) = launch { - timeline.paginateBackwards(PAGINATION_COUNT) - hasMoreToLoad.value = timeline.hasMoreToLoad + private fun CoroutineScope.loadMore() = launch { + timeline.paginateBackwards(backPaginationEventLimit, backPaginationPageSize) } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt index 6b8c715f5d..c86dab1422 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt @@ -24,7 +24,6 @@ import kotlinx.collections.immutable.ImmutableList @Immutable data class TimelineState( val timelineItems: ImmutableList, - val hasMoreToLoad: Boolean, val highlightedEventId: EventId?, val eventSink: (TimelineEvents) -> Unit ) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index a73c724448..d408656c03 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -90,8 +90,8 @@ import kotlinx.coroutines.launch fun TimelineView( state: TimelineState, modifier: Modifier = Modifier, - onMessageClicked: (TimelineItem.MessageEvent) -> Unit = {}, - onMessageLongClicked: (TimelineItem.MessageEvent) -> Unit = {}, + onMessageClicked: (TimelineItem.Event) -> Unit = {}, + onMessageLongClicked: (TimelineItem.Event) -> Unit = {}, ) { val lazyListState = rememberLazyListState() Box(modifier = modifier) { @@ -114,11 +114,14 @@ fun TimelineView( onLongClick = onMessageLongClicked ) } + /* if (state.hasMoreToLoad) { item { TimelineLoadingMoreIndicator() } } + + */ } fun onReachedLoadMore() { @@ -135,14 +138,14 @@ fun TimelineView( private fun TimelineItem.key(): String { return when (this) { - is TimelineItem.MessageEvent -> id.value + is TimelineItem.Event -> id.value is TimelineItem.Virtual -> id } } private fun TimelineItem.contentType(): Int { return when (this) { - is TimelineItem.MessageEvent -> 0 + is TimelineItem.Event -> 0 is TimelineItem.Virtual -> 1 } } @@ -151,13 +154,13 @@ private fun TimelineItem.contentType(): Int { fun TimelineItemRow( timelineItem: TimelineItem, isHighlighted: Boolean, - onClick: (TimelineItem.MessageEvent) -> Unit, - onLongClick: (TimelineItem.MessageEvent) -> Unit, + onClick: (TimelineItem.Event) -> Unit, + onLongClick: (TimelineItem.Event) -> Unit, ) { when (timelineItem) { is TimelineItem.Virtual -> return - is TimelineItem.MessageEvent -> MessageEventRow( - messageEvent = timelineItem, + is TimelineItem.Event -> MessageEventRow( + event = timelineItem, isHighlighted = isHighlighted, onClick = { onClick(timelineItem) }, onLongClick = { onLongClick(timelineItem) } @@ -167,14 +170,14 @@ fun TimelineItemRow( @Composable fun MessageEventRow( - messageEvent: TimelineItem.MessageEvent, + event: TimelineItem.Event, isHighlighted: Boolean, onClick: () -> Unit, onLongClick: () -> Unit, modifier: Modifier = Modifier ) { val interactionSource = remember { MutableInteractionSource() } - val (parentAlignment, contentAlignment) = if (messageEvent.isMine) { + val (parentAlignment, contentAlignment) = if (event.isMine) { Pair(Alignment.CenterEnd, Alignment.End) } else { Pair(Alignment.CenterStart, Alignment.Start) @@ -186,20 +189,20 @@ fun MessageEventRow( contentAlignment = parentAlignment ) { Row { - if (!messageEvent.isMine) { + if (!event.isMine) { Spacer(modifier = Modifier.width(16.dp)) } Column(horizontalAlignment = contentAlignment) { - if (messageEvent.showSenderInformation) { + if (event.showSenderInformation) { MessageSenderInformation( - messageEvent.safeSenderName, - messageEvent.senderAvatar, + event.safeSenderName, + event.senderAvatar, Modifier.zIndex(1f) ) } MessageEventBubble( - groupPosition = messageEvent.groupPosition, - isMine = messageEvent.isMine, + groupPosition = event.groupPosition, + isMine = event.isMine, interactionSource = interactionSource, isHighlighted = isHighlighted, onClick = onClick, @@ -209,45 +212,45 @@ fun MessageEventRow( .widthIn(max = 320.dp) ) { val contentModifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp) - when (messageEvent.content) { + when (event.content) { is TimelineItemEncryptedContent -> TimelineItemEncryptedView( - content = messageEvent.content, + content = event.content, modifier = contentModifier ) is TimelineItemRedactedContent -> TimelineItemRedactedView( - content = messageEvent.content, + content = event.content, modifier = contentModifier ) is TimelineItemTextBasedContent -> TimelineItemTextView( - content = messageEvent.content, + content = event.content, interactionSource = interactionSource, modifier = contentModifier, onTextClicked = onClick, onTextLongClicked = onLongClick ) is TimelineItemUnknownContent -> TimelineItemUnknownView( - content = messageEvent.content, + content = event.content, modifier = contentModifier ) is TimelineItemImageContent -> TimelineItemImageView( - content = messageEvent.content, + content = event.content, modifier = contentModifier ) } } TimelineItemReactionsView( - reactionsState = messageEvent.reactionsState, + reactionsState = event.reactionsState, modifier = Modifier .zIndex(1f) - .offset(x = if (messageEvent.isMine) 0.dp else 20.dp, y = -(16.dp)) + .offset(x = if (event.isMine) 0.dp else 20.dp, y = -(16.dp)) ) } - if (messageEvent.isMine) { + if (event.isMine) { Spacer(modifier = Modifier.width(16.dp)) } } } - if (messageEvent.groupPosition.isNew()) { + if (event.groupPosition.isNew()) { Spacer(modifier = modifier.height(8.dp)) } else { Spacer(modifier = modifier.height(2.dp)) @@ -399,7 +402,6 @@ fun TimelineItemsPreview( TimelineView( state = TimelineState( timelineItems = timelineItems, - hasMoreToLoad = true, highlightedEventId = null, eventSink = {} ) @@ -411,7 +413,7 @@ private fun createMessageEvent( content: TimelineItemContent, groupPosition: MessagesItemGroupPosition ): TimelineItem { - return TimelineItem.MessageEvent( + return TimelineItem.Event( id = EventId(Math.random().toString()), senderId = "senderId", senderAvatar = AvatarData("sender"), diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt new file mode 100644 index 0000000000..a8c9ce9db0 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +typealias RustTimelineItemContent = org.matrix.rustcomponents.sdk.TimelineItemContent + +class TimelineItemContentFactory @Inject constructor( + private val messageFactory: TimelineItemContentMessageFactory, + private val redactedMessageFactory: TimelineItemContentRedactedFactory, + private val stickerFactory: TimelineItemContentStickerFactory, + private val utdFactory: TimelineItemContentUTDFactory, + private val roomMembershipFactory: TimelineItemContentRoomMembershipFactory, + private val profileChangeFactory: TimelineItemContentProfileChangeFactory, + private val stateFactory: TimelineItemContentStateFactory, + private val failedToParseMessageFactory: TimelineItemContentFailedToParseMessageFactory, + private val failedToParseStateFactory: TimelineItemContentFailedToParseStateFactory +) { + + fun create(itemContent: RustTimelineItemContent): TimelineItemContent { + return when (val kind = itemContent.kind()) { + is TimelineItemContentKind.Message -> messageFactory.create(itemContent.asMessage()) + is TimelineItemContentKind.RedactedMessage -> redactedMessageFactory.create(kind) + is TimelineItemContentKind.Sticker -> stickerFactory.create(kind) + is TimelineItemContentKind.UnableToDecrypt -> utdFactory.create(kind) + is TimelineItemContentKind.RoomMembership -> roomMembershipFactory.create(kind) + is TimelineItemContentKind.ProfileChange -> profileChangeFactory.create(kind) + is TimelineItemContentKind.State -> stateFactory.create(kind) + is TimelineItemContentKind.FailedToParseMessageLike -> failedToParseMessageFactory.create(kind) + is TimelineItemContentKind.FailedToParseState -> failedToParseStateFactory.create(kind) + } + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt new file mode 100644 index 0000000000..382bc0d84a --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentFailedToParseMessageFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.FailedToParseMessageLike): TimelineItemContent { + return TimelineItemUnknownContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt new file mode 100644 index 0000000000..57d25673ab --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentFailedToParseStateFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.FailedToParseState): TimelineItemContent { + return TimelineItemUnknownContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt new file mode 100644 index 0000000000..5ac1dec13b --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEmoteContent +import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.content.TimelineItemNoticeContent +import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.util.toHtmlDocument +import io.element.android.libraries.matrix.media.MediaResolver +import org.matrix.rustcomponents.sdk.Message +import org.matrix.rustcomponents.sdk.MessageType +import javax.inject.Inject + +class TimelineItemContentMessageFactory @Inject constructor() { + + fun create(contentAsMessage: Message?): TimelineItemContent { + return when (val messageType = contentAsMessage?.msgtype()) { + is MessageType.Emote -> TimelineItemEmoteContent( + body = messageType.content.body, + htmlDocument = messageType.content.formatted?.toHtmlDocument() + ) + is MessageType.Image -> { + val height = messageType.content.info?.height?.toFloat() + val width = messageType.content.info?.width?.toFloat() + val aspectRatio = if (height != null && width != null) { + width / height + } else { + 0.7f + } + TimelineItemImageContent( + body = messageType.content.body, + imageMeta = MediaResolver.Meta( + source = messageType.content.source, + kind = MediaResolver.Kind.Content + ), + blurhash = messageType.content.info?.blurhash, + aspectRatio = aspectRatio + ) + } + is MessageType.Notice -> TimelineItemNoticeContent( + body = messageType.content.body, + htmlDocument = messageType.content.formatted?.toHtmlDocument() + ) + is MessageType.Text -> TimelineItemTextContent( + body = messageType.content.body, + htmlDocument = messageType.content.formatted?.toHtmlDocument() + ) + else -> TimelineItemUnknownContent + } + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt new file mode 100644 index 0000000000..40027de1b4 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentProfileChangeFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.ProfileChange): TimelineItemContent { + return TimelineItemUnknownContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt new file mode 100644 index 0000000000..3bb8550071 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentRedactedFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.RedactedMessage): TimelineItemContent { + return TimelineItemRedactedContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt new file mode 100644 index 0000000000..e2dcfeea19 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentRoomMembershipFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.RoomMembership): TimelineItemContent { + return TimelineItemUnknownContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt new file mode 100644 index 0000000000..abfa405ecd --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentStateFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.State): TimelineItemContent { + return TimelineItemUnknownContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt new file mode 100644 index 0000000000..d69ea61341 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentStickerFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.Sticker): TimelineItemContent { + return TimelineItemUnknownContent + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt new file mode 100644 index 0000000000..4f2285a402 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent +import org.matrix.rustcomponents.sdk.TimelineItemContentKind +import javax.inject.Inject + +class TimelineItemContentUTDFactory @Inject constructor() { + + fun create(kind: TimelineItemContentKind.UnableToDecrypt): TimelineItemContent { + return TimelineItemEncryptedContent(kind.msg) + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt new file mode 100644 index 0000000000..c49b007a43 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.AggregatedReaction +import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.TimelineItemReactions +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import kotlinx.collections.immutable.toImmutableList +import javax.inject.Inject + +class TimelineItemEventFactory @Inject constructor( + private val room: MatrixRoom, + private val contentFactory: TimelineItemContentFactory, +) { + + suspend fun create( + currentTimelineItem: MatrixTimelineItem.Event, + index: Int, + timelineItems: List, + ): TimelineItem.Event { + val currentSender = currentTimelineItem.event.sender() + val groupPosition = + computeGroupPosition(currentTimelineItem, timelineItems, index) + val senderDisplayName = room.userDisplayName(currentSender).getOrNull() + val senderAvatarUrl = room.userAvatarUrl(currentSender).getOrNull() + val senderAvatarData = AvatarData( + name = senderDisplayName ?: currentSender, + url = senderAvatarUrl, + size = AvatarSize.SMALL + ) + return TimelineItem.Event( + id = EventId(currentTimelineItem.uniqueId), + senderId = currentSender, + senderDisplayName = senderDisplayName, + senderAvatar = senderAvatarData, + content = contentFactory.create(currentTimelineItem.event.content()), + isMine = currentTimelineItem.event.isOwn(), + groupPosition = groupPosition, + reactionsState = currentTimelineItem.computeReactionsState() + ) + } + + private fun MatrixTimelineItem.Event.computeReactionsState(): TimelineItemReactions { + val aggregatedReactions = event.reactions().orEmpty().map { + AggregatedReaction(key = it.key, count = it.count.toString(), isHighlighted = false) + } + return TimelineItemReactions(aggregatedReactions.toImmutableList()) + } + + private fun computeGroupPosition( + currentTimelineItem: MatrixTimelineItem.Event, + timelineItems: List, + index: Int + ): MessagesItemGroupPosition { + val prevTimelineItem = + timelineItems.getOrNull(index - 1) as? MatrixTimelineItem.Event + val nextTimelineItem = + timelineItems.getOrNull(index + 1) as? MatrixTimelineItem.Event + val currentSender = currentTimelineItem.event.sender() + val previousSender = prevTimelineItem?.event?.sender() + val nextSender = nextTimelineItem?.event?.sender() + + return when { + previousSender != currentSender && nextSender == currentSender -> MessagesItemGroupPosition.First + previousSender == currentSender && nextSender == currentSender -> MessagesItemGroupPosition.Middle + previousSender == currentSender && nextSender != currentSender -> MessagesItemGroupPosition.Last + else -> MessagesItemGroupPosition.None + } + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt new file mode 100644 index 0000000000..b0f4cc3bbb --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import javax.inject.Inject + +class TimelineItemVirtualFactory @Inject constructor() { + + suspend fun create( + currentTimelineItem: MatrixTimelineItem.Virtual, + index: Int, + timelineItems: List, + ): TimelineItem.Virtual { + return TimelineItem.Virtual( + id = "virtual_item_$index" + ) + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt new file mode 100644 index 0000000000..2f94967c3f --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories + +import androidx.recyclerview.widget.DiffUtil +import io.element.android.features.messages.timeline.diff.CacheInvalidator +import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.util.invalidateLast +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +import kotlinx.coroutines.withContext +import timber.log.Timber +import javax.inject.Inject +import kotlin.system.measureTimeMillis + +class TimelineItemsFactory @Inject constructor( + private val dispatchers: CoroutineDispatchers, + private val eventItemFactory: TimelineItemEventFactory, + private val virtualItemFactory: TimelineItemVirtualFactory, +) { + + private val timelineItems = MutableStateFlow>(emptyList()) + private val timelineItemsCache = arrayListOf() + + // Items from rust sdk, used for diffing + private var matrixTimelineItems: List = emptyList() + + private val lock = Mutex() + private val cacheInvalidator = CacheInvalidator(timelineItemsCache) + + fun flow(): StateFlow> = timelineItems.asStateFlow() + + suspend fun replaceWith( + timelineItems: List, + ) = withContext(dispatchers.computation) { + lock.withLock { + calculateAndApplyDiff(timelineItems) + buildAndEmitTimelineItemStates(timelineItems) + } + } + + suspend fun pushItem( + timelineItem: MatrixTimelineItem, + ) = withContext(dispatchers.computation) { + lock.withLock { + // Makes sure to invalidate last as we need to recompute some data (like groupPosition) + timelineItemsCache.invalidateLast() + timelineItemsCache.add(null) + matrixTimelineItems = matrixTimelineItems + timelineItem + buildAndEmitTimelineItemStates(matrixTimelineItems) + } + } + + private suspend fun buildAndEmitTimelineItemStates(timelineItems: List) { + val newTimelineItemStates = ArrayList() + for (index in timelineItemsCache.indices.reversed()) { + val cacheItem = timelineItemsCache[index] + if (cacheItem == null) { + buildAndCacheItem(timelineItems, index)?.also { timelineItemState -> + newTimelineItemStates.add(timelineItemState) + } + } else { + newTimelineItemStates.add(cacheItem) + } + } + this.timelineItems.emit(newTimelineItemStates) + } + + private fun calculateAndApplyDiff(newTimelineItems: List) { + val timeToDiff = measureTimeMillis { + val diffCallback = + MatrixTimelineItemsDiffCallback( + oldList = matrixTimelineItems, + newList = newTimelineItems + ) + val diffResult = DiffUtil.calculateDiff(diffCallback, false) + matrixTimelineItems = newTimelineItems + diffResult.dispatchUpdatesTo(cacheInvalidator) + } + Timber.v("Time to apply diff on new list of ${newTimelineItems.size} items: $timeToDiff ms") + } + + private suspend fun buildAndCacheItem( + timelineItems: List, + index: Int + ): TimelineItem? { + val timelineItemState = + when (val currentTimelineItem = timelineItems[index]) { + is MatrixTimelineItem.Event -> eventItemFactory.create(currentTimelineItem, index, timelineItems) + is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem, index, timelineItems) + MatrixTimelineItem.Other -> null + } + timelineItemsCache[index] = timelineItemState + return timelineItemState + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index 1216765ee8..5abbcb1d00 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -27,7 +27,7 @@ sealed interface TimelineItem { val id: String ) : TimelineItem - data class MessageEvent( + data class Event( val id: EventId, val senderId: String, val senderDisplayName: String?, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/toHtmlDocument.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/toHtmlDocument.kt new file mode 100644 index 0000000000..199a6739b8 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/toHtmlDocument.kt @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.util + +import org.jsoup.Jsoup +import org.jsoup.nodes.Document +import org.matrix.rustcomponents.sdk.FormattedBody +import org.matrix.rustcomponents.sdk.MessageFormat + +fun FormattedBody.toHtmlDocument(): Document? { + return takeIf { it.format == MessageFormat.HTML }?.body?.let { formattedBody -> + Jsoup.parse(formattedBody) + } +} diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt index 9b0583d2d1..eec74e9e03 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt @@ -31,6 +31,6 @@ object MatrixModule { @Provides @SingleIn(AppScope::class) fun providesRustAuthenticationService(baseDirectory: File): AuthenticationService { - return AuthenticationService(baseDirectory.absolutePath) + return AuthenticationService(baseDirectory.absolutePath, null) } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt index 11ae71795d..7965a6698d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt @@ -158,6 +158,12 @@ internal class RustRoomSummaryDataSource( clear() addAll(diff.values.map { buildSummaryForRoomListEntry(it) }) } + SlidingSyncViewRoomsListDiff.Pop -> { + removeLastOrNull() + } + SlidingSyncViewRoomsListDiff.Clear -> { + clear() + } } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt index 348551835d..ebeb1d6eb0 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt @@ -27,7 +27,7 @@ class RoomMessageFactory { eventId = EventId(eventTimelineItem.eventId() ?: ""), body = eventTimelineItem.content().asMessage()?.body() ?: "", sender = UserId(eventTimelineItem.sender()), - originServerTs = eventTimelineItem.originServerTs()?.toLong() ?: 0L + originServerTs = eventTimelineItem.timestamp().toLong() ) } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt index 67ab8969b3..a4c6a1cc81 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt @@ -22,7 +22,6 @@ import org.matrix.rustcomponents.sdk.TimelineListener interface MatrixTimeline { var callback: Callback? - val hasMoreToLoad: Boolean interface Callback { fun onUpdatedTimelineItem(timelineItem: MatrixTimelineItem) = Unit @@ -30,7 +29,7 @@ interface MatrixTimeline { } fun timelineItems(): Flow> - suspend fun paginateBackwards(count: Int): Result + suspend fun paginateBackwards(requestSize: Int, untilNumberOfItems: Int): Result fun addListener(timelineListener: TimelineListener) fun initialize() fun dispose() diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt index 022988fd4f..35ad5ef7e5 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt @@ -18,15 +18,10 @@ package io.element.android.libraries.matrix.timeline import org.matrix.rustcomponents.sdk.EventTimelineItem import org.matrix.rustcomponents.sdk.TimelineItem -import org.matrix.rustcomponents.sdk.TimelineKey sealed interface MatrixTimelineItem { data class Event(val event: EventTimelineItem) : MatrixTimelineItem { - val uniqueId: String - get() = when (val eventKey = event.key()) { - is TimelineKey.TransactionId -> eventKey.txnId - is TimelineKey.EventId -> eventKey.eventId - } + val uniqueId: String = event.uniqueIdentifier() } object Virtual : MatrixTimelineItem diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt index 1f6722d823..d2a7c1d8be 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt @@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.timeline import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.room.RustMatrixRoom +import io.element.android.libraries.matrix.util.StoppableSpawnBag import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow @@ -26,14 +27,14 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.sample import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.matrix.rustcomponents.sdk.PaginationOutcome +import org.matrix.rustcomponents.sdk.PaginationOptions import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.SlidingSyncRoom import org.matrix.rustcomponents.sdk.TimelineChange import org.matrix.rustcomponents.sdk.TimelineDiff import org.matrix.rustcomponents.sdk.TimelineListener import timber.log.Timber -import java.util.Collections +import java.util.* class RustMatrixTimeline( private val matrixRoom: RustMatrixRoom, @@ -45,20 +46,16 @@ class RustMatrixTimeline( override var callback: MatrixTimeline.Callback? = null - private val paginationOutcome = MutableStateFlow(PaginationOutcome(true)) private val timelineItems: MutableStateFlow> = MutableStateFlow(emptyList()) + private val listenerTokens = StoppableSpawnBag() + @OptIn(FlowPreview::class) override fun timelineItems(): Flow> { return timelineItems.sample(50) } - override val hasMoreToLoad: Boolean - get() { - return paginationOutcome.value.moreMessages - } - private fun MutableList.applyDiff(diff: TimelineDiff) { when (diff.change()) { TimelineChange.PUSH -> { @@ -107,12 +104,13 @@ class RustMatrixTimeline( } } - override suspend fun paginateBackwards(count: Int): Result = withContext(coroutineDispatchers.io) { - if (!paginationOutcome.value.moreMessages) { - return@withContext Result.failure(IllegalStateException("no more message")) - } + override suspend fun paginateBackwards(requestSize: Int, untilNumberOfItems: Int): Result = withContext(coroutineDispatchers.io) { runCatching { - paginationOutcome.value = room.paginateBackwards(count.toUShort()) + val paginationOptions = PaginationOptions.UntilNumItems( + eventLimit = requestSize.toUShort(), + items = untilNumberOfItems.toUShort() + ) + room.paginateBackwards(paginationOptions) } } @@ -124,7 +122,7 @@ class RustMatrixTimeline( } override fun addListener(timelineListener: TimelineListener) { - slidingSyncRoom.addTimelineListener(timelineListener) + listenerTokens += slidingSyncRoom.subscribeAndAddTimelineListener(timelineListener, settings = null) } override fun initialize() { @@ -132,7 +130,7 @@ class RustMatrixTimeline( } override fun dispose() { - slidingSyncRoom.removeTimeline() + listenerTokens.dispose() } /** diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/StoppableSpawnBag.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/StoppableSpawnBag.kt new file mode 100644 index 0000000000..a84833c54d --- /dev/null +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/StoppableSpawnBag.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.matrix.util + +import org.matrix.rustcomponents.sdk.StoppableSpawn +import java.util.concurrent.CopyOnWriteArraySet + +class StoppableSpawnBag(private val tokens: MutableSet = CopyOnWriteArraySet()) : Set by tokens { + + operator fun plusAssign(stoppableSpawn: StoppableSpawn?) { + if (stoppableSpawn == null) return + tokens += stoppableSpawn + } + + fun dispose() { + tokens.forEach { it.cancel() } + tokens.clear() + } +} diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt index 60fa211b1d..a4e00897ec 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt @@ -29,14 +29,11 @@ class FakeMatrixTimeline : MatrixTimeline { get() = null set(value) {} - override val hasMoreToLoad: Boolean - get() = true - override fun timelineItems(): Flow> { return emptyFlow() } - override suspend fun paginateBackwards(count: Int): Result { + override suspend fun paginateBackwards(requestSize: Int, untilNumberOfItems: Int): Result { return Result.success(Unit) } From 6e6d2141b9261435da9d4b7921a283ae4b2eeac7 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 3 Feb 2023 14:41:24 +0100 Subject: [PATCH 02/25] Updates on rust: makes SS working but slow. Also branch some timeline virtual items. --- .../features/messages/MessagesPresenter.kt | 2 +- .../actionlist/ActionListPresenter.kt | 2 +- .../messages/timeline/TimelineView.kt | 44 +++++++---- .../components/TimelineItemEncryptedView.kt | 2 +- .../components/TimelineItemImageView.kt | 2 +- .../components/TimelineItemRedactedView.kt | 2 +- .../components/TimelineItemTextView.kt | 2 +- .../components/TimelineItemUnknownView.kt | 2 +- .../factories/TimelineItemsFactory.kt | 3 +- .../{ => event}/TimelineItemContentFactory.kt | 6 +- ...eItemContentFailedToParseMessageFactory.kt | 8 +- ...ineItemContentFailedToParseStateFactory.kt | 8 +- .../TimelineItemContentMessageFactory.kt | 16 ++-- ...TimelineItemContentProfileChangeFactory.kt | 9 +-- .../TimelineItemContentRedactedFactory.kt | 8 +- ...imelineItemContentRoomMembershipFactory.kt | 8 +- .../TimelineItemContentStateFactory.kt | 8 +- .../TimelineItemContentStickerFactory.kt | 8 +- .../TimelineItemContentUTDFactory.kt | 8 +- .../{ => event}/TimelineItemEventFactory.kt | 2 +- .../TimelineItemDaySeparatorFactory.kt} | 19 ++--- .../virtual/TimelineItemVirtualFactory.kt | 52 +++++++++++++ .../messages/timeline/model/TimelineItem.kt | 8 +- .../TimelineItemEmoteContent.kt | 2 +- .../TimelineItemEncryptedContent.kt | 4 +- .../TimelineItemEventContent.kt} | 6 +- .../TimelineItemImageContent.kt | 4 +- .../TimelineItemNoticeContent.kt | 2 +- .../TimelineItemRedactedContent.kt | 4 +- .../TimelineItemTextBasedContent.kt | 4 +- .../TimelineItemTextContent.kt | 2 +- .../TimelineItemUnknownContent.kt | 4 +- .../virtual/TimelineItemDaySeparatorModel.kt | 21 ++++++ .../model/virtual/TimelineItemLoadingModel.kt | 19 +++++ .../virtual/TimelineItemReadMarkerModel.kt | 19 +++++ .../virtual/TimelineItemTimelineStartModel.kt | 19 +++++ .../TimelineItemUnknownVirtualModel.kt | 19 +++++ .../model/virtual/TimelineItemVirtualModel.kt | 22 ++++++ .../libraries/matrix/RustMatrixClient.kt | 32 ++++++-- .../matrix/timeline/MatrixTimelineItem.kt | 5 +- .../matrix/tracing/TracingConfiguration.kt | 73 +++++++++++-------- 41 files changed, 352 insertions(+), 138 deletions(-) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentFactory.kt (93%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentFailedToParseMessageFactory.kt (75%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentFailedToParseStateFactory.kt (75%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentMessageFactory.kt (78%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentProfileChangeFactory.kt (70%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentRedactedFactory.kt (75%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentRoomMembershipFactory.kt (76%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentStateFactory.kt (76%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentStickerFactory.kt (76%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemContentUTDFactory.kt (75%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{ => event}/TimelineItemEventFactory.kt (98%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/{TimelineItemVirtualFactory.kt => virtual/TimelineItemDaySeparatorFactory.kt} (54%) create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemEmoteContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemEncryptedContent.kt (88%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content/TimelineItemContent.kt => event/TimelineItemEventContent.kt} (90%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemImageContent.kt (89%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemNoticeContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemRedactedContent.kt (82%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemTextBasedContent.kt (83%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemTextContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/{content => event}/TimelineItemUnknownContent.kt (82%) create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemLoadingModel.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemReadMarkerModel.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemTimelineStartModel.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemVirtualModel.kt diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt index ccfb58b5f8..502ac0ecf1 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt @@ -32,7 +32,7 @@ import io.element.android.features.messages.textcomposer.MessageComposerState import io.element.android.features.messages.timeline.TimelineEvents import io.element.android.features.messages.timeline.TimelinePresenter import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt index f02f21bcbc..194a7f103e 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt @@ -23,7 +23,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import io.element.android.features.messages.actionlist.model.TimelineItemAction import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent import io.element.android.libraries.architecture.Presenter import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index d408656c03..730fe0c02e 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -70,13 +70,14 @@ import io.element.android.features.messages.timeline.model.MessagesItemGroupPosi import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.timeline.model.TimelineItemGroupPositionProvider import io.element.android.features.messages.timeline.model.TimelineItemReactions -import io.element.android.features.messages.timeline.model.content.MessagesTimelineItemContentProvider -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent -import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.MessagesTimelineItemContentProvider +import io.element.android.features.messages.timeline.model.event.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.virtual.TimelineItemLoadingModel import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.utils.PairCombinedPreviewParameter @@ -158,8 +159,10 @@ fun TimelineItemRow( onLongClick: (TimelineItem.Event) -> Unit, ) { when (timelineItem) { - is TimelineItem.Virtual -> return - is TimelineItem.Event -> MessageEventRow( + is TimelineItem.Virtual -> TimelineItemVirtualRow( + virtual = timelineItem + ) + is TimelineItem.Event -> TimelineItemEventRow( event = timelineItem, isHighlighted = isHighlighted, onClick = { onClick(timelineItem) }, @@ -169,7 +172,18 @@ fun TimelineItemRow( } @Composable -fun MessageEventRow( +fun TimelineItemVirtualRow( + virtual: TimelineItem.Virtual, + modifier: Modifier = Modifier +) { + when (virtual.model) { + is TimelineItemLoadingModel -> TimelineLoadingMoreIndicator(modifier) + else -> return + } +} + +@Composable +fun TimelineItemEventRow( event: TimelineItem.Event, isHighlighted: Boolean, onClick: () -> Unit, @@ -338,9 +352,9 @@ internal fun BoxScope.TimelineScrollHelper( } @Composable -internal fun TimelineLoadingMoreIndicator() { +internal fun TimelineLoadingMoreIndicator(modifier: Modifier) { Box( - Modifier + modifier .fillMaxWidth() .wrapContentHeight() .padding(8.dp), @@ -354,7 +368,7 @@ internal fun TimelineLoadingMoreIndicator() { } class MessagesItemGroupPositionToMessagesTimelineItemContentProvider : - PairCombinedPreviewParameter( + PairCombinedPreviewParameter( TimelineItemGroupPositionProvider() to MessagesTimelineItemContentProvider() ) @@ -363,7 +377,7 @@ class MessagesItemGroupPositionToMessagesTimelineItemContentProvider : @Composable fun TimelineItemsPreview( @PreviewParameter(MessagesTimelineItemContentProvider::class) - content: TimelineItemContent + content: TimelineItemEventContent ) { val timelineItems = persistentListOf( // 3 items (First Middle Last) with isMine = false @@ -410,7 +424,7 @@ fun TimelineItemsPreview( private fun createMessageEvent( isMine: Boolean, - content: TimelineItemContent, + content: TimelineItemEventContent, groupPosition: MessagesItemGroupPosition ): TimelineItem { return TimelineItem.Event( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt index 9b2be79685..3ad0d416f0 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt @@ -20,7 +20,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Warning import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEncryptedContent @Composable fun TimelineItemEncryptedView( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt index e6548a71e8..583986f3db 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import coil.compose.AsyncImage import coil.request.ImageRequest -import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.event.TimelineItemImageContent @Composable fun TimelineItemImageView( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt index f752f88c4a..923fec3fa4 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt @@ -20,7 +20,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent @Composable fun TimelineItemRedactedView( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt index ad1bb5edb9..31a2749686 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.core.text.util.LinkifyCompat import io.element.android.features.messages.timeline.components.html.HtmlDocument -import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent import io.element.android.libraries.designsystem.LinkColor import io.element.android.libraries.designsystem.components.ClickableLinkText diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt index 396bb19cb6..44629d61d0 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt @@ -20,7 +20,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent @Composable fun TimelineItemUnknownView( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt index 2f94967c3f..d4c4701193 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemsFactory.kt @@ -19,11 +19,12 @@ package io.element.android.features.messages.timeline.factories import androidx.recyclerview.widget.DiffUtil import io.element.android.features.messages.timeline.diff.CacheInvalidator import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback +import io.element.android.features.messages.timeline.factories.event.TimelineItemEventFactory +import io.element.android.features.messages.timeline.factories.virtual.TimelineItemVirtualFactory import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.timeline.util.invalidateLast import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.matrix.timeline.MatrixTimelineItem -import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFactory.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFactory.kt index a8c9ce9db0..121e5e38e8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFactory.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject @@ -34,7 +34,7 @@ class TimelineItemContentFactory @Inject constructor( private val failedToParseStateFactory: TimelineItemContentFailedToParseStateFactory ) { - fun create(itemContent: RustTimelineItemContent): TimelineItemContent { + fun create(itemContent: RustTimelineItemContent): TimelineItemEventContent { return when (val kind = itemContent.kind()) { is TimelineItemContentKind.Message -> messageFactory.create(itemContent.asMessage()) is TimelineItemContentKind.RedactedMessage -> redactedMessageFactory.create(kind) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt similarity index 75% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt index 382bc0d84a..5839cd06da 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseMessageFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentFailedToParseMessageFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.FailedToParseMessageLike): TimelineItemContent { + fun create(kind: TimelineItemContentKind.FailedToParseMessageLike): TimelineItemEventContent { return TimelineItemUnknownContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt similarity index 75% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt index 57d25673ab..a64950a77f 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentFailedToParseStateFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentFailedToParseStateFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.FailedToParseState): TimelineItemContent { + fun create(kind: TimelineItemContentKind.FailedToParseState): TimelineItemEventContent { return TimelineItemUnknownContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentMessageFactory.kt similarity index 78% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentMessageFactory.kt index 5ac1dec13b..ce38a9e96f 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentMessageFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentMessageFactory.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemEmoteContent -import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.features.messages.timeline.model.content.TimelineItemNoticeContent -import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEmoteContent +import io.element.android.features.messages.timeline.model.event.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.event.TimelineItemNoticeContent +import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import io.element.android.features.messages.timeline.util.toHtmlDocument import io.element.android.libraries.matrix.media.MediaResolver import org.matrix.rustcomponents.sdk.Message @@ -30,7 +30,7 @@ import javax.inject.Inject class TimelineItemContentMessageFactory @Inject constructor() { - fun create(contentAsMessage: Message?): TimelineItemContent { + fun create(contentAsMessage: Message?): TimelineItemEventContent { return when (val messageType = contentAsMessage?.msgtype()) { is MessageType.Emote -> TimelineItemEmoteContent( body = messageType.content.body, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt similarity index 70% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt index 40027de1b4..6f775ac80f 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentProfileChangeFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt @@ -14,17 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentProfileChangeFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.ProfileChange): TimelineItemContent { + fun create(kind: TimelineItemContentKind.ProfileChange): TimelineItemEventContent { return TimelineItemUnknownContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentRedactedFactory.kt similarity index 75% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentRedactedFactory.kt index 3bb8550071..4d6b9257a3 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRedactedFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentRedactedFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentRedactedFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.RedactedMessage): TimelineItemContent { + fun create(kind: TimelineItemContentKind.RedactedMessage): TimelineItemEventContent { return TimelineItemRedactedContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt similarity index 76% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt index e2dcfeea19..1764087a2d 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentRoomMembershipFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentRoomMembershipFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.RoomMembership): TimelineItemContent { + fun create(kind: TimelineItemContentKind.RoomMembership): TimelineItemEventContent { return TimelineItemUnknownContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentStateFactory.kt similarity index 76% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentStateFactory.kt index abfa405ecd..176a540e00 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStateFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentStateFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentStateFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.State): TimelineItemContent { + fun create(kind: TimelineItemContentKind.State): TimelineItemEventContent { return TimelineItemUnknownContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentStickerFactory.kt similarity index 76% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentStickerFactory.kt index d69ea61341..8e8a81ccf5 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentStickerFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentStickerFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentStickerFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.Sticker): TimelineItemContent { + fun create(kind: TimelineItemContentKind.Sticker): TimelineItemEventContent { return TimelineItemUnknownContent } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentUTDFactory.kt similarity index 75% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentUTDFactory.kt index 4f2285a402..77d9dcfefd 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemContentUTDFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemContentUTDFactory.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event -import io.element.android.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEncryptedContent import org.matrix.rustcomponents.sdk.TimelineItemContentKind import javax.inject.Inject class TimelineItemContentUTDFactory @Inject constructor() { - fun create(kind: TimelineItemContentKind.UnableToDecrypt): TimelineItemContent { + fun create(kind: TimelineItemContentKind.UnableToDecrypt): TimelineItemEventContent { return TimelineItemEncryptedContent(kind.msg) } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt similarity index 98% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt index c49b007a43..67a9be5698 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemEventFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.event import io.element.android.features.messages.timeline.model.AggregatedReaction import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt similarity index 54% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt index b0f4cc3bbb..5bb213b617 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/TimelineItemVirtualFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt @@ -14,21 +14,18 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.factories +package io.element.android.features.messages.timeline.factories.virtual -import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel +import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel +import org.matrix.rustcomponents.sdk.VirtualTimelineItem import javax.inject.Inject -class TimelineItemVirtualFactory @Inject constructor() { +class TimelineItemDaySeparatorFactory @Inject constructor() { - suspend fun create( - currentTimelineItem: MatrixTimelineItem.Virtual, - index: Int, - timelineItems: List, - ): TimelineItem.Virtual { - return TimelineItem.Virtual( - id = "virtual_item_$index" + fun create(virtualItem: VirtualTimelineItem.DayDivider): TimelineItemVirtualModel { + return TimelineItemDaySeparatorModel( + day = "${virtualItem.ts}" ) } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt new file mode 100644 index 0000000000..1a5f094d06 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.factories.virtual + +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.virtual.TimelineItemLoadingModel +import io.element.android.features.messages.timeline.model.virtual.TimelineItemReadMarkerModel +import io.element.android.features.messages.timeline.model.virtual.TimelineItemUnknownVirtualModel +import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import org.matrix.rustcomponents.sdk.VirtualTimelineItem +import javax.inject.Inject + +class TimelineItemVirtualFactory @Inject constructor( + private val daySeparatorFactory: TimelineItemDaySeparatorFactory, +) { + + suspend fun create( + currentTimelineItem: MatrixTimelineItem.Virtual, + index: Int, + timelineItems: List, + ): TimelineItem.Virtual { + return TimelineItem.Virtual( + id = "virtual_item_$index", + model = currentTimelineItem.computeModel(index) + ) + } + + private fun MatrixTimelineItem.Virtual.computeModel(index: Int): TimelineItemVirtualModel { + return when (val inner = virtual) { + is VirtualTimelineItem.DayDivider -> daySeparatorFactory.create(inner) + is VirtualTimelineItem.ReadMarker -> TimelineItemReadMarkerModel + is VirtualTimelineItem.LoadingIndicator -> TimelineItemLoadingModel + is VirtualTimelineItem.TimelineStart -> TimelineItemReadMarkerModel + else -> TimelineItemUnknownVirtualModel + } + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index 5abbcb1d00..4d097ebcbc 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -17,14 +17,16 @@ package io.element.android.features.messages.timeline.model import androidx.compose.runtime.Immutable -import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent +import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.matrix.core.EventId @Immutable sealed interface TimelineItem { data class Virtual( - val id: String + val id: String, + val model: TimelineItemVirtualModel ) : TimelineItem data class Event( @@ -32,7 +34,7 @@ sealed interface TimelineItem { val senderId: String, val senderDisplayName: String?, val senderAvatar: AvatarData, - val content: TimelineItemContent, + val content: TimelineItemEventContent, val sentTime: String = "", val isMine: Boolean = false, val groupPosition: MessagesItemGroupPosition = MessagesItemGroupPosition.None, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEmoteContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEmoteContent.kt index c307b70edb..e6b4c9b439 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEmoteContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEncryptedContent.kt similarity index 88% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEncryptedContent.kt index 937b4d32f6..a57378dfd8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEncryptedContent.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import org.matrix.rustcomponents.sdk.EncryptedMessage data class TimelineItemEncryptedContent( val encryptedMessage: EncryptedMessage -) : TimelineItemContent +) : TimelineItemEventContent diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt index 973a4343a3..1924e0830e 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import androidx.compose.ui.tooling.preview.PreviewParameterProvider import org.matrix.rustcomponents.sdk.EncryptedMessage -sealed interface TimelineItemContent +sealed interface TimelineItemEventContent -class MessagesTimelineItemContentProvider : PreviewParameterProvider { +class MessagesTimelineItemContentProvider : PreviewParameterProvider { override val values = sequenceOf( TimelineItemEmoteContent( body = "Emote", diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemImageContent.kt similarity index 89% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemImageContent.kt index ef1c8d85d5..92912d952a 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemImageContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import io.element.android.libraries.matrix.media.MediaResolver @@ -23,4 +23,4 @@ data class TimelineItemImageContent( val imageMeta: MediaResolver.Meta, val blurhash: String?, val aspectRatio: Float -) : TimelineItemContent +) : TimelineItemEventContent diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemNoticeContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemNoticeContent.kt index 330ef1ff95..0b6ca6c26d 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemNoticeContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemRedactedContent.kt similarity index 82% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemRedactedContent.kt index 6dd395f338..4ddae9be32 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemRedactedContent.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event -object TimelineItemRedactedContent : TimelineItemContent +object TimelineItemRedactedContent : TimelineItemEventContent diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemTextBasedContent.kt similarity index 83% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemTextBasedContent.kt index 6146a5493f..6ca23a4e16 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemTextBasedContent.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import org.jsoup.nodes.Document -sealed interface TimelineItemTextBasedContent : TimelineItemContent { +sealed interface TimelineItemTextBasedContent : TimelineItemEventContent { val body: String val htmlDocument: Document? } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemTextContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemTextContent.kt index abb3140b71..f35941b5bb 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemTextContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemUnknownContent.kt similarity index 82% rename from features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemUnknownContent.kt index e2e0c5a14a..4b435bde69 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemUnknownContent.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.event -object TimelineItemUnknownContent : TimelineItemContent +object TimelineItemUnknownContent : TimelineItemEventContent diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt new file mode 100644 index 0000000000..e169033df3 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.model.virtual + +data class TimelineItemDaySeparatorModel( + val day: String +) : TimelineItemVirtualModel diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemLoadingModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemLoadingModel.kt new file mode 100644 index 0000000000..334fbd09ed --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemLoadingModel.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.model.virtual + +object TimelineItemLoadingModel : TimelineItemVirtualModel diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemReadMarkerModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemReadMarkerModel.kt new file mode 100644 index 0000000000..ccc154acf5 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemReadMarkerModel.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.model.virtual + +object TimelineItemReadMarkerModel : TimelineItemVirtualModel diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemTimelineStartModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemTimelineStartModel.kt new file mode 100644 index 0000000000..a7493353f6 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemTimelineStartModel.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.model.virtual + +object TimelineItemTimelineStartModel : TimelineItemVirtualModel diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt new file mode 100644 index 0000000000..dac0724dce --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.model.virtual + +object TimelineItemUnknownVirtualModel : TimelineItemVirtualModel diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemVirtualModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemVirtualModel.kt new file mode 100644 index 0000000000..9970375daa --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemVirtualModel.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.model.virtual + +import androidx.compose.runtime.Immutable + +@Immutable +sealed interface TimelineItemVirtualModel diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index c6b9bef6e0..fb53d66b48 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt @@ -36,6 +36,7 @@ import org.matrix.rustcomponents.sdk.ClientDelegate import org.matrix.rustcomponents.sdk.MediaSource import org.matrix.rustcomponents.sdk.RequiredState import org.matrix.rustcomponents.sdk.SlidingSyncMode +import org.matrix.rustcomponents.sdk.SlidingSyncRequestListFilters import org.matrix.rustcomponents.sdk.SlidingSyncViewBuilder import org.matrix.rustcomponents.sdk.StoppableSpawn import timber.log.Timber @@ -66,7 +67,22 @@ internal class RustMatrixClient internal constructor( } } - private val slidingSyncView = SlidingSyncViewBuilder() + private val slidingSyncFilters by lazy { + SlidingSyncRequestListFilters( + isDm = null, + spaces = emptyList(), + isEncrypted = null, + isInvite = false, + isTombstoned = false, + roomTypes = emptyList(), + notRoomTypes = listOf("m.space"), + roomNameLike = null, + tags = emptyList(), + notTags = emptyList() + ) + } + + private val visibleRoomsView = SlidingSyncViewBuilder() .timelineLimit(limit = 10u) .requiredState( requiredState = listOf( @@ -74,17 +90,19 @@ internal class RustMatrixClient internal constructor( RequiredState(key = "m.room.encryption", value = ""), ) ) - .name(name = "HomeScreenView") + .filters(slidingSyncFilters) + .name(name = "CurrentlyVisibleRooms") + .sendUpdatesForItems(true) .syncMode(mode = SlidingSyncMode.SELECTIVE) - .addRange(0u, 30u) + .addRange(0u, 20u) .build() private val slidingSync = client .slidingSync() - .homeserver("https://slidingsync.lab.element.dev") + .homeserver("https://slidingsync.lab.matrix.org") .withCommonExtensions() - // .coldCache("ElementX") - .addView(slidingSyncView) + .coldCache("ElementX") + .addView(visibleRoomsView) .build() private val slidingSyncObserverProxy = SlidingSyncObserverProxy(coroutineScope) @@ -92,7 +110,7 @@ internal class RustMatrixClient internal constructor( RustRoomSummaryDataSource( slidingSyncObserverProxy.updateSummaryFlow, slidingSync, - slidingSyncView, + visibleRoomsView, dispatchers, ::onRestartSync ) diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt index 35ad5ef7e5..19a7dfba79 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt @@ -18,13 +18,14 @@ package io.element.android.libraries.matrix.timeline import org.matrix.rustcomponents.sdk.EventTimelineItem import org.matrix.rustcomponents.sdk.TimelineItem +import org.matrix.rustcomponents.sdk.VirtualTimelineItem sealed interface MatrixTimelineItem { data class Event(val event: EventTimelineItem) : MatrixTimelineItem { val uniqueId: String = event.uniqueIdentifier() } - object Virtual : MatrixTimelineItem + data class Virtual(val virtual: VirtualTimelineItem) : MatrixTimelineItem object Other : MatrixTimelineItem } @@ -35,7 +36,7 @@ fun TimelineItem.asMatrixTimelineItem(): MatrixTimelineItem { } val asVirtual = asVirtual() if (asVirtual != null) { - return MatrixTimelineItem.Virtual + return MatrixTimelineItem.Virtual(asVirtual) } return MatrixTimelineItem.Other } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt index 9c7dc1632d..7adde7e524 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt @@ -17,48 +17,59 @@ package io.element.android.libraries.matrix.tracing data class TracingConfiguration( - val common: LogLevel = LogLevel.Warn, - val targets: Map = emptyMap() + val overrides: Map = emptyMap() ) { - val filter = "$common,${ - targets.map { "${it.key.filter}=${it.value.filter}" }.joinToString(separator = ",") - }" + private val targets = mapOf( + Target.Common to LogLevel.Warn, + Target.Hyper to LogLevel.Warn, + Target.Sled to LogLevel.Warn, + Target.MatrixSdk.Sled to LogLevel.Warn, + Target.MatrixSdk.HttpClient to LogLevel.Trace, + Target.MatrixSdk.SlidingSync to LogLevel.Trace, + Target.MatrixSdk.BaseSlidingSync to LogLevel.Trace + ) - sealed class Target(open val filter: String) { - object Hyper : Target("hyper") - object Sled : Target("sled") - sealed class MatrixSdk(override val filter: String) : Target(filter) { - object Root : MatrixSdk("matrix_sdk") - object Sled : MatrixSdk("matrix_sdk_sled") - object FFI : MatrixSdk("matrix_sdk_ffi") - object HttpClient : MatrixSdk("matrix_sdk::http_client") - object UniffiAPI : MatrixSdk("matrix_sdk_ffi::uniffi_api") - object SlidingSync : MatrixSdk("matrix_sdk::sliding_sync") - object BaseSlidingSync : MatrixSdk("matrix_sdk_base::sliding_sync") + val filter: String + get() { + val newTargets = HashMap(targets) + overrides.forEach { (target, logLevel) -> + newTargets[target] = logLevel + } + return newTargets.map { "${it.key.filter}=${it.value.filter}" }.joinToString(separator = ",") } - } +} - sealed class LogLevel(val filter: String) { - object Warn : LogLevel("warn") - object Trace : LogLevel("trace") - object Info : LogLevel("info") - object Debug : LogLevel("debug") - object Error : LogLevel("error") +sealed class Target(open val filter: String) { + object Common : Target("common") + object Hyper : Target("hyper") + object Sled : Target("sled") + sealed class MatrixSdk(override val filter: String) : Target(filter) { + object Root : MatrixSdk("matrix_sdk") + object Sled : MatrixSdk("matrix_sdk_sled") + object FFI : MatrixSdk("matrix_sdk_ffi") + object HttpClient : MatrixSdk("matrix_sdk::http_client") + object UniffiAPI : MatrixSdk("matrix_sdk_ffi::uniffi_api") + object SlidingSync : MatrixSdk("matrix_sdk::sliding_sync") + object BaseSlidingSync : MatrixSdk("matrix_sdk_base::sliding_sync") } } +sealed class LogLevel(val filter: String) { + object Warn : LogLevel("warn") + object Trace : LogLevel("trace") + object Info : LogLevel("info") + object Debug : LogLevel("debug") + object Error : LogLevel("error") +} + fun setupTracing(tracingConfiguration: TracingConfiguration) { org.matrix.rustcomponents.sdk.setupTracing(tracingConfiguration.filter) } object TracingConfigurations { - val release = TracingConfiguration(common = TracingConfiguration.LogLevel.Info) - val debug = TracingConfiguration() - val full = TracingConfiguration( - common = TracingConfiguration.LogLevel.Info, - targets = mapOf( - TracingConfiguration.Target.Sled to TracingConfiguration.LogLevel.Warn - ) - ) + val release = TracingConfiguration(overrides = mapOf(Target.Common to LogLevel.Info)) + val debug = TracingConfiguration(overrides = mapOf(Target.Common to LogLevel.Info)) + + fun custom(overrides: Map) = TracingConfiguration(overrides) } From ce1c903dddb3a6a6fc7ec8fb5545cbfea40d8c0d Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 6 Feb 2023 20:19:00 +0100 Subject: [PATCH 03/25] Timeline : Handle day separator --- .../messages/timeline/TimelineView.kt | 21 ++------- .../virtual/TimelineItemDaySeparatorView.kt | 46 +++++++++++++++++++ .../TimelineItemLoadingMoreIndicator.kt | 44 ++++++++++++++++++ .../TimelineItemDaySeparatorFactory.kt | 18 +++++++- .../virtual/TimelineItemDaySeparatorModel.kt | 2 +- 5 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemDaySeparatorView.kt create mode 100644 features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemLoadingMoreIndicator.kt diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index 730fe0c02e..f27ae8eb51 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -39,7 +39,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowDownward -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -65,6 +64,8 @@ import io.element.android.features.messages.timeline.components.TimelineItemReac import io.element.android.features.messages.timeline.components.TimelineItemRedactedView import io.element.android.features.messages.timeline.components.TimelineItemTextView import io.element.android.features.messages.timeline.components.TimelineItemUnknownView +import io.element.android.features.messages.timeline.components.virtual.TimelineItemDaySeparatorView +import io.element.android.features.messages.timeline.components.virtual.TimelineLoadingMoreIndicator import io.element.android.features.messages.timeline.model.AggregatedReaction import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition import io.element.android.features.messages.timeline.model.TimelineItem @@ -77,6 +78,7 @@ import io.element.android.features.messages.timeline.model.event.TimelineItemIma import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel import io.element.android.features.messages.timeline.model.virtual.TimelineItemLoadingModel import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData @@ -178,6 +180,7 @@ fun TimelineItemVirtualRow( ) { when (virtual.model) { is TimelineItemLoadingModel -> TimelineLoadingMoreIndicator(modifier) + is TimelineItemDaySeparatorModel -> TimelineItemDaySeparatorView(virtual.model, modifier) else -> return } } @@ -351,22 +354,6 @@ internal fun BoxScope.TimelineScrollHelper( } } -@Composable -internal fun TimelineLoadingMoreIndicator(modifier: Modifier) { - Box( - modifier - .fillMaxWidth() - .wrapContentHeight() - .padding(8.dp), - contentAlignment = Alignment.Center, - ) { - CircularProgressIndicator( - strokeWidth = 2.dp, - color = MaterialTheme.colorScheme.primary - ) - } -} - class MessagesItemGroupPositionToMessagesTimelineItemContentProvider : PairCombinedPreviewParameter( TimelineItemGroupPositionProvider() to MessagesTimelineItemContentProvider() diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemDaySeparatorView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemDaySeparatorView.kt new file mode 100644 index 0000000000..0c57c9e242 --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemDaySeparatorView.kt @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.components.virtual + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel + +@Composable +internal fun TimelineItemDaySeparatorView( + model: TimelineItemDaySeparatorModel, + modifier: Modifier = Modifier +) { + Box( + modifier + .fillMaxWidth() + .wrapContentHeight() + .padding(8.dp), + contentAlignment = Alignment.Center, + ) { + Text( + text = model.formattedDate + ) + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemLoadingMoreIndicator.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemLoadingMoreIndicator.kt new file mode 100644 index 0000000000..7588192c6e --- /dev/null +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/virtual/TimelineItemLoadingMoreIndicator.kt @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.timeline.components.virtual + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.material.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +internal fun TimelineLoadingMoreIndicator(modifier: Modifier = Modifier) { + Box( + modifier + .fillMaxWidth() + .wrapContentHeight() + .padding(8.dp), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator( + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.primary + ) + } +} diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt index 5bb213b617..00a36c06e5 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt @@ -18,14 +18,30 @@ package io.element.android.features.messages.timeline.factories.virtual import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel +import kotlinx.datetime.Instant +import kotlinx.datetime.TimeZone +import kotlinx.datetime.toJavaLocalDateTime +import kotlinx.datetime.toLocalDateTime import org.matrix.rustcomponents.sdk.VirtualTimelineItem +import java.time.format.DateTimeFormatter +import java.util.Locale import javax.inject.Inject class TimelineItemDaySeparatorFactory @Inject constructor() { + //TODO use proper formatter + private val locale: Locale = Locale.getDefault() + + private val dateWithYearFormatter: DateTimeFormatter by lazy { + val pattern = android.text.format.DateFormat.getBestDateTimePattern(locale, "dd.MM.yyyy") + DateTimeFormatter.ofPattern(pattern) + } + fun create(virtualItem: VirtualTimelineItem.DayDivider): TimelineItemVirtualModel { + val tsInstant = Instant.fromEpochMilliseconds(virtualItem.ts.toLong()) + val tsDateTime = tsInstant.toLocalDateTime(TimeZone.currentSystemDefault()) return TimelineItemDaySeparatorModel( - day = "${virtualItem.ts}" + formattedDate = dateWithYearFormatter.format(tsDateTime.toJavaLocalDateTime()) ) } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt index e169033df3..c6e762a235 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/virtual/TimelineItemDaySeparatorModel.kt @@ -17,5 +17,5 @@ package io.element.android.features.messages.timeline.model.virtual data class TimelineItemDaySeparatorModel( - val day: String + val formattedDate: String ) : TimelineItemVirtualModel From 0f6744ab7441503324ad0d303fadf2f372719abb Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 6 Feb 2023 20:52:42 +0100 Subject: [PATCH 04/25] Timeline: quickly integreate sender profile --- .../event/TimelineItemEventFactory.kt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt index 67a9be5698..af201d9a6c 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt @@ -26,6 +26,7 @@ import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.timeline.MatrixTimelineItem import kotlinx.collections.immutable.toImmutableList +import org.matrix.rustcomponents.sdk.ProfileTimelineDetails import javax.inject.Inject class TimelineItemEventFactory @Inject constructor( @@ -41,8 +42,22 @@ class TimelineItemEventFactory @Inject constructor( val currentSender = currentTimelineItem.event.sender() val groupPosition = computeGroupPosition(currentTimelineItem, timelineItems, index) - val senderDisplayName = room.userDisplayName(currentSender).getOrNull() - val senderAvatarUrl = room.userAvatarUrl(currentSender).getOrNull() + val senderDisplayName: String? + val senderAvatarUrl: String? + + when (val senderProfile = currentTimelineItem.event.senderProfile()) { + ProfileTimelineDetails.Unavailable, + ProfileTimelineDetails.Pending, + is ProfileTimelineDetails.Error -> { + senderDisplayName = null + senderAvatarUrl = null + } + is ProfileTimelineDetails.Ready -> { + senderDisplayName = senderProfile.displayName + senderAvatarUrl = senderProfile.avatarUrl + } + } + val senderAvatarData = AvatarData( name = senderDisplayName ?: currentSender, url = senderAvatarUrl, From e5bd96049eef7be00480ac4d81d7c0e4c08f7286 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 7 Feb 2023 19:47:49 +0100 Subject: [PATCH 05/25] Separate eventId and id for TimelineItem.Event --- .../android/features/messages/MessagesPresenter.kt | 9 ++++++--- .../android/features/messages/timeline/TimelineView.kt | 5 +++-- .../timeline/factories/event/TimelineItemEventFactory.kt | 4 ++-- .../features/messages/timeline/model/TimelineItem.kt | 3 ++- .../timeline/model/event/TimelineItemEventContent.kt | 2 ++ .../libraries/matrix/timeline/MatrixTimelineItem.kt | 2 ++ 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt index 502ac0ecf1..8096628a88 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt @@ -111,12 +111,14 @@ class MessagesPresenter @Inject constructor( } private suspend fun handleActionRedact(event: TimelineItem.Event) { - room.redactEvent(event.id) + if (event.eventId == null) return + room.redactEvent(event.eventId) } private fun handleActionEdit(targetEvent: TimelineItem.Event, composerState: MessageComposerState) { + if (targetEvent.eventId == null) return val composerMode = MessageComposerMode.Edit( - targetEvent.id, + targetEvent.eventId, (targetEvent.content as? TimelineItemTextBasedContent)?.body.orEmpty() ) composerState.eventSink( @@ -125,7 +127,8 @@ class MessagesPresenter @Inject constructor( } private fun handleActionReply(targetEvent: TimelineItem.Event, composerState: MessageComposerState) { - val composerMode = MessageComposerMode.Reply(targetEvent.safeSenderName, targetEvent.id, "") + if (targetEvent.eventId == null) return + val composerMode = MessageComposerMode.Reply(targetEvent.safeSenderName, targetEvent.eventId, "") composerState.eventSink( MessageComposerEvents.SetMode(composerMode) ) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index f27ae8eb51..b86e62b9a0 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -141,12 +141,13 @@ fun TimelineView( private fun TimelineItem.key(): String { return when (this) { - is TimelineItem.Event -> id.value + is TimelineItem.Event -> id is TimelineItem.Virtual -> id } } private fun TimelineItem.contentType(): Int { + // Todo optimize for each subtype return when (this) { is TimelineItem.Event -> 0 is TimelineItem.Virtual -> 1 @@ -415,7 +416,7 @@ private fun createMessageEvent( groupPosition: MessagesItemGroupPosition ): TimelineItem { return TimelineItem.Event( - id = EventId(Math.random().toString()), + id = Math.random().toString(), senderId = "senderId", senderAvatar = AvatarData("sender"), content = content, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt index af201d9a6c..fdd6bc35ab 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt @@ -22,7 +22,6 @@ import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.timeline.model.TimelineItemReactions import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.timeline.MatrixTimelineItem import kotlinx.collections.immutable.toImmutableList @@ -64,7 +63,8 @@ class TimelineItemEventFactory @Inject constructor( size = AvatarSize.SMALL ) return TimelineItem.Event( - id = EventId(currentTimelineItem.uniqueId), + id = currentTimelineItem.uniqueId, + eventId = currentTimelineItem.eventId, senderId = currentSender, senderDisplayName = senderDisplayName, senderAvatar = senderAvatarData, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index 4d097ebcbc..26b7caa59c 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -30,7 +30,8 @@ sealed interface TimelineItem { ) : TimelineItem data class Event( - val id: EventId, + val id: String, + val eventId: EventId? = null, val senderId: String, val senderDisplayName: String?, val senderAvatar: AvatarData, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt index 1924e0830e..c441f08ec8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/event/TimelineItemEventContent.kt @@ -16,9 +16,11 @@ package io.element.android.features.messages.timeline.model.event +import androidx.compose.runtime.Immutable import androidx.compose.ui.tooling.preview.PreviewParameterProvider import org.matrix.rustcomponents.sdk.EncryptedMessage +@Immutable sealed interface TimelineItemEventContent class MessagesTimelineItemContentProvider : PreviewParameterProvider { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt index 19a7dfba79..2d31d400a7 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt @@ -16,6 +16,7 @@ package io.element.android.libraries.matrix.timeline +import io.element.android.libraries.matrix.core.EventId import org.matrix.rustcomponents.sdk.EventTimelineItem import org.matrix.rustcomponents.sdk.TimelineItem import org.matrix.rustcomponents.sdk.VirtualTimelineItem @@ -23,6 +24,7 @@ import org.matrix.rustcomponents.sdk.VirtualTimelineItem sealed interface MatrixTimelineItem { data class Event(val event: EventTimelineItem) : MatrixTimelineItem { val uniqueId: String = event.uniqueIdentifier() + val eventId: EventId? = event.eventId()?.let { EventId(it) } } data class Virtual(val virtual: VirtualTimelineItem) : MatrixTimelineItem From 4ff6f5647196ae8c3ad91cc6e7f671c92b658bc0 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 7 Feb 2023 19:48:20 +0100 Subject: [PATCH 06/25] Fix slidingSync being slow --- .../libraries/matrix/RustMatrixClient.kt | 21 ++++++++++--------- .../matrix/room/RoomSummaryDataSource.kt | 9 +------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index fb53d66b48..514f818365 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt @@ -83,7 +83,7 @@ internal class RustMatrixClient internal constructor( } private val visibleRoomsView = SlidingSyncViewBuilder() - .timelineLimit(limit = 10u) + .timelineLimit(limit = 1u) .requiredState( requiredState = listOf( RequiredState(key = "m.room.avatar", value = ""), @@ -121,10 +121,13 @@ internal class RustMatrixClient internal constructor( init { client.setDelegate(clientDelegate) + roomSummaryDataSource.init() + slidingSync.setObserver(slidingSyncObserverProxy) } private fun onRestartSync() { - slidingSyncObserverToken = slidingSync.sync() + stopSync() + startSync() } override fun getRoom(roomId: RoomId): MatrixRoom? { @@ -139,28 +142,26 @@ internal class RustMatrixClient internal constructor( ) } + override fun roomSummaryDataSource(): RoomSummaryDataSource = roomSummaryDataSource + + override fun mediaResolver(): MediaResolver = mediaResolver + override fun startSync() { + if (client.isSoftLogout()) return if (isSyncing.compareAndSet(false, true)) { - roomSummaryDataSource.startSync() - slidingSync.setObserver(slidingSyncObserverProxy) slidingSyncObserverToken = slidingSync.sync() } } override fun stopSync() { if (isSyncing.compareAndSet(true, false)) { - roomSummaryDataSource.stopSync() - slidingSync.setObserver(null) slidingSyncObserverToken?.cancel() } } - override fun roomSummaryDataSource(): RoomSummaryDataSource = roomSummaryDataSource - - override fun mediaResolver(): MediaResolver = mediaResolver - override fun close() { stopSync() + slidingSync.setObserver(null) roomSummaryDataSource.close() client.setDelegate(null) } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt index 7965a6698d..3a787899b9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt @@ -20,16 +20,13 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.matrix.sync.roomListDiff import io.element.android.libraries.matrix.sync.state import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel -import kotlinx.coroutines.cancelChildren import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.flow.sample import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.matrix.rustcomponents.sdk.RoomListEntry @@ -62,7 +59,7 @@ internal class RustRoomSummaryDataSource( private val roomSummaries = MutableStateFlow>(emptyList()) private val state = MutableStateFlow(SlidingSyncState.COLD) - fun startSync() { + fun init() { coroutineScope.launch { updateRoomSummaries { addAll( @@ -91,10 +88,6 @@ internal class RustRoomSummaryDataSource( }.launchIn(coroutineScope) } - fun stopSync() { - coroutineScope.coroutineContext.cancelChildren() - } - override fun close() { coroutineScope.cancel() } From 2176aa8e5aa6ab49d8097be05c352803295e768c Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 7 Feb 2023 19:48:54 +0100 Subject: [PATCH 07/25] Change some tracing config but still not working properly (need investigation with rust team) --- .../matrix/tracing/TracingConfiguration.kt | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt index 7adde7e524..bc64e52770 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt @@ -16,32 +16,41 @@ package io.element.android.libraries.matrix.tracing +import timber.log.Timber + data class TracingConfiguration( val overrides: Map = emptyMap() ) { - private val targets = mapOf( - Target.Common to LogLevel.Warn, - Target.Hyper to LogLevel.Warn, - Target.Sled to LogLevel.Warn, - Target.MatrixSdk.Sled to LogLevel.Warn, + // Order should matters + private val targets = mutableMapOf( Target.MatrixSdk.HttpClient to LogLevel.Trace, Target.MatrixSdk.SlidingSync to LogLevel.Trace, - Target.MatrixSdk.BaseSlidingSync to LogLevel.Trace + Target.MatrixSdk.BaseSlidingSync to LogLevel.Trace, + Target.MatrixSdk.Root to LogLevel.Warn, + Target.MatrixSdk.Sled to LogLevel.Warn, + Target.Hyper to LogLevel.Warn, + Target.Sled to LogLevel.Warn, + Target.Common to LogLevel.Warn, ) val filter: String get() { - val newTargets = HashMap(targets) overrides.forEach { (target, logLevel) -> - newTargets[target] = logLevel + targets[target] = logLevel } - return newTargets.map { "${it.key.filter}=${it.value.filter}" }.joinToString(separator = ",") + return targets.map { + if (it.key.filter.isEmpty()) { + it.value.filter + } else { + "${it.key.filter}=${it.value.filter}" + } + }.joinToString(separator = ",") } } sealed class Target(open val filter: String) { - object Common : Target("common") + object Common : Target("") object Hyper : Target("hyper") object Sled : Target("sled") sealed class MatrixSdk(override val filter: String) : Target(filter) { @@ -64,7 +73,9 @@ sealed class LogLevel(val filter: String) { } fun setupTracing(tracingConfiguration: TracingConfiguration) { - org.matrix.rustcomponents.sdk.setupTracing(tracingConfiguration.filter) + val filter = tracingConfiguration.filter + Timber.v("Tracing config filter = $filter") + org.matrix.rustcomponents.sdk.setupTracing(filter) } object TracingConfigurations { From 9526eac81cf9f323c98bd519f058c91cbd825ab2 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 14 Feb 2023 20:13:47 +0100 Subject: [PATCH 08/25] Add fetchMembers and use it when init timeline (import again rust-sdk with fix on poisoning) --- .../messages/timeline/TimelineView.kt | 33 ++++++------ .../event/TimelineItemEventFactory.kt | 2 +- .../virtual/TimelineItemVirtualFactory.kt | 2 +- .../messages/timeline/model/TimelineItem.kt | 8 +++ .../libraries/matrix/RustMatrixClient.kt | 6 +-- .../libraries/matrix/di/MatrixModule.kt | 2 +- .../libraries/matrix/room/MatrixRoom.kt | 3 ++ .../matrix/room/RoomListenerFlows.kt | 40 -------------- .../libraries/matrix/room/RustMatrixRoom.kt | 35 +++++++----- .../matrix/session/PreferencesSessionStore.kt | 9 ++-- .../matrix/timeline/RustMatrixTimeline.kt | 53 +++++++++++-------- .../matrix/tracing/TracingConfiguration.kt | 16 +++--- .../matrixtest/room/FakeMatrixRoom.kt | 4 ++ 13 files changed, 106 insertions(+), 107 deletions(-) delete mode 100644 libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index b86e62b9a0..42eb3c938b 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -83,11 +83,11 @@ import io.element.android.features.messages.timeline.model.virtual.TimelineItemL import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.utils.PairCombinedPreviewParameter -import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch +import timber.log.Timber @Composable fun TimelineView( @@ -117,14 +117,6 @@ fun TimelineView( onLongClick = onMessageLongClicked ) } - /* - if (state.hasMoreToLoad) { - item { - TimelineLoadingMoreIndicator() - } - } - - */ } fun onReachedLoadMore() { @@ -165,12 +157,23 @@ fun TimelineItemRow( is TimelineItem.Virtual -> TimelineItemVirtualRow( virtual = timelineItem ) - is TimelineItem.Event -> TimelineItemEventRow( - event = timelineItem, - isHighlighted = isHighlighted, - onClick = { onClick(timelineItem) }, - onLongClick = { onLongClick(timelineItem) } - ) + is TimelineItem.Event -> { + + fun onClick() { + onClick(timelineItem) + } + + fun onLongClick() { + onLongClick(timelineItem) + } + + TimelineItemEventRow( + event = timelineItem, + isHighlighted = isHighlighted, + onClick = ::onClick, + onLongClick = ::onLongClick + ) + } } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt index fdd6bc35ab..850ec7fbd8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/event/TimelineItemEventFactory.kt @@ -33,7 +33,7 @@ class TimelineItemEventFactory @Inject constructor( private val contentFactory: TimelineItemContentFactory, ) { - suspend fun create( + fun create( currentTimelineItem: MatrixTimelineItem.Event, index: Int, timelineItems: List, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt index 1a5f094d06..e92171caa7 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemVirtualFactory.kt @@ -29,7 +29,7 @@ class TimelineItemVirtualFactory @Inject constructor( private val daySeparatorFactory: TimelineItemDaySeparatorFactory, ) { - suspend fun create( + fun create( currentTimelineItem: MatrixTimelineItem.Virtual, index: Int, timelineItems: List, diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index 26b7caa59c..3b1a22b13c 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -24,11 +24,19 @@ import io.element.android.libraries.matrix.core.EventId @Immutable sealed interface TimelineItem { + + fun identifier(): String = when(this){ + is Event -> id + is Virtual -> id + } + + @Immutable data class Virtual( val id: String, val model: TimelineItemVirtualModel ) : TimelineItem + @Immutable data class Event( val id: String, val eventId: EventId? = null, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index 514f818365..4e82840534 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt @@ -43,7 +43,7 @@ import timber.log.Timber import java.io.File import java.util.concurrent.atomic.AtomicBoolean -internal class RustMatrixClient internal constructor( +class RustMatrixClient constructor( private val client: Client, private val sessionStore: SessionStore, private val coroutineScope: CoroutineScope, @@ -132,11 +132,11 @@ internal class RustMatrixClient internal constructor( override fun getRoom(roomId: RoomId): MatrixRoom? { val slidingSyncRoom = slidingSync.getRoom(roomId.value) ?: return null - val room = slidingSyncRoom.fullRoom() ?: return null + val fullRoom = slidingSyncRoom.fullRoom() ?: return null return RustMatrixRoom( slidingSyncUpdateFlow = slidingSyncObserverProxy.updateSummaryFlow, slidingSyncRoom = slidingSyncRoom, - room = room, + innerRoom = fullRoom, coroutineScope = coroutineScope, coroutineDispatchers = dispatchers ) diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt index eec74e9e03..5cb654faf7 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt @@ -31,6 +31,6 @@ object MatrixModule { @Provides @SingleIn(AppScope::class) fun providesRustAuthenticationService(baseDirectory: File): AuthenticationService { - return AuthenticationService(baseDirectory.absolutePath, null) + return AuthenticationService(baseDirectory.absolutePath, null, null) } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt index 06c1fa0f76..76a2a91882 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt @@ -33,6 +33,8 @@ interface MatrixRoom { fun timeline(): MatrixTimeline + suspend fun fetchMembers(): Result + suspend fun userDisplayName(userId: String): Result suspend fun userAvatarUrl(userId: String): Result @@ -44,4 +46,5 @@ interface MatrixRoom { suspend fun replyMessage(eventId: EventId, message: String): Result suspend fun redactEvent(eventId: EventId, reason: String? = null): Result + } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt deleted file mode 100644 index e307bf0dad..0000000000 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2022 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.libraries.matrix.room - -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.channels.awaitClose -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.callbackFlow -import kotlinx.coroutines.launch -import org.matrix.rustcomponents.sdk.Room -import org.matrix.rustcomponents.sdk.TimelineDiff -import org.matrix.rustcomponents.sdk.TimelineListener - -fun Room.timelineDiff(scope: CoroutineScope): Flow = callbackFlow { - val listener = object : TimelineListener { - override fun onUpdate(update: TimelineDiff) { - scope.launch { - send(update) - } - } - } - addTimelineListener(listener) - awaitClose { - removeTimeline() - } -} diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt index c481b7c3d5..99c21931c4 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt @@ -32,11 +32,12 @@ import org.matrix.rustcomponents.sdk.SlidingSyncRoom import org.matrix.rustcomponents.sdk.UpdateSummary import org.matrix.rustcomponents.sdk.genTransactionId import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown +import timber.log.Timber class RustMatrixRoom( private val slidingSyncUpdateFlow: Flow, private val slidingSyncRoom: SlidingSyncRoom, - private val room: Room, + private val innerRoom: Room, private val coroutineScope: CoroutineScope, private val coroutineDispatchers: CoroutineDispatchers, ) : MatrixRoom { @@ -44,7 +45,7 @@ class RustMatrixRoom( override fun syncUpdateFlow(): Flow { return slidingSyncUpdateFlow .filter { - it.rooms.contains(room.id()) + it.rooms.contains(innerRoom.id()) } .map { System.currentTimeMillis() @@ -55,14 +56,14 @@ class RustMatrixRoom( override fun timeline(): MatrixTimeline { return RustMatrixTimeline( matrixRoom = this, - room = room, + innerRoom = innerRoom, slidingSyncRoom = slidingSyncRoom, coroutineScope = coroutineScope, coroutineDispatchers = coroutineDispatchers ) } - override val roomId = RoomId(room.id()) + override val roomId = RoomId(innerRoom.id()) override val name: String? get() { @@ -71,35 +72,41 @@ class RustMatrixRoom( override val bestName: String get() { - return name?.takeIf { it.isNotEmpty() } ?: room.id() + return name?.takeIf { it.isNotEmpty() } ?: innerRoom.id() } override val displayName: String get() { - return room.displayName() + return innerRoom.displayName() } override val topic: String? get() { - return room.topic() + return innerRoom.topic() } override val avatarUrl: String? get() { - return room.avatarUrl() + return innerRoom.avatarUrl() } + override suspend fun fetchMembers(): Result = withContext(coroutineDispatchers.io) { + runCatching { + innerRoom.fetchMembers() + } + } + override suspend fun userDisplayName(userId: String): Result = withContext(coroutineDispatchers.io) { runCatching { - room.memberDisplayName(userId) + innerRoom.memberDisplayName(userId) } } override suspend fun userAvatarUrl(userId: String): Result = withContext(coroutineDispatchers.io) { runCatching { - room.memberAvatarUrl(userId) + innerRoom.memberAvatarUrl(userId) } } @@ -107,7 +114,7 @@ class RustMatrixRoom( val transactionId = genTransactionId() val content = messageEventContentFromMarkdown(message) runCatching { - room.send(content, transactionId) + innerRoom.send(content, transactionId) } } @@ -115,7 +122,7 @@ class RustMatrixRoom( val transactionId = genTransactionId() // val content = messageEventContentFromMarkdown(message) runCatching { - room.edit(/* TODO use content */ message, originalEventId.value, transactionId) + innerRoom.edit(/* TODO use content */ message, originalEventId.value, transactionId) } } @@ -123,14 +130,14 @@ class RustMatrixRoom( val transactionId = genTransactionId() // val content = messageEventContentFromMarkdown(message) runCatching { - room.sendReply(/* TODO use content */ message, eventId.value, transactionId) + innerRoom.sendReply(/* TODO use content */ message, eventId.value, transactionId) } } override suspend fun redactEvent(eventId: EventId, reason: String?) = withContext(coroutineDispatchers.io) { val transactionId = genTransactionId() runCatching { - room.redact(eventId.value, reason, transactionId) + innerRoom.redact(eventId.value, reason, transactionId) } } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt index c1ad49c90a..9468937266 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt @@ -54,7 +54,8 @@ class PreferencesSessionStore @Inject constructor( val homeserverUrl: String, val isSoftLogout: Boolean, val refreshToken: String?, - val userId: String + val userId: String, + val slidingSyncProxy: String? ) private val store = context.dataStore @@ -73,7 +74,8 @@ class PreferencesSessionStore @Inject constructor( homeserverUrl = session.homeserverUrl, isSoftLogout = session.isSoftLogout, refreshToken = session.refreshToken, - userId = session.userId + userId = session.userId, + slidingSyncProxy = session.slidingSyncProxy ) val encodedSession = Json.encodeToString(sessionData) prefs[sessionKey] = encodedSession @@ -90,7 +92,8 @@ class PreferencesSessionStore @Inject constructor( homeserverUrl = sessionData.homeserverUrl, isSoftLogout = sessionData.isSoftLogout, refreshToken = sessionData.refreshToken, - userId = sessionData.userId + userId = sessionData.userId, + slidingSyncProxy = sessionData.slidingSyncProxy ) } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt index d2a7c1d8be..6bc1a7b0b9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt @@ -34,15 +34,25 @@ import org.matrix.rustcomponents.sdk.TimelineChange import org.matrix.rustcomponents.sdk.TimelineDiff import org.matrix.rustcomponents.sdk.TimelineListener import timber.log.Timber -import java.util.* +import java.util.Collections class RustMatrixTimeline( private val matrixRoom: RustMatrixRoom, - private val room: Room, + private val innerRoom: Room, private val slidingSyncRoom: SlidingSyncRoom, private val coroutineScope: CoroutineScope, private val coroutineDispatchers: CoroutineDispatchers, -) : TimelineListener, MatrixTimeline { +) : MatrixTimeline { + + private val innerTimelineListener = object : TimelineListener { + override fun onUpdate(update: TimelineDiff) { + coroutineScope.launch { + updateTimelineItems { + applyDiff(update) + } + } + } + } override var callback: MatrixTimeline.Callback? = null @@ -59,46 +69,38 @@ class RustMatrixTimeline( private fun MutableList.applyDiff(diff: TimelineDiff) { when (diff.change()) { TimelineChange.PUSH -> { - Timber.v("Apply push on list with size: $size") val item = diff.push()?.asMatrixTimelineItem() ?: return callback?.onPushedTimelineItem(item) add(item) } TimelineChange.UPDATE_AT -> { val updateAtData = diff.updateAt() ?: return - Timber.v("Apply $updateAtData on list with size: $size") val item = updateAtData.item.asMatrixTimelineItem() callback?.onUpdatedTimelineItem(item) set(updateAtData.index.toInt(), item) } TimelineChange.INSERT_AT -> { val insertAtData = diff.insertAt() ?: return - Timber.v("Apply $insertAtData on list with size: $size") val item = insertAtData.item.asMatrixTimelineItem() add(insertAtData.index.toInt(), item) } TimelineChange.MOVE -> { val moveData = diff.move() ?: return - Timber.v("Apply $moveData on list with size: $size") Collections.swap(this, moveData.oldIndex.toInt(), moveData.newIndex.toInt()) } TimelineChange.REMOVE_AT -> { val removeAtData = diff.removeAt() ?: return - Timber.v("Apply $removeAtData on list with size: $size") removeAt(removeAtData.toInt()) } TimelineChange.REPLACE -> { - Timber.v("Apply REPLACE on list with size: $size") clear() val items = diff.replace()?.map { it.asMatrixTimelineItem() } ?: return addAll(items) } TimelineChange.POP -> { - Timber.v("Apply POP on list with size: $size") removeLast() } TimelineChange.CLEAR -> { - Timber.v("Apply CLEAR on list with size: $size") clear() } } @@ -106,11 +108,16 @@ class RustMatrixTimeline( override suspend fun paginateBackwards(requestSize: Int, untilNumberOfItems: Int): Result = withContext(coroutineDispatchers.io) { runCatching { + Timber.v("Start back paginating for room ${slidingSyncRoom.roomId()} ") val paginationOptions = PaginationOptions.UntilNumItems( eventLimit = requestSize.toUShort(), items = untilNumberOfItems.toUShort() ) - room.paginateBackwards(paginationOptions) + innerRoom.paginateBackwards(paginationOptions) + }.onFailure { + Timber.e(it, "Fail to paginate for room ${slidingSyncRoom.roomId()}") + }.onSuccess { + Timber.v("Success back paginating for room ${slidingSyncRoom.roomId()}") } } @@ -122,14 +129,24 @@ class RustMatrixTimeline( } override fun addListener(timelineListener: TimelineListener) { - listenerTokens += slidingSyncRoom.subscribeAndAddTimelineListener(timelineListener, settings = null) + listenerTokens += slidingSyncRoom.subscribeAndAddTimelineListener(timelineListener, null) } override fun initialize() { - addListener(this) + Timber.v("Init timeline for room ${slidingSyncRoom.roomId()}") + coroutineScope.launch { + matrixRoom.fetchMembers() + .onFailure { + Timber.e(it, "Fail to fetch members for room ${slidingSyncRoom.roomId()}") + }.onSuccess { + Timber.v("Success fetching members for room ${slidingSyncRoom.roomId()}") + } + } + addListener(innerTimelineListener) } override fun dispose() { + Timber.v("Dispose timeline for room ${slidingSyncRoom.roomId()}") listenerTokens.dispose() } @@ -147,12 +164,4 @@ class RustMatrixTimeline( override suspend fun replyMessage(inReplyToEventId: EventId, message: String): Result { return matrixRoom.replyMessage(inReplyToEventId, message) } - - override fun onUpdate(update: TimelineDiff) { - coroutineScope.launch { - updateTimelineItems { - applyDiff(update) - } - } - } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt index bc64e52770..747b93f287 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt @@ -23,15 +23,16 @@ data class TracingConfiguration( ) { // Order should matters - private val targets = mutableMapOf( - Target.MatrixSdk.HttpClient to LogLevel.Trace, - Target.MatrixSdk.SlidingSync to LogLevel.Trace, - Target.MatrixSdk.BaseSlidingSync to LogLevel.Trace, - Target.MatrixSdk.Root to LogLevel.Warn, - Target.MatrixSdk.Sled to LogLevel.Warn, + private val targets: MutableMap = mutableMapOf( + Target.Common to LogLevel.Warn, Target.Hyper to LogLevel.Warn, Target.Sled to LogLevel.Warn, - Target.Common to LogLevel.Warn, + Target.MatrixSdk.Root to LogLevel.Warn, + Target.MatrixSdk.Sled to LogLevel.Warn, + Target.MatrixSdk.Crypto to LogLevel.Debug, + Target.MatrixSdk.HttpClient to LogLevel.Debug, + Target.MatrixSdk.SlidingSync to LogLevel.Trace, + Target.MatrixSdk.BaseSlidingSync to LogLevel.Trace, ) val filter: String @@ -56,6 +57,7 @@ sealed class Target(open val filter: String) { sealed class MatrixSdk(override val filter: String) : Target(filter) { object Root : MatrixSdk("matrix_sdk") object Sled : MatrixSdk("matrix_sdk_sled") + object Crypto: MatrixSdk("matrix_sdk_crypto") object FFI : MatrixSdk("matrix_sdk_ffi") object HttpClient : MatrixSdk("matrix_sdk::http_client") object UniffiAPI : MatrixSdk("matrix_sdk_ffi::uniffi_api") diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt index 76da14418d..cb1ce7538b 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt @@ -41,6 +41,10 @@ class FakeMatrixRoom( return FakeMatrixTimeline() } + override suspend fun fetchMembers(): Result { + return Result.success(Unit) + } + override suspend fun userDisplayName(userId: String): Result { return Result.success("") } From d4146891d909b40b1817c42fd570c326bb0d60a6 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 14 Feb 2023 20:57:11 +0100 Subject: [PATCH 09/25] Create sample app for checking stuff quickly --- app/build.gradle.kts | 22 +-- app/src/main/AndroidManifest.xml | 3 +- plugins/src/main/kotlin/Versions.kt | 2 +- .../main/kotlin/extension/CommonExtension.kt | 3 + ...ent.android-compose-application.gradle.kts | 2 +- samples/minimal/.gitignore | 1 + samples/minimal/build.gradle.kts | 58 ++++++ samples/minimal/proguard-rules.pro | 21 ++ samples/minimal/src/main/AndroidManifest.xml | 44 +++++ .../android/samples/minimal/LoginScreen.kt | 39 ++++ .../android/samples/minimal/MainActivity.kt | 80 ++++++++ .../android/samples/minimal/RoomListScreen.kt | 63 ++++++ .../android/samples/minimal/Singleton.kt | 44 +++++ .../drawable-v24/ic_launcher_foreground.xml | 46 +++++ .../res/drawable/ic_launcher_background.xml | 186 ++++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 21 ++ .../mipmap-anydpi-v26/ic_launcher_round.xml | 21 ++ .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../minimal/src/main/res/values/colors.xml | 26 +++ .../minimal/src/main/res/values/strings.xml | 19 ++ .../minimal/src/main/res/values/themes.xml | 21 ++ settings.gradle.kts | 1 + 31 files changed, 700 insertions(+), 23 deletions(-) create mode 100644 samples/minimal/.gitignore create mode 100644 samples/minimal/build.gradle.kts create mode 100644 samples/minimal/proguard-rules.pro create mode 100644 samples/minimal/src/main/AndroidManifest.xml create mode 100644 samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt create mode 100644 samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt create mode 100644 samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt create mode 100644 samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt create mode 100644 samples/minimal/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 samples/minimal/src/main/res/drawable/ic_launcher_background.xml create mode 100644 samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 samples/minimal/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 samples/minimal/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 samples/minimal/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 samples/minimal/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 samples/minimal/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 samples/minimal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 samples/minimal/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 samples/minimal/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 samples/minimal/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 samples/minimal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 samples/minimal/src/main/res/values/colors.xml create mode 100644 samples/minimal/src/main/res/values/strings.xml create mode 100644 samples/minimal/src/main/res/values/themes.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f5a0799676..fdae68aef4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,9 +38,9 @@ android { defaultConfig { applicationId = "io.element.android.x" - targetSdk = 33 // TODO Use Versions.targetSdk - versionCode = 1 - versionName = "1.0" + targetSdk = Versions.targetSdk + versionCode = Versions.versionCode + versionName = Versions.versionName vectorDrawables { useSupportLibrary = true @@ -109,25 +109,9 @@ android { } } } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } kotlinOptions { jvmTarget = "1.8" } - buildFeatures { - compose = true - } - composeOptions { - kotlinCompilerExtensionVersion = "1.4.0" - } - packagingOptions { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - } - } - // Waiting for https://github.com/google/ksp/issues/37 applicationVariants.all { kotlin.sourceSets { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aa64ea3f53..31033b0500 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,8 +34,7 @@ android:theme="@style/Theme.ElementX.Splash" android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|uiMode" android:exported="true" - android:windowSoftInputMode="adjustResize" - tools:ignore="LockedOrientationActivity"> + android:windowSoftInputMode="adjustResize"> diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index 217a3318fa..64267a3bd4 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -18,7 +18,7 @@ import org.gradle.api.JavaVersion import org.gradle.jvm.toolchain.JavaLanguageVersion object Versions { - const val versionCode = 100100 + const val versionCode = 1 const val versionName = "0.1.0" const val compileSdk = 33 diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt index f3ba843ab7..615ce6b440 100644 --- a/plugins/src/main/kotlin/extension/CommonExtension.kt +++ b/plugins/src/main/kotlin/extension/CommonExtension.kt @@ -18,6 +18,7 @@ package extension import Versions import com.android.build.api.dsl.CommonExtension +import org.gradle.api.JavaVersion import org.gradle.api.Project import java.io.File @@ -30,6 +31,8 @@ fun CommonExtension<*, *, *, *>.androidConfig(project: Project) { compileOptions { isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } testOptions { diff --git a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts index 9bf88cc2c9..cceb1cfb36 100644 --- a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts +++ b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts @@ -15,7 +15,7 @@ */ /** - * This will generate the plugin "io.element.android-compose-application", used only in the module `app`. + * This will generate the plugin "io.element.android-compose-application" to use by app and samples modules */ import extension.androidConfig import extension.commonDependencies diff --git a/samples/minimal/.gitignore b/samples/minimal/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/samples/minimal/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts new file mode 100644 index 0000000000..79a05a89fd --- /dev/null +++ b/samples/minimal/build.gradle.kts @@ -0,0 +1,58 @@ + +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id("io.element.android-compose-application") + alias(libs.plugins.kotlin.android) +} + +android { + namespace = "io.element.android.samples.minimal" + + defaultConfig { + applicationId = "io.element.android.samples.minimal" + targetSdk = Versions.targetSdk + versionCode = Versions.versionCode + versionName = Versions.versionName + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } +} + +dependencies { + implementation(libs.androidx.activity.compose) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.features.roomlist) + implementation(projects.features.login) + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") + +} diff --git a/samples/minimal/proguard-rules.pro b/samples/minimal/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/samples/minimal/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/samples/minimal/src/main/AndroidManifest.xml b/samples/minimal/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..fc217a8cf1 --- /dev/null +++ b/samples/minimal/src/main/AndroidManifest.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt new file mode 100644 index 0000000000..a6a28ed9d0 --- /dev/null +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.samples.minimal + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import io.element.android.features.login.root.LoginRootPresenter +import io.element.android.features.login.root.LoginRootScreen +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService + +class LoginScreen(private val authenticationService: MatrixAuthenticationService) { + + @Composable + fun Content(modifier: Modifier = Modifier) { + val presenter = remember { + LoginRootPresenter(authenticationService = authenticationService) + } + val state = presenter.present() + LoginRootScreen( + state = state, + modifier = modifier + ) + } +} diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt new file mode 100644 index 0000000000..c6c34612d3 --- /dev/null +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:OptIn(ExperimentalMaterial3Api::class) + +package io.element.android.samples.minimal + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.core.view.WindowCompat +import io.element.android.libraries.designsystem.ElementXTheme +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.RustMatrixAuthenticationService +import io.element.android.libraries.matrix.session.PreferencesSessionStore +import kotlinx.coroutines.runBlocking +import org.matrix.rustcomponents.sdk.AuthenticationService +import java.io.File + +class MainActivity : ComponentActivity() { + + private val matrixAuthenticationService: MatrixAuthenticationService by lazy { + val baseDirectory = File(applicationContext.filesDir, "sessions") + + RustMatrixAuthenticationService( + baseDirectory = baseDirectory, + coroutineScope = Singleton.appScope, + coroutineDispatchers = Singleton.coroutineDispatchers, + sessionStore = PreferencesSessionStore(applicationContext), + authService = AuthenticationService(baseDirectory.absolutePath, null, null), + ) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { + ElementXTheme { + val isLoggedIn by matrixAuthenticationService.isLoggedIn().collectAsState(initial = false) + Content(isLoggedIn = isLoggedIn, modifier = Modifier.fillMaxSize()) + } + + } + } + + @Composable + fun Content( + isLoggedIn: Boolean, + modifier: Modifier = Modifier + ) { + if (!isLoggedIn) { + LoginScreen(authenticationService = matrixAuthenticationService).Content(modifier) + } else { + val matrixClient = runBlocking { + val sessionId = matrixAuthenticationService.getLatestSessionId()!! + matrixAuthenticationService.restoreSession(sessionId) + } + RoomListScreen(matrixClient = matrixClient!!).Content(modifier) + } + } +} diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt new file mode 100644 index 0000000000..5d34d66c4b --- /dev/null +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.samples.minimal + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import io.element.android.features.roomlist.LastMessageFormatter +import io.element.android.features.roomlist.RoomListPresenter +import io.element.android.features.roomlist.RoomListView +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.RoomId +import kotlinx.coroutines.launch + +class RoomListScreen(private val matrixClient: MatrixClient) { + + @Composable + fun Content(modifier: Modifier = Modifier) { + fun onRoomClicked(roomId: RoomId) { + val room = matrixClient.getRoom(roomId)!! + val timeline = room.timeline() + Singleton.appScope.launch { + timeline.apply { + initialize() + paginateBackwards(20, 50) + dispose() + } + } + } + + val presenter = remember { + RoomListPresenter(matrixClient, LastMessageFormatter()) + } + val state = presenter.present() + RoomListView( + state = state, + modifier = modifier, + onRoomClicked = ::onRoomClicked, + ) + + DisposableEffect(Unit) { + matrixClient.startSync() + onDispose { + matrixClient.stopSync() + } + } + } +} diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt new file mode 100644 index 0000000000..fb74d2bacb --- /dev/null +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.samples.minimal + +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.tracing.TracingConfigurations +import io.element.android.libraries.matrix.tracing.setupTracing +import kotlinx.coroutines.CoroutineName +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.asCoroutineDispatcher +import kotlinx.coroutines.plus +import timber.log.Timber +import java.util.concurrent.Executors + +object Singleton { + + init { + Timber.plant(Timber.DebugTree()) + setupTracing(TracingConfigurations.debug) + } + + val appScope = MainScope() + CoroutineName("Minimal Scope") + val coroutineDispatchers = CoroutineDispatchers( + io = Dispatchers.IO, + computation = Dispatchers.Default, + main = Dispatchers.Main, + diffUpdateDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher(), + ) +} diff --git a/samples/minimal/src/main/res/drawable-v24/ic_launcher_foreground.xml b/samples/minimal/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000..c546f8e888 --- /dev/null +++ b/samples/minimal/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + diff --git a/samples/minimal/src/main/res/drawable/ic_launcher_background.xml b/samples/minimal/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..1c13e421f6 --- /dev/null +++ b/samples/minimal/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..3b15aca222 --- /dev/null +++ b/samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000..3b15aca222 --- /dev/null +++ b/samples/minimal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/samples/minimal/src/main/res/mipmap-hdpi/ic_launcher.webp b/samples/minimal/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/samples/minimal/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/samples/minimal/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/samples/minimal/src/main/res/mipmap-mdpi/ic_launcher.webp b/samples/minimal/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/samples/minimal/src/main/res/mipmap-xhdpi/ic_launcher.webp b/samples/minimal/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/samples/minimal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/samples/minimal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/samples/minimal/src/main/res/values/colors.xml b/samples/minimal/src/main/res/values/colors.xml new file mode 100644 index 0000000000..94c3262e21 --- /dev/null +++ b/samples/minimal/src/main/res/values/colors.xml @@ -0,0 +1,26 @@ + + + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + diff --git a/samples/minimal/src/main/res/values/strings.xml b/samples/minimal/src/main/res/values/strings.xml new file mode 100644 index 0000000000..5b70784037 --- /dev/null +++ b/samples/minimal/src/main/res/values/strings.xml @@ -0,0 +1,19 @@ + + + + EAX-Sample + diff --git a/samples/minimal/src/main/res/values/themes.xml b/samples/minimal/src/main/res/values/themes.xml new file mode 100644 index 0000000000..8b9418d552 --- /dev/null +++ b/samples/minimal/src/main/res/values/themes.xml @@ -0,0 +1,21 @@ + + + + + +