Sulkta-OSS/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
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