diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 1a52428737..f63a68f922 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -18,7 +18,7 @@ package io.element.android.x.di import com.squareup.anvil.annotations.ContributesTo import io.element.android.libraries.di.AppScope -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.x.root.RootPresenter import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index 35b1c931da..c60eba1575 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt @@ -24,7 +24,7 @@ import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.libraries.di.RoomScope import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SingleIn -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.MatrixRoom @SingleIn(RoomScope::class) @MergeSubcomponent(RoomScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 05c12af80b..be558f6f63 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt @@ -24,7 +24,7 @@ import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SingleIn -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient @SingleIn(SessionScope::class) @MergeSubcomponent(SessionScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt index bfcdaea612..b6e88590a0 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt @@ -19,8 +19,8 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer import io.element.android.x.BuildConfig -import io.element.android.x.matrix.tracing.TracingConfigurations -import io.element.android.x.matrix.tracing.setupTracing +import io.element.android.libraries.matrix.tracing.TracingConfigurations +import io.element.android.libraries.matrix.tracing.setupTracing class MatrixInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 138885870f..65836f3f4c 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -38,10 +38,10 @@ import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.SessionComponent import io.element.android.x.features.preferences.PreferencesFlowNode import io.element.android.x.features.roomlist.RoomListNode -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.ui.di.MatrixUIBindings +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.ui.di.MatrixUIBindings import kotlinx.parcelize.Parcelize class LoggedInFlowNode( diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index ee38296aa9..e4db559128 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -30,7 +30,7 @@ import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.RoomComponent import io.element.android.x.features.messages.MessagesNode -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.MatrixRoom import kotlinx.parcelize.Parcelize import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index d71e193d71..e922b14e7d 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -40,9 +40,9 @@ import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.features.rageshake.bugreport.BugReportNode -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.auth.MatrixAuthenticationService -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.core.SessionId import io.element.android.x.root.RootPresenter import io.element.android.x.root.RootView import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt index 2b010724b5..b1050d59e1 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt @@ -25,7 +25,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.execute -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt index eda3efcf57..e6a6ec6c9e 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt @@ -23,7 +23,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index f74b342553..671b58ac32 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -62,7 +62,7 @@ import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.features.login.error.loginError import io.element.android.x.libraries.testtags.TestTags import io.element.android.x.libraries.testtags.testTag -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import io.element.android.x.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt index 4481b3afff..6fc80bcfb6 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.login.root import android.os.Parcelable -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import kotlinx.parcelize.Parcelize data class LoginRootState( diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt index b4fa7e9bd1..f29a687f23 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.rememberCoroutineScope import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.execute -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt index d682133968..50a3e23a0f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt @@ -36,9 +36,9 @@ import io.element.android.x.features.messages.timeline.TimelineEvents import io.element.android.x.features.messages.timeline.TimelinePresenter import io.element.android.x.features.messages.timeline.model.TimelineItem import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.ui.MatrixItemHelper +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.ui.MatrixItemHelper import io.element.android.x.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt index 8d011fc6d2..1e3fea4c67 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt @@ -21,7 +21,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListState import io.element.android.x.features.messages.textcomposer.MessageComposerState import io.element.android.x.features.messages.timeline.TimelineState -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId @Immutable data class MessagesState( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt index 73465e37c3..fc72fef5bb 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.data.StableCharSequence import io.element.android.libraries.core.data.toStableCharSequence -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.x.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt index 733a082d73..31a53849cd 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.messages.timeline -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId sealed interface TimelineEvents { object LoadMore : TimelineEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt index 3bab3ec9a2..9438152e6a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt @@ -33,11 +33,11 @@ import io.element.android.x.features.messages.timeline.model.content.TimelineIte import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextContent import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent import io.element.android.x.features.messages.timeline.util.invalidateLast -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.timeline.MatrixTimelineItem -import io.element.android.x.matrix.ui.MatrixItemHelper +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 diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt index 83af2579b2..5844534219 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt @@ -26,12 +26,12 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimelineItem -import io.element.android.x.matrix.ui.MatrixItemHelper +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 diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt index c4ea612334..ec43aa2057 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.messages.timeline import androidx.compose.runtime.Immutable import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt index 4225ec77b3..1ba9c5a19e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt @@ -80,7 +80,7 @@ import io.element.android.x.features.messages.timeline.components.TimelineItemIm import io.element.android.x.features.messages.timeline.components.TimelineItemRedactedView import io.element.android.x.features.messages.timeline.components.TimelineItemTextView import io.element.android.x.features.messages.timeline.components.TimelineItemUnknownView -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt index b9049e55b7..efb22538da 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt @@ -49,8 +49,8 @@ import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow import io.element.android.libraries.designsystem.LinkColor import io.element.android.libraries.designsystem.components.ClickableLinkText -import io.element.android.x.matrix.permalink.PermalinkData -import io.element.android.x.matrix.permalink.PermalinkParser +import io.element.android.libraries.matrix.permalink.PermalinkData +import io.element.android.libraries.matrix.permalink.PermalinkParser import kotlinx.collections.immutable.persistentMapOf import org.jsoup.nodes.Document import org.jsoup.nodes.Element diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt index 45b754043a..1de27134a0 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.timeline.diff import androidx.recyclerview.widget.DiffUtil -import io.element.android.x.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem internal class MatrixTimelineItemsDiffCallback( private val oldList: List, diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt index f274f5c7f9..fba7009f68 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.messages.timeline.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId @Immutable sealed interface TimelineItem { diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt index 25e983d6a4..e361ff11a8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.messages.timeline.model.content -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver data class TimelineItemImageContent( val body: String, diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt index 6541eb8c6d..b813d0a99b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.preferences.root import io.element.android.libraries.architecture.Async import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser data class PreferencesRootState( val logoutState: LogoutPreferenceState, diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt index 93a7db4d7e..24fd0e2292 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt @@ -22,8 +22,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import io.element.android.libraries.architecture.Async -import io.element.android.x.matrix.ui.components.MatrixUserHeader -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.components.MatrixUserHeader +import io.element.android.libraries.matrix.ui.model.MatrixUser @Composable fun UserPreferences( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt index 84ff93680e..3c2c3ae19b 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt @@ -29,7 +29,7 @@ import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.SessionScope -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId @ContributesNode(SessionScope::class) class RoomListNode @AssistedInject constructor( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt index 8d0dea57ce..bf35b48710 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -33,10 +33,10 @@ import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders import io.element.android.x.features.roomlist.model.RoomListState -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt index 046e804691..1bca826ad6 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt @@ -44,9 +44,9 @@ import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListState import io.element.android.x.features.roomlist.model.stubbedRoomSummaries -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList @Composable diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt index ea913a30a5..096c00a910 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt @@ -55,7 +55,7 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.avatar.Avatar -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser import io.element.android.x.ui.strings.R as StringR @Composable diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt index 038ffaea47..12a8982989 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.roomlist.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId @Immutable data class RoomListRoomSummary( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt index ce2e679fa0..3b54057b44 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.roomlist.model import androidx.compose.runtime.Immutable -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList @Immutable diff --git a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt b/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt index cd1b148ce5..658d15beb0 100644 --- a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt +++ b/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt @@ -20,8 +20,8 @@ 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.x.libraries.matrixtest.FakeMatrixClient -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrixtest.FakeMatrixClient +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts index 597d8a4514..00f635eb69 100644 --- a/libraries/designsystem/build.gradle.kts +++ b/libraries/designsystem/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.libraries.designsystem" + namespace = "io.element.android.libraries.designsystem" dependencies { // Should not be there, but this is a POC diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt index 330da95154..a11b0b96bb 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.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. @@ -16,8 +16,6 @@ package io.element.android.libraries.designsystem -import io.element.android.x.libraries.designsystem.R - object VectorIcons { val Copy = R.drawable.ic_content_copy val ArrowForward = R.drawable.ic_content_arrow_forward diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts index 56f33523a7..fcf2c78eea 100644 --- a/libraries/matrix/build.gradle.kts +++ b/libraries/matrix/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.matrix" + namespace = "io.element.android.libraries.matrix" } anvil { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt index b48137013e..85c1e6010e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix internal const val LOG_TAG = "Matrix" diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt similarity index 76% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt index d0d446909b..1d3fc62ff7 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import org.matrix.rustcomponents.sdk.MediaSource import java.io.Closeable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt similarity index 87% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index 90efb11482..64b1cb4e34 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.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. @@ -14,22 +14,22 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.media.RustMediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource -import io.element.android.x.matrix.room.RustMatrixRoom -import io.element.android.x.matrix.room.RustRoomSummaryDataSource -import io.element.android.x.matrix.session.PreferencesSessionStore -import io.element.android.x.matrix.session.SessionStore -import io.element.android.x.matrix.session.sessionId -import io.element.android.x.matrix.sync.SlidingSyncObserverProxy +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.RustMediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.room.RustMatrixRoom +import io.element.android.libraries.matrix.room.RustRoomSummaryDataSource +import io.element.android.libraries.matrix.session.PreferencesSessionStore +import io.element.android.libraries.matrix.session.SessionStore +import io.element.android.libraries.matrix.session.sessionId +import io.element.android.libraries.matrix.sync.SlidingSyncObserverProxy import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.withContext import org.matrix.rustcomponents.sdk.Client diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt index f353a4d789..122c079971 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.auth +package io.element.android.libraries.matrix.auth -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.flow.Flow interface MatrixAuthenticationService { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt similarity index 89% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt index daebb759f8..d0d115123f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.element.android.x.matrix.auth +package io.element.android.libraries.matrix.auth import com.squareup.anvil.annotations.ContributesBinding import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.di.AppScope -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.RustMatrixClient -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.session.SessionStore -import io.element.android.x.matrix.session.sessionId -import io.element.android.x.matrix.util.logError +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.RustMatrixClient +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.session.SessionStore +import io.element.android.libraries.matrix.session.sessionId +import io.element.android.libraries.matrix.util.logError import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt index 77460d5b86..7ad4235e5e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt similarity index 98% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt index c6a4ae4dcd..b2043d216b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core -import io.element.android.x.matrix.BuildConfig +import io.element.android.libraries.matrix.BuildConfig import timber.log.Timber /** diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt index db166d57a0..1a50c6a83a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt index d75f4c15a7..bf1ce0c04b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt index 685d4627ef..63f2c85216 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt index 2a4516aa37..9b0583d2d1 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.di +package io.element.android.libraries.matrix.di import com.squareup.anvil.annotations.ContributesTo import dagger.Module diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt index 0fb796a421..aad5d11d58 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.media +package io.element.android.libraries.matrix.media import org.matrix.rustcomponents.sdk.MediaSource diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt index f8c1ca3868..1b1eaf7bc9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.media +package io.element.android.libraries.matrix.media -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import org.matrix.rustcomponents.sdk.mediaSourceFromUrl internal class RustMediaResolver(private val client: MatrixClient) : MediaResolver { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt index 8b0468277e..8ef0bbcd08 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt index e1c489331e..b5f8b7fd92 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt index a69d71516c..411ba1576f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri import android.net.UrlQuerySanitizer -import io.element.android.x.matrix.core.MatrixPatterns +import io.element.android.libraries.matrix.core.MatrixPatterns import java.net.URLDecoder import timber.log.Timber diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt similarity index 85% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt index f2ecdb2b70..06c1fa0f76 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.timeline.MatrixTimeline import kotlinx.coroutines.flow.Flow interface MatrixRoom { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt index 2fc0a23a21..e307bf0dad 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt index 56e479e1d5..8b922b322d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId sealed interface RoomSummary { data class Empty(val identifier: String) : RoomSummary diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt index 249e600c09..25f1af2269 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.sync.roomListDiff -import io.element.android.x.matrix.sync.state +import io.element.android.libraries.matrix.sync.roomListDiff +import io.element.android.libraries.matrix.sync.state import java.io.Closeable import java.util.Collections import java.util.UUID diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt index 93202ef742..d295f9848e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.room.message.RoomMessageFactory +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.room.message.RoomMessageFactory import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.SlidingSyncRoom diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt similarity index 92% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt index 21c48fbcf9..c481b7c3d5 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.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. @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.RustMatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.RustMatrixTimeline import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt similarity index 77% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt index da9e097540..3bfe5b5edb 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room.message +package io.element.android.libraries.matrix.room.message -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.UserId data class RoomMessage( val eventId: EventId, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt similarity index 84% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt index 318e429070..348551835d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room.message +package io.element.android.libraries.matrix.room.message -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.UserId import org.matrix.rustcomponents.sdk.EventTimelineItem class RoomMessageFactory { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt similarity index 98% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt index 9b18cb25b4..02241bc0f9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session import android.content.Context import androidx.datastore.core.DataStore diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt index 53b69ce975..a1943f273c 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import org.matrix.rustcomponents.sdk.Session fun Session.sessionId() = SessionId("${userId}_${deviceId}") diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt index 4380518ce9..07c40ab54a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.Session diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt index f10ff0e12d..5774e23cb4 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.sync +package io.element.android.libraries.matrix.sync import io.element.android.libraries.core.coroutine.CoroutineDispatchers import kotlinx.coroutines.CoroutineScope diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt index 0fed5ee936..a3d323b8d0 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.sync +package io.element.android.libraries.matrix.sync -import io.element.android.x.matrix.util.mxCallbackFlow +import io.element.android.libraries.matrix.util.mxCallbackFlow import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt index 2f383cebf2..67ab8969b3 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.TimelineListener diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt index 365319d803..022988fd4f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline import org.matrix.rustcomponents.sdk.EventTimelineItem import org.matrix.rustcomponents.sdk.TimelineItem diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt index bfb4bdf3f2..1f6722d823 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.room.RustMatrixRoom +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.room.RustMatrixRoom import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt index e73449c43f..9c7dc1632d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.tracing +package io.element.android.libraries.matrix.tracing data class TracingConfiguration( val common: LogLevel = LogLevel.Warn, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt index 8625325cab..3b82cc2489 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.util +package io.element.android.libraries.matrix.util import kotlinx.coroutines.channels.ProducerScope import kotlinx.coroutines.channels.awaitClose diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt index a2d1720041..d480262f81 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.util +package io.element.android.libraries.matrix.util import org.matrix.rustcomponents.sdk.ClientException import timber.log.Timber diff --git a/libraries/matrixtest/build.gradle.kts b/libraries/matrixtest/build.gradle.kts index f4ba43aaac..5bb1e92df3 100644 --- a/libraries/matrixtest/build.gradle.kts +++ b/libraries/matrixtest/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } android { - namespace = "io.element.android.x.libraries.matrix.test" + namespace = "io.element.android.libraries.matrix.test" } dependencies { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt similarity index 72% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt index 5e55b6dc79..fb2a1b2341 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest +package io.element.android.libraries.matrixtest -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.libraries.matrixtest.media.FakeMediaResolver -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.libraries.matrixtest.room.FakeMatrixRoom -import io.element.android.x.libraries.matrixtest.room.InMemoryRoomSummaryDataSource -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrixtest.media.FakeMediaResolver +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrixtest.room.FakeMatrixRoom +import io.element.android.libraries.matrixtest.room.InMemoryRoomSummaryDataSource +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import org.matrix.rustcomponents.sdk.MediaSource class FakeMatrixClient(override val sessionId: SessionId) : MatrixClient { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt similarity index 88% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt index 07fc24c468..ef171e5a09 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.media +package io.element.android.libraries.matrixtest.media -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver class FakeMediaResolver : MediaResolver { override suspend fun resolve(url: String?, kind: MediaResolver.Kind): ByteArray? { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt similarity index 83% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt index fca74a59d9..254f460f25 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.room +package io.element.android.libraries.matrixtest.room -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.libraries.matrixtest.timeline.FakeMatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimeline import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt similarity index 83% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt index eaa75e1448..cb4f002859 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.room +package io.element.android.libraries.matrixtest.room -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt similarity index 87% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt index 27443bde6f..60fa211b1d 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.timeline +package io.element.android.libraries.matrixtest.timeline -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import org.matrix.rustcomponents.sdk.TimelineListener diff --git a/libraries/matrixui/build.gradle.kts b/libraries/matrixui/build.gradle.kts index 9e32aea0a8..2187a36b07 100644 --- a/libraries/matrixui/build.gradle.kts +++ b/libraries/matrixui/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.matrix.ui" + namespace = "io.element.android.libraries.matrix.ui" } anvil { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt similarity index 87% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt index a5f06d8f54..d1060bd39a 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui +package io.element.android.libraries.matrix.ui import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt similarity index 92% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt index 91e4f04609..ca4ffb247b 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.components +package io.element.android.libraries.matrix.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -36,9 +36,9 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.matrix.ui.model.getBestName +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.getBestName @Composable fun MatrixUserHeader( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt similarity index 91% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt index b98275ba2d..1a9b7e0c18 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.components +package io.element.android.libraries.matrix.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -35,9 +35,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.matrix.ui.model.getBestName +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.getBestName @Composable fun MatrixUserRow( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt similarity index 81% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt index 4502c4dc94..a5734f5b9c 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.di +package io.element.android.libraries.matrix.ui.di import com.squareup.anvil.annotations.ContributesTo import io.element.android.libraries.di.SessionScope -import io.element.android.x.matrix.ui.media.LoggedInImageLoaderFactory -import io.element.android.x.matrix.ui.media.NotLoggedInImageLoaderFactory +import io.element.android.libraries.matrix.ui.media.LoggedInImageLoaderFactory +import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactory @ContributesTo(SessionScope::class) interface MatrixUIBindings { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt similarity index 93% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt index 655b909db5..19f84f4393 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import android.content.Context import coil.ImageLoader import coil.ImageLoaderFactory import io.element.android.libraries.di.ApplicationContext -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import javax.inject.Inject class LoggedInImageLoaderFactory @Inject constructor( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt similarity index 88% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt index a443f7486d..dc90947a87 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.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. @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import coil.ImageLoader import coil.fetch.FetchResult import coil.fetch.Fetcher import coil.request.Options -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver import java.nio.ByteBuffer internal class MediaFetcher( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt similarity index 87% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt index 0831f6815e..1ce5390fc9 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import coil.key.Keyer import coil.request.Options -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver internal class MediaKeyer : Keyer { override fun key(data: MediaResolver.Meta, options: Options): String? { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt similarity index 86% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt index 09ca3b46c7..3d673628ff 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.model +package io.element.android.libraries.matrix.ui.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.UserId @Immutable data class MatrixUser( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt index 715b9c6cd6..39c601a2d4 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt @@ -17,7 +17,7 @@ package io.element.android.x.textcomposer import android.os.Parcelable -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.parcelize.Parcelize sealed interface MessageComposerMode : Parcelable {