Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename matrix modules

Browse source
This commit is contained in:
ganfra 2023-01-20 17:27:47 +01:00
parent bbbbc3495d
commit 907d7eba75
87 changed files with 217 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
View file

@ -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

2
app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
View file

@ -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)

2
app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
View file

@ -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)

4
app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt
View file

@ -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<Unit> {

8
app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt
View file

@ -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(

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

@ -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

6
app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
View file

@ -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

2
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt
View file

@ -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

2
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt
View file

@ -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

2
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
View file

@ -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)

2
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt
View file

@ -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(

2
features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt
View file

@ -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

6
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt
View file

@ -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

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt
View file

@ -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(

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt
View file

@ -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

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt
View file

@ -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

10
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt
View file

@ -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

12
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt
View file

@ -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

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt
View file

@ -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

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt
View file

@ -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

4
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt
View file

@ -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

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt
View file

@ -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<MatrixTimelineItem>,

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt
View file

@ -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 {

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt
View file

@ -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,

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt
View file

@ -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,

4
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt
View file

@ -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(

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt
View file

@ -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(

8
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt
View file

@ -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

6
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt
View file

@ -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

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
View file

@ -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

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt
View file

@ -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(

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt
View file

@ -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

4
features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt
View file

@ -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

2
libraries/designsystem/build.gradle.kts
View file

@ -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

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt
View file

@ -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

2
libraries/matrix/build.gradle.kts
View file

@ -23,7 +23,7 @@ plugins {
}
android {
namespace = "io.element.android.x.matrix"
namespace = "io.element.android.libraries.matrix"
}
anvil {

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt
View file

@ -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"

14
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt
View file

@ -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

30
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt
View file

@ -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

6
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt
View file

@ -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 {

14
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt
View file

@ -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

6
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt
View file

@ -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
/**

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt
View file

@ -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

4
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt
View file

@ -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 {

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt
View file

@ -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

6
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt
View file

@ -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

8
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt
View file

@ -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 {

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt
View file

@ -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

6
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt
View file

@ -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

8
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt
View file

@ -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

8
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt
View file

@ -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

12
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt
View file

@ -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

8
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt
View file

@ -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,

8
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt
View file

@ -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 {

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt
View file

@ -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

4
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt
View file

@ -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}")

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt
View file

@ -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

6
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt
View file

@ -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

4
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt
View file

@ -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

8
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt
View file

@ -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,

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt
View file

@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt → libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt
View file

@ -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

2
libraries/matrixtest/build.gradle.kts
View file

@ -21,7 +21,7 @@ plugins {
}
android {
namespace = "io.element.android.x.libraries.matrix.test"
namespace = "io.element.android.libraries.matrix.test"
}
dependencies {

22
libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt → libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt
View file

@ -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 {

4
libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt → libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt
View file

@ -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? {

12
libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt → libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt
View file

@ -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

6
libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt → libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt
View file

@ -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

8
libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt → libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt
View file

@ -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

2
libraries/matrixui/build.gradle.kts
View file

@ -22,7 +22,7 @@ plugins {
}
android {
namespace = "io.element.android.x.matrix.ui"
namespace = "io.element.android.libraries.matrix.ui"
}
anvil {

12
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt
View file

@ -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

10
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
View file

@ -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(

10
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
View file

@ -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(

6
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt
View file

@ -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 {

4
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
View file

@ -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(

8
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt
View file

@ -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(

4
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
View file

@ -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<MediaResolver.Meta> {
override fun key(data: MediaResolver.Meta, options: Options): String? {

6
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt → libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt
View file

@ -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(

2
libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt
View file

@ -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 {