[Architecture]: use FeatureEntryPoint on Messages feature

app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt

@@ -28,11 +28,10 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.messages.MessagesNode
+import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.bindings
-import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.nodeInputs
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.libraries.di.SessionScope
@@ -45,6 +44,7 @@ import timber.log.Timber
 class RoomFlowNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
+    private val messagesEntryPoint: MessagesEntryPoint,
 ) : BackstackNode<RoomFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Messages,
@@ -73,7 +73,9 @@ class RoomFlowNode @AssistedInject constructor(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            NavTarget.Messages -> createNode<MessagesNode>(buildContext)
+            NavTarget.Messages -> {
+                messagesEntryPoint.node(this, buildContext)
+            }
         }
     }
 

features/messages/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.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.api
+
+import io.element.android.libraries.architecture.FeatureEntryPoint
+
+interface MessagesEntryPoint : FeatureEntryPoint

features/messages/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.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.features.messages.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.messages.api.MessagesEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.AppScope
+import javax.inject.Inject
+
+@ContributesBinding(AppScope::class)
+class DefaultMessagesEntryPoint @Inject constructor() : MessagesEntryPoint {
+    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+        return parentNode.createNode<MessagesNode>(buildContext, plugins)
+    }
+}

features/messages/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages
+package io.element.android.features.messages.impl
 
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 
 sealed interface MessagesEvents {
     data class HandleAction(val action: TimelineItemAction, val event: TimelineItem.Event) : MessagesEvents

features/messages/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages
+package io.element.android.features.messages.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

features/messages/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages
+package io.element.android.features.messages.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -24,15 +24,15 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.features.messages.actionlist.ActionListPresenter
+import io.element.android.features.messages.impl.actionlist.ActionListPresenter
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.textcomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.textcomposer.MessageComposerEvents
-import io.element.android.features.messages.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.impl.textcomposer.MessageComposerPresenter
-import io.element.android.features.messages.textcomposer.MessageComposerState
+import io.element.android.features.messages.impl.textcomposer.MessageComposerState
-import io.element.android.features.messages.timeline.TimelineEvents
+import io.element.android.features.messages.impl.timeline.TimelineEvents
-import io.element.android.features.messages.timeline.TimelinePresenter
+import io.element.android.features.messages.impl.timeline.TimelinePresenter
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent
+import io.element.android.features.messages.impl.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

features/messages/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages
+package io.element.android.features.messages.impl
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.messages.actionlist.ActionListState
+import io.element.android.features.messages.impl.actionlist.ActionListState
-import io.element.android.features.messages.textcomposer.MessageComposerState
+import io.element.android.features.messages.impl.textcomposer.MessageComposerState
-import io.element.android.features.messages.timeline.TimelineState
+import io.element.android.features.messages.impl.timeline.TimelineState
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.core.RoomId
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages
+package io.element.android.features.messages.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.messages.actionlist.anActionListState
+import io.element.android.features.messages.impl.actionlist.anActionListState
-import io.element.android.features.messages.textcomposer.aMessageComposerState
+import io.element.android.features.messages.impl.textcomposer.aMessageComposerState
-import io.element.android.features.messages.timeline.aTimelineItemContent
+import io.element.android.features.messages.impl.timeline.aTimelineItemContent
-import io.element.android.features.messages.timeline.aTimelineItemList
+import io.element.android.features.messages.impl.timeline.aTimelineItemList
-import io.element.android.features.messages.timeline.aTimelineState
+import io.element.android.features.messages.impl.timeline.aTimelineState
 import io.element.android.libraries.core.data.StableCharSequence
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.core.RoomId

features/messages/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * 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.
@@ -19,7 +19,7 @@
     ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class,
 )
 
-package io.element.android.features.messages
+package io.element.android.features.messages.impl
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -53,12 +53,12 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.features.messages.actionlist.ActionListEvents
+import io.element.android.features.messages.impl.actionlist.ActionListEvents
-import io.element.android.features.messages.actionlist.ActionListView
+import io.element.android.features.messages.impl.actionlist.ActionListView
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.textcomposer.MessageComposerView
+import io.element.android.features.messages.impl.textcomposer.MessageComposerView
-import io.element.android.features.messages.timeline.TimelineView
+import io.element.android.features.messages.impl.timeline.TimelineView
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark

features/messages/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListEvents.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.actionlist
+package io.element.android.features.messages.impl.actionlist
 
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 
 sealed interface ActionListEvents {
     object Clear : ActionListEvents

features/messages/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.actionlist
+package io.element.android.features.messages.impl.actionlist
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 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.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.libraries.architecture.Presenter
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope

features/messages/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.actionlist
+package io.element.android.features.messages.impl.actionlist
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import kotlinx.collections.immutable.ImmutableList
 
 @Immutable

features/messages/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.actionlist
+package io.element.android.features.messages.impl.actionlist
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import kotlinx.collections.immutable.persistentListOf
 
 open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {

features/messages/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt

@@ -16,7 +16,7 @@
 
 @file:OptIn(ExperimentalMaterialApi::class)
 
-package io.element.android.features.messages.actionlist
+package io.element.android.features.messages.impl.actionlist
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -40,8 +40,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Icon

features/messages/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.actionlist.model
+package io.element.android.features.messages.impl.actionlist.model
 
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Immutable

features/messages/src/main/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerEvents.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.textcomposer
+package io.element.android.features.messages.impl.textcomposer
 
 import io.element.android.libraries.textcomposer.MessageComposerMode
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerPresenter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.textcomposer
+package io.element.android.features.messages.impl.textcomposer
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

features/messages/src/main/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerState.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.textcomposer
+package io.element.android.features.messages.impl.textcomposer
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.core.data.StableCharSequence

features/messages/src/main/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerStateProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.textcomposer
+package io.element.android.features.messages.impl.textcomposer
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.core.data.StableCharSequence

features/messages/src/main/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.textcomposer
+package io.element.android.features.messages.impl.textcomposer
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline
+package io.element.android.features.messages.impl.timeline
 
 import io.element.android.libraries.matrix.core.EventId
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline
+package io.element.android.features.messages.impl.timeline
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -24,7 +24,7 @@ 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.features.messages.impl.timeline.factories.TimelineItemsFactory
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.core.EventId
 import io.element.android.libraries.matrix.room.MatrixRoom

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline
+package io.element.android.features.messages.impl.timeline
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.matrix.core.EventId
 import io.element.android.libraries.matrix.timeline.MatrixTimeline
 import kotlinx.collections.immutable.ImmutableList

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline
+package io.element.android.features.messages.impl.timeline
 
-import io.element.android.features.messages.timeline.model.AggregatedReaction
+import io.element.android.features.messages.impl.timeline.model.AggregatedReaction
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
-import io.element.android.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.core.EventId
 import io.element.android.libraries.matrix.timeline.MatrixTimeline

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline
+package io.element.android.features.messages.impl.timeline
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -54,17 +54,17 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import io.element.android.features.messages.timeline.components.MessageEventBubble
+import io.element.android.features.messages.impl.timeline.components.MessageEventBubble
-import io.element.android.features.messages.timeline.components.TimelineItemReactionsView
+import io.element.android.features.messages.impl.timeline.components.TimelineItemReactionsView
-import io.element.android.features.messages.timeline.components.event.TimelineItemEventContentView
+import io.element.android.features.messages.impl.timeline.components.event.TimelineItemEventContentView
-import io.element.android.features.messages.timeline.components.virtual.TimelineItemDaySeparatorView
+import io.element.android.features.messages.impl.timeline.components.virtual.TimelineItemDaySeparatorView
-import io.element.android.features.messages.timeline.components.virtual.TimelineLoadingMoreIndicator
+import io.element.android.features.messages.impl.timeline.components.virtual.TimelineLoadingMoreIndicator
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.bubble.BubbleState
+import io.element.android.features.messages.impl.timeline.model.bubble.BubbleState
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContentProvider
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentProvider
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemLoadingModel
+import io.element.android.features.messages.impl.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.preview.ElementPreviewDark

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components
+package io.element.android.features.messages.impl.timeline.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
@@ -35,9 +35,9 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.messages.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
-import io.element.android.features.messages.timeline.model.bubble.BubbleState
+import io.element.android.features.messages.impl.timeline.model.bubble.BubbleState
-import io.element.android.features.messages.timeline.model.bubble.BubbleStateProvider
+import io.element.android.features.messages.impl.timeline.model.bubble.BubbleStateProvider
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.ElementTheme

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components
+package io.element.android.features.messages.impl.timeline.components
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Row
@@ -31,8 +31,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.features.messages.timeline.model.AggregatedReaction
+import io.element.android.features.messages.impl.timeline.model.AggregatedReaction
-import io.element.android.features.messages.timeline.model.AggregatedReactionProvider
+import io.element.android.features.messages.impl.timeline.model.AggregatedReactionProvider
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Surface

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components
+package io.element.android.features.messages.impl.timeline.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.flowlayout.FlowRow
-import io.element.android.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
-import io.element.android.features.messages.timeline.model.aTimelineItemReactions
+import io.element.android.features.messages.impl.timeline.model.aTimelineItemReactions
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemContentView.kt

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import io.element.android.features.messages.timeline.model.event.TimelineItemEncryptedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemImageContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 
 @Composable
 fun TimelineItemEventContentView(

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Warning
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.features.messages.timeline.model.event.TimelineItemEncryptedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import org.matrix.rustcomponents.sdk.EncryptedMessage

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.aspectRatio
@@ -32,8 +32,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
-import io.element.android.features.messages.timeline.model.event.TimelineItemImageContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemImageContentProvider
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContentProvider
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.debugPlaceholderBackground

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import android.text.SpannableString
 import android.text.style.URLSpan
@@ -30,9 +30,9 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.core.text.util.LinkifyCompat
-import io.element.android.features.messages.timeline.components.html.HtmlDocument
+import io.element.android.features.messages.impl.timeline.components.html.HtmlDocument
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextBasedContentProvider
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContentProvider
 import io.element.android.libraries.designsystem.LinkColor
 import io.element.android.libraries.designsystem.components.ClickableLinkText
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.event
+package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/html/DocumentProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.html
+package io.element.android.features.messages.impl.timeline.components.html
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import org.jsoup.Jsoup

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/html/HtmlDocument.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.html
+package io.element.android.features.messages.impl.timeline.components.html
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.virtual
+package io.element.android.features.messages.impl.timeline.components.virtual
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -27,8 +27,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModelProvider
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModelProvider
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -54,12 +54,16 @@ internal fun TimelineItemDaySeparatorView(
 
 @Preview
 @Composable
-internal fun TimelineItemDaySeparatorViewLightPreview(@PreviewParameter(TimelineItemDaySeparatorModelProvider::class) model: TimelineItemDaySeparatorModel) =
+internal fun TimelineItemDaySeparatorViewLightPreview(@PreviewParameter(
+    TimelineItemDaySeparatorModelProvider::class) model: TimelineItemDaySeparatorModel
+) =
     ElementPreviewLight { ContentToPreview(model) }
 
 @Preview
 @Composable
-internal fun TimelineItemDaySeparatorViewDarkPreview(@PreviewParameter(TimelineItemDaySeparatorModelProvider::class) model: TimelineItemDaySeparatorModel) =
+internal fun TimelineItemDaySeparatorViewDarkPreview(@PreviewParameter(
+    TimelineItemDaySeparatorModelProvider::class) model: TimelineItemDaySeparatorModel
+) =
     ElementPreviewDark { ContentToPreview(model) }
 
 @Composable

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemLoadingMoreIndicator.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.components.virtual
+package io.element.android.features.messages.impl.timeline.components.virtual
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/diff/CacheInvalidator.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.diff
+package io.element.android.features.messages.impl.timeline.diff
 
 import androidx.recyclerview.widget.ListUpdateCallback
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.util.invalidateLast
+import io.element.android.features.messages.impl.timeline.util.invalidateLast
 import timber.log.Timber
 
 internal class CacheInvalidator(private val itemStatesCache: MutableList<TimelineItem?>) :

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/diff/MatrixTimelineItemsDiffCallback.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.diff
+package io.element.android.features.messages.impl.timeline.diff
 
 import androidx.recyclerview.widget.DiffUtil
 import io.element.android.libraries.matrix.timeline.MatrixTimelineItem

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories
+package io.element.android.features.messages.impl.timeline.factories
 
 import androidx.recyclerview.widget.DiffUtil
-import io.element.android.features.messages.timeline.diff.CacheInvalidator
+import io.element.android.features.messages.impl.timeline.diff.CacheInvalidator
-import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback
+import io.element.android.features.messages.impl.timeline.diff.MatrixTimelineItemsDiffCallback
-import io.element.android.features.messages.timeline.factories.event.TimelineItemEventFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemEventFactory
-import io.element.android.features.messages.timeline.factories.virtual.TimelineItemVirtualFactory
+import io.element.android.features.messages.impl.timeline.factories.virtual.TimelineItemVirtualFactory
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.timeline.MatrixTimelineItem
 import kotlinx.coroutines.flow.MutableStateFlow

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemEmoteContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEmoteContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemImageContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemNoticeContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
-import io.element.android.features.messages.timeline.util.toHtmlDocument
+import io.element.android.features.messages.impl.timeline.util.toHtmlDocument
 import io.element.android.libraries.matrix.media.MediaResolver
 import org.matrix.rustcomponents.sdk.Message
 import org.matrix.rustcomponents.sdk.MessageType

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRedactedFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStickerFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentUTDFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemEncryptedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import org.matrix.rustcomponents.sdk.TimelineItemContentKind
 import javax.inject.Inject
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.event
+package io.element.android.features.messages.impl.timeline.factories.event
 
-import io.element.android.features.messages.timeline.model.AggregatedReaction
+import io.element.android.features.messages.impl.timeline.model.AggregatedReaction
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
-import io.element.android.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.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.timeline.MatrixTimelineItem

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.virtual
+package io.element.android.features.messages.impl.timeline.factories.virtual
 
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
 import io.element.android.libraries.dateformatter.DaySeparatorFormatter
 import org.matrix.rustcomponents.sdk.VirtualTimelineItem
 import javax.inject.Inject

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.factories.virtual
+package io.element.android.features.messages.impl.timeline.factories.virtual
 
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemLoadingModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemLoadingModel
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemReadMarkerModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemReadMarkerModel
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemUnknownVirtualModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemUnknownVirtualModel
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
 import io.element.android.libraries.matrix.timeline.MatrixTimelineItem
 import org.matrix.rustcomponents.sdk.VirtualTimelineItem
 import javax.inject.Inject

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 data class AggregatedReaction(
     val key: String,

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.core.EventId
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemGroupPosition.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 import androidx.compose.runtime.Immutable
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemGroupPositionProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactions.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 import kotlinx.collections.immutable.ImmutableList
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactionsProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model
+package io.element.android.features.messages.impl.timeline.model
 
 import kotlinx.collections.immutable.toPersistentList
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleState.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.bubble
+package io.element.android.features.messages.impl.timeline.model.bubble
 
-import io.element.android.features.messages.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 
 data class BubbleState(
     val groupPosition: TimelineItemGroupPosition,

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleStateProvider.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.bubble
+package io.element.android.features.messages.impl.timeline.model.bubble
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.messages.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 
 open class BubbleStateProvider : PreviewParameterProvider<BubbleState> {
     override val values: Sequence<BubbleState>

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEmoteContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import org.jsoup.nodes.Document
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import org.matrix.rustcomponents.sdk.EncryptedMessage
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import androidx.compose.runtime.Immutable
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import org.jsoup.Jsoup

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import io.element.android.libraries.matrix.media.MediaResolver
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContentProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.media.MediaResolver

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemNoticeContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import org.jsoup.nodes.Document
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRedactedContent.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 object TimelineItemRedactedContent : TimelineItemEventContent

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextBasedContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import org.jsoup.nodes.Document
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextContent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 import org.jsoup.nodes.Document
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemUnknownContent.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.event
+package io.element.android.features.messages.impl.timeline.model.event
 
 object TimelineItemUnknownContent : TimelineItemEventContent

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModel.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 data class TimelineItemDaySeparatorModel(
     val formattedDate: String

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModelProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingModel.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 object TimelineItemLoadingModel : TimelineItemVirtualModel

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemReadMarkerModel.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 object TimelineItemReadMarkerModel : TimelineItemVirtualModel

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTimelineStartModel.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 object TimelineItemTimelineStartModel : TimelineItemVirtualModel

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 object TimelineItemUnknownVirtualModel : TimelineItemVirtualModel

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemVirtualModel.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.model.virtual
+package io.element.android.features.messages.impl.timeline.model.virtual
 
 import androidx.compose.runtime.Immutable
 

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/MutableListExt.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.util
+package io.element.android.features.messages.impl.timeline.util
 
 internal inline fun <reified T> MutableList<T?>.invalidateLast() {
     val indexOfLast = size

features/messages/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/toHtmlDocument.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.timeline.util
+package io.element.android.features.messages.impl.timeline.util
 
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document

features/messages/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt

@@ -22,30 +22,21 @@ import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.messages.actionlist.ActionListPresenter
+import io.element.android.features.messages.impl.actionlist.ActionListPresenter
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.fixtures.aMessageEvent
 import io.element.android.features.messages.fixtures.aTimelineItemsFactory
-import io.element.android.features.messages.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.impl.MessagesEvents
-import io.element.android.features.messages.timeline.TimelinePresenter
+import io.element.android.features.messages.impl.MessagesPresenter
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.textcomposer.MessageComposerPresenter
-import io.element.android.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.timeline.TimelinePresenter
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.room.MatrixRoom
 import io.element.android.libraries.matrixtest.AN_EVENT_ID
-import io.element.android.libraries.matrixtest.A_MESSAGE
 import io.element.android.libraries.matrixtest.A_ROOM_ID
-import io.element.android.libraries.matrixtest.A_USER_ID
-import io.element.android.libraries.matrixtest.A_USER_NAME
 import io.element.android.libraries.matrixtest.room.FakeMatrixRoom
 import io.element.android.libraries.textcomposer.MessageComposerMode
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 

features/messages/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt

@@ -22,12 +22,15 @@ import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.actionlist.ActionListEvents
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.actionlist.ActionListPresenter
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.actionlist.ActionListState
-import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent
+import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrixtest.AN_EVENT_ID
 import io.element.android.libraries.matrixtest.A_MESSAGE
@@ -37,7 +40,6 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.TimelineItemContent
 
 class ActionListPresenterTest {
     @Test

features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt

@@ -16,10 +16,10 @@
 
 package io.element.android.features.messages.fixtures
 
-import io.element.android.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
-import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
-import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrixtest.AN_EVENT_ID
 import io.element.android.libraries.matrixtest.A_MESSAGE

features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt

@@ -17,20 +17,20 @@
 package io.element.android.features.messages.fixtures
 
 import io.element.android.features.messages.fakes.FakeDaySeparatorFormatter
-import io.element.android.features.messages.timeline.factories.TimelineItemsFactory
+import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentFailedToParseMessageFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentFailedToParseMessageFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentFailedToParseStateFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentFailedToParseStateFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentMessageFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentProfileChangeFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentProfileChangeFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentRedactedFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentRedactedFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentRoomMembershipFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentRoomMembershipFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentStateFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentStateFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentStickerFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentStickerFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemContentUTDFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentUTDFactory
-import io.element.android.features.messages.timeline.factories.event.TimelineItemEventFactory
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemEventFactory
-import io.element.android.features.messages.timeline.factories.virtual.TimelineItemDaySeparatorFactory
+import io.element.android.features.messages.impl.timeline.factories.virtual.TimelineItemDaySeparatorFactory
-import io.element.android.features.messages.timeline.factories.virtual.TimelineItemVirtualFactory
+import io.element.android.features.messages.impl.timeline.factories.virtual.TimelineItemVirtualFactory
 
 internal fun aTimelineItemsFactory() = TimelineItemsFactory(
     dispatchers = testCoroutineDispatchers(),

features/messages/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt

@@ -23,6 +23,9 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.messages.impl.textcomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.impl.textcomposer.MessageComposerState
 import io.element.android.libraries.core.data.StableCharSequence
 import io.element.android.libraries.matrixtest.ANOTHER_MESSAGE
 import io.element.android.libraries.matrixtest.AN_EVENT_ID

features/messages/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt

@@ -23,6 +23,8 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.fixtures.aTimelineItemsFactory
+import io.element.android.features.messages.impl.timeline.TimelineEvents
+import io.element.android.features.messages.impl.timeline.TimelinePresenter
 import io.element.android.libraries.matrixtest.AN_EVENT_ID
 import io.element.android.libraries.matrixtest.room.FakeMatrixRoom
 import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline