diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt index 9a07c04f57..aa33641318 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt @@ -49,11 +49,11 @@ import io.element.android.features.createroom.api.CreateRoomEntryPoint import io.element.android.features.ftue.api.FtueEntryPoint import io.element.android.features.ftue.api.state.FtueService import io.element.android.features.ftue.api.state.FtueState +import io.element.android.features.home.api.HomeEntryPoint import io.element.android.features.logout.api.LogoutEntryPoint import io.element.android.features.preferences.api.PreferencesEntryPoint import io.element.android.features.roomdirectory.api.RoomDescription import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint -import io.element.android.features.roomlist.api.RoomListEntryPoint import io.element.android.features.securebackup.api.SecureBackupEntryPoint import io.element.android.features.share.api.ShareEntryPoint import io.element.android.features.userprofile.api.UserProfileEntryPoint @@ -90,6 +90,15 @@ import java.time.Duration import java.time.Instant import java.util.Optional import java.util.UUID +import kotlin.collections.List +import kotlin.collections.any +import kotlin.collections.emptyList +import kotlin.collections.first +import kotlin.collections.forEach +import kotlin.collections.listOf +import kotlin.collections.mapNotNull +import kotlin.collections.plus +import kotlin.collections.setOf import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds import kotlin.time.toKotlinDuration @@ -98,7 +107,7 @@ import kotlin.time.toKotlinDuration class LoggedInFlowNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, - private val roomListEntryPoint: RoomListEntryPoint, + private val homeEntryPoint: HomeEntryPoint, private val preferencesEntryPoint: PreferencesEntryPoint, private val createRoomEntryPoint: CreateRoomEntryPoint, private val appNavigationStateService: AppNavigationStateService, @@ -160,7 +169,7 @@ class LoggedInFlowNode @AssistedInject constructor( // Otherwise, the RoomList UI may be incorrectly displayed on top withTimeout(5.seconds) { backstack.elements.first { elements -> - elements.any { it.key.navTarget == NavTarget.RoomList } + elements.any { it.key.navTarget == NavTarget.Home } } } @@ -185,7 +194,7 @@ class LoggedInFlowNode @AssistedInject constructor( when (ftueState) { is FtueState.Unknown -> Unit // Nothing to do is FtueState.Incomplete -> backstack.safeRoot(NavTarget.Ftue) - is FtueState.Complete -> backstack.safeRoot(NavTarget.RoomList) + is FtueState.Complete -> backstack.safeRoot(NavTarget.Home) } } .launchIn(lifecycleScope) @@ -212,7 +221,7 @@ class LoggedInFlowNode @AssistedInject constructor( data object LoggedInPermanent : NavTarget @Parcelize - data object RoomList : NavTarget + data object Home : NavTarget @Parcelize data class Room( @@ -269,8 +278,8 @@ class LoggedInFlowNode @AssistedInject constructor( } createNode(buildContext, listOf(callback)) } - NavTarget.RoomList -> { - val callback = object : RoomListEntryPoint.Callback { + NavTarget.Home -> { + val callback = object : HomeEntryPoint.Callback { override fun onRoomClick(roomId: RoomId) { backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias())) } @@ -303,7 +312,7 @@ class LoggedInFlowNode @AssistedInject constructor( backstack.push(NavTarget.LogoutForNativeSlidingSyncMigrationNeeded) } } - roomListEntryPoint + homeEntryPoint .nodeBuilder(this, buildContext) .callback(callback) .build() @@ -487,7 +496,7 @@ class LoggedInFlowNode @AssistedInject constructor( clearBackstack: Boolean, ) { waitForNavTargetAttached { navTarget -> - navTarget is NavTarget.RoomList + navTarget is NavTarget.Home } attachChild { val roomNavTarget = NavTarget.Room( @@ -504,7 +513,7 @@ class LoggedInFlowNode @AssistedInject constructor( suspend fun attachUser(userId: UserId) { waitForNavTargetAttached { navTarget -> - navTarget is NavTarget.RoomList + navTarget is NavTarget.Home } attachChild { backstack.push( @@ -517,7 +526,7 @@ class LoggedInFlowNode @AssistedInject constructor( internal suspend fun attachIncomingShare(intent: Intent) { waitForNavTargetAttached { navTarget -> - navTarget is NavTarget.RoomList + navTarget is NavTarget.Home } attachChild { backstack.push( @@ -555,7 +564,7 @@ private class AttachRoomOperation( return if (clearBackstack) { // Makes sure the room list target is alone in the backstack and stashed elements.mapNotNull { element -> - if (element.key.navTarget == LoggedInFlowNode.NavTarget.RoomList) { + if (element.key.navTarget == LoggedInFlowNode.NavTarget.Home) { element.transitionTo(STASHED, this) } else { null diff --git a/features/roomlist/api/build.gradle.kts b/features/home/api/build.gradle.kts similarity index 86% rename from features/roomlist/api/build.gradle.kts rename to features/home/api/build.gradle.kts index e7486a80c0..c1aee95e67 100644 --- a/features/roomlist/api/build.gradle.kts +++ b/features/home/api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - namespace = "io.element.android.features.roomlist.api" + namespace = "io.element.android.features.home.api" } dependencies { diff --git a/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt similarity index 91% rename from features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt rename to features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt index 44a44f26cb..0f6ee581bb 100644 --- a/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt +++ b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.api +package io.element.android.features.home.api import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node @@ -13,7 +13,7 @@ import com.bumble.appyx.core.plugin.Plugin import io.element.android.libraries.architecture.FeatureEntryPoint import io.element.android.libraries.matrix.api.core.RoomId -interface RoomListEntryPoint : FeatureEntryPoint { +interface HomeEntryPoint : FeatureEntryPoint { fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder interface NodeBuilder { fun callback(callback: Callback): NodeBuilder diff --git a/features/roomlist/impl/build.gradle.kts b/features/home/impl/build.gradle.kts similarity index 96% rename from features/roomlist/impl/build.gradle.kts rename to features/home/impl/build.gradle.kts index e0d795efd6..5ea238081b 100644 --- a/features/roomlist/impl/build.gradle.kts +++ b/features/home/impl/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } android { - namespace = "io.element.android.features.roomlist.impl" + namespace = "io.element.android.features.home.impl" testOptions { unitTests { @@ -52,7 +52,7 @@ dependencies { implementation(projects.services.analytics.api) implementation(libs.androidx.datastore.preferences) implementation(projects.features.reportroom.api) - api(projects.features.roomlist.api) + api(projects.features.home.api) testImplementation(libs.androidx.compose.ui.test.junit) testReleaseImplementation(libs.androidx.compose.ui.test.manifest) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt similarity index 62% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt index cb97dda171..3fe5c533d7 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt @@ -5,30 +5,30 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.features.roomlist.api.RoomListEntryPoint +import io.element.android.features.home.api.HomeEntryPoint import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.AppScope import javax.inject.Inject @ContributesBinding(AppScope::class) -class DefaultRoomListEntryPoint @Inject constructor() : RoomListEntryPoint { - override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomListEntryPoint.NodeBuilder { +class DefaultHomeEntryPoint @Inject constructor() : HomeEntryPoint { + override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): HomeEntryPoint.NodeBuilder { val plugins = ArrayList() - return object : RoomListEntryPoint.NodeBuilder { - override fun callback(callback: RoomListEntryPoint.Callback): RoomListEntryPoint.NodeBuilder { + return object : HomeEntryPoint.NodeBuilder { + override fun callback(callback: HomeEntryPoint.Callback): HomeEntryPoint.NodeBuilder { plugins += callback return this } override fun build(): Node { - return parentNode.createNode(buildContext, plugins) + return parentNode.createNode(buildContext, plugins) } } } diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListFlowNode.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt similarity index 85% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListFlowNode.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt index 208a90e606..c21cb2093b 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListFlowNode.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import android.app.Activity import android.os.Parcelable @@ -24,14 +24,14 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import im.vector.app.features.analytics.plan.MobileScreen import io.element.android.anvilannotations.ContributesNode +import io.element.android.features.home.api.HomeEntryPoint +import io.element.android.features.home.impl.components.RoomListMenuAction +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.features.invite.api.InviteData import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteView import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint import io.element.android.features.logout.api.direct.DirectLogoutView import io.element.android.features.reportroom.api.ReportRoomEntryPoint -import io.element.android.features.roomlist.api.RoomListEntryPoint -import io.element.android.features.roomlist.impl.components.RoomListMenuAction -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary import io.element.android.libraries.architecture.BackstackView import io.element.android.libraries.architecture.BaseFlowNode import io.element.android.libraries.deeplink.usecase.InviteFriendsUseCase @@ -41,7 +41,7 @@ import io.element.android.services.analytics.api.AnalyticsService import kotlinx.parcelize.Parcelize @ContributesNode(SessionScope::class) -class RoomListFlowNode @AssistedInject constructor( +class HomeFlowNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, private val presenter: RoomListPresenter, @@ -51,7 +51,7 @@ class RoomListFlowNode @AssistedInject constructor( private val directLogoutView: DirectLogoutView, private val reportRoomEntryPoint: ReportRoomEntryPoint, private val declineInviteAndBlockUserEntryPoint: DeclineInviteAndBlockEntryPoint, -) : BaseFlowNode( +) : BaseFlowNode( backstack = BackStack( initialElement = NavTarget.Root, savedStateMap = buildContext.savedStateMap, @@ -79,27 +79,27 @@ class RoomListFlowNode @AssistedInject constructor( } private fun onRoomClick(roomId: RoomId) { - plugins().forEach { it.onRoomClick(roomId) } + plugins().forEach { it.onRoomClick(roomId) } } private fun onOpenSettings() { - plugins().forEach { it.onSettingsClick() } + plugins().forEach { it.onSettingsClick() } } private fun onCreateRoomClick() { - plugins().forEach { it.onCreateRoomClick() } + plugins().forEach { it.onCreateRoomClick() } } private fun onSetUpRecoveryClick() { - plugins().forEach { it.onSetUpRecoveryClick() } + plugins().forEach { it.onSetUpRecoveryClick() } } private fun onSessionConfirmRecoveryKeyClick() { - plugins().forEach { it.onSessionConfirmRecoveryKeyClick() } + plugins().forEach { it.onSessionConfirmRecoveryKeyClick() } } private fun onRoomSettingsClick(roomId: RoomId) { - plugins().forEach { it.onRoomSettingsClick(roomId) } + plugins().forEach { it.onRoomSettingsClick(roomId) } } private fun onReportRoomClick(roomId: RoomId) { @@ -116,7 +116,7 @@ class RoomListFlowNode @AssistedInject constructor( inviteFriendsUseCase.execute(activity) } RoomListMenuAction.ReportBug -> { - plugins().forEach { it.onReportBugClick() } + plugins().forEach { it.onReportBugClick() } } } } diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListContentStateProvider.kt similarity index 94% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListContentStateProvider.kt index 5825c0a1e5..28edbc73a0 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListContentStateProvider.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState import io.element.android.libraries.matrix.api.core.RoomId diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListContextMenu.kt similarity index 99% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListContextMenu.kt index 10a591bcbd..bb0cd060e3 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListContextMenu.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenu.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListDeclineInviteMenu.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenu.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListDeclineInviteMenu.kt index 0f986999f8..452f6e472b 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenu.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListDeclineInviteMenu.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -20,7 +20,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Button diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListEvents.kt similarity index 91% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListEvents.kt index b17b45b86b..e5d74e7f70 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListEvents.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.libraries.matrix.api.core.RoomId sealed interface RoomListEvents { diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListPresenter.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListPresenter.kt index 9e8199cd80..c192c1bc58 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListPresenter.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -23,6 +23,10 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import im.vector.app.features.analytics.plan.Interaction +import io.element.android.features.home.impl.datasource.RoomListDataSource +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.search.RoomListSearchEvents +import io.element.android.features.home.impl.search.RoomListSearchState import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.AcceptInvite import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.DeclineInvite @@ -31,10 +35,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomEvent.ShowConfirmation import io.element.android.features.leaveroom.api.LeaveRoomState import io.element.android.features.logout.api.direct.DirectLogoutState import io.element.android.features.rageshake.api.RageshakeFeatureAvailability -import io.element.android.features.roomlist.impl.datasource.RoomListDataSource -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.search.RoomListSearchEvents -import io.element.android.features.roomlist.impl.search.RoomListSearchState import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListState.kt similarity index 91% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListState.kt index 0cf6147df7..3c515192d8 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListState.kt @@ -5,15 +5,15 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.runtime.Immutable +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.search.RoomListSearchState import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState import io.element.android.features.leaveroom.api.LeaveRoomState import io.element.android.features.logout.api.direct.DirectLogoutState -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.search.RoomListSearchState import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState import io.element.android.libraries.matrix.api.core.RoomId diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateContextMenuShownProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListStateContextMenuShownProvider.kt similarity index 95% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateContextMenuShownProvider.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListStateContextMenuShownProvider.kt index 2f347a1659..39175f3ce6 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateContextMenuShownProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListStateContextMenuShownProvider.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.ui.tooling.preview.PreviewParameterProvider import io.element.android.libraries.matrix.api.core.RoomId diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListStateProvider.kt similarity index 90% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListStateProvider.kt index 6b8b3f5ff9..378a4a9b44 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListStateProvider.kt @@ -5,23 +5,23 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.ui.tooling.preview.PreviewParameterProvider +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.filters.aRoomListFiltersState +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomSummaryDisplayType +import io.element.android.features.home.impl.model.aRoomListRoomSummary +import io.element.android.features.home.impl.model.anInviteSender +import io.element.android.features.home.impl.search.RoomListSearchState +import io.element.android.features.home.impl.search.aRoomListSearchState import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState import io.element.android.features.leaveroom.api.LeaveRoomState import io.element.android.features.leaveroom.api.aLeaveRoomState import io.element.android.features.logout.api.direct.DirectLogoutState import io.element.android.features.logout.api.direct.aDirectLogoutState -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType -import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary -import io.element.android.features.roomlist.impl.model.anInviteSender -import io.element.android.features.roomlist.impl.search.RoomListSearchState -import io.element.android.features.roomlist.impl.search.aRoomListSearchState import io.element.android.libraries.architecture.AsyncAction import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListView.kt similarity index 95% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListView.kt index b00796c1fe..11bda8546a 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/RoomListView.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -25,13 +25,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.PreviewParameter import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons +import io.element.android.features.home.impl.components.RoomListContentView +import io.element.android.features.home.impl.components.RoomListMenuAction +import io.element.android.features.home.impl.components.RoomListTopBar +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.search.RoomListSearchView import io.element.android.features.leaveroom.api.LeaveRoomView import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorContainer -import io.element.android.features.roomlist.impl.components.RoomListContentView -import io.element.android.features.roomlist.impl.components.RoomListMenuAction -import io.element.android.features.roomlist.impl.components.RoomListTopBar -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.search.RoomListSearchView import io.element.android.libraries.androidutils.throttler.FirstThrottler import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BannerPadding.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt similarity index 88% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BannerPadding.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt index a609d5dc7d..389c2aecfb 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BannerPadding.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.foundation.layout.padding import androidx.compose.ui.Modifier diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt similarity index 93% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt index 8fde1834d2..017ca9592d 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt @@ -5,12 +5,12 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R import io.element.android.libraries.designsystem.components.Announcement import io.element.android.libraries.designsystem.components.AnnouncementType import io.element.android.libraries.designsystem.preview.ElementPreview diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt similarity index 92% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt index 3ae7750fa3..c833e2914a 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt @@ -5,12 +5,12 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R import io.element.android.libraries.designsystem.components.Announcement import io.element.android.libraries.designsystem.components.AnnouncementType import io.element.android.libraries.designsystem.preview.ElementPreview diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt similarity index 94% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt index 339b5f4fa6..e89392da62 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt @@ -5,12 +5,12 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R import io.element.android.libraries.designsystem.components.Announcement import io.element.android.libraries.designsystem.components.AnnouncementType import io.element.android.libraries.designsystem.preview.ElementPreview diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt similarity index 91% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt index b27f21c7f6..35c582c58e 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement @@ -34,19 +34,19 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons -import io.element.android.features.roomlist.impl.R -import io.element.android.features.roomlist.impl.RoomListContentState -import io.element.android.features.roomlist.impl.RoomListContentStateProvider -import io.element.android.features.roomlist.impl.RoomListEvents -import io.element.android.features.roomlist.impl.SecurityBannerState -import io.element.android.features.roomlist.impl.contentType -import io.element.android.features.roomlist.impl.filters.RoomListFilter -import io.element.android.features.roomlist.impl.filters.RoomListFiltersEmptyStateResources -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState -import io.element.android.features.roomlist.impl.filters.selection.FilterSelectionState -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType +import io.element.android.features.home.impl.R +import io.element.android.features.home.impl.RoomListContentState +import io.element.android.features.home.impl.RoomListContentStateProvider +import io.element.android.features.home.impl.RoomListEvents +import io.element.android.features.home.impl.SecurityBannerState +import io.element.android.features.home.impl.contentType +import io.element.android.features.home.impl.filters.RoomListFilter +import io.element.android.features.home.impl.filters.RoomListFiltersEmptyStateResources +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.filters.aRoomListFiltersState +import io.element.android.features.home.impl.filters.selection.FilterSelectionState +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomSummaryDisplayType import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Button diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListMenuAction.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt similarity index 81% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListMenuAction.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt index 14f46098ac..9f17fc835e 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListMenuAction.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components enum class RoomListMenuAction { InviteFriends, diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt index bee535d8cd..4c21d296e2 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -40,10 +40,9 @@ import androidx.compose.ui.unit.dp import io.element.android.appconfig.RoomListConfig import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons -import io.element.android.features.roomlist.impl.R -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.filters.RoomListFiltersView -import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.filters.RoomListFiltersView +import io.element.android.features.home.impl.filters.aRoomListFiltersState import io.element.android.libraries.designsystem.atomic.atoms.RedIndicatorAtom import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryPlaceholderRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt similarity index 98% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryPlaceholderRow.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt index af980c1b09..f07fe880b3 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryPlaceholderRow.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt index d6ad371beb..95d54f42ef 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -37,11 +37,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons -import io.element.android.features.roomlist.impl.R -import io.element.android.features.roomlist.impl.RoomListEvents -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider -import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType +import io.element.android.features.home.impl.R +import io.element.android.features.home.impl.RoomListEvents +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomListRoomSummaryProvider +import io.element.android.features.home.impl.model.RoomSummaryDisplayType import io.element.android.libraries.core.extensions.orEmpty import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom import io.element.android.libraries.designsystem.components.avatar.Avatar diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/SetUpRecoveryKeyBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt similarity index 92% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/SetUpRecoveryKeyBanner.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt index e1d251de8b..37aed6d130 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/SetUpRecoveryKeyBanner.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt @@ -5,12 +5,12 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.components +package io.element.android.features.home.impl.components import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R import io.element.android.libraries.designsystem.components.Announcement import io.element.android.libraries.designsystem.components.AnnouncementType import io.element.android.libraries.designsystem.preview.ElementPreview diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt index 6d59837988..dcda64ca9c 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.datasource +package io.element.android.features.home.impl.datasource -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.libraries.androidutils.diff.DiffCacheUpdater import io.element.android.libraries.androidutils.diff.MutableListDiffCache import io.element.android.libraries.androidutils.system.DateTimeObserver diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt similarity index 93% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt index 98b7f8d853..3d77662188 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.datasource +package io.element.android.features.home.impl.datasource -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomSummaryDisplayType import io.element.android.libraries.core.extensions.orEmpty import io.element.android.libraries.dateformatter.api.DateFormatter import io.element.android.libraries.dateformatter.api.DateFormatterMode diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/di/RoomListModule.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt similarity index 65% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/di/RoomListModule.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt index a9c2f1c80b..19505402da 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/di/RoomListModule.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt @@ -5,15 +5,15 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.di +package io.element.android.features.home.impl.di import com.squareup.anvil.annotations.ContributesTo import dagger.Binds import dagger.Module -import io.element.android.features.roomlist.impl.filters.RoomListFiltersPresenter -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.search.RoomListSearchPresenter -import io.element.android.features.roomlist.impl.search.RoomListSearchState +import io.element.android.features.home.impl.filters.RoomListFiltersPresenter +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.search.RoomListSearchPresenter +import io.element.android.features.home.impl.search.RoomListSearchState import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.di.SessionScope diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFilter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt similarity index 90% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFilter.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt index 324dd1eb3d..2c7ebc3573 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFilter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R /** * Enum class representing the different filters that can be applied to the room list. diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEmptyStateResources.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt similarity index 96% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEmptyStateResources.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt index a0c4878715..61436a0054 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEmptyStateResources.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import androidx.annotation.StringRes -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R /** * Holds the resources for the empty state when filters are applied to the room list. diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt similarity index 86% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEvents.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt index 42559995f6..13fcc656e8 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEvents.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters sealed interface RoomListFiltersEvents { data class ToggleFilter(val filter: RoomListFilter) : RoomListFiltersEvents diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt similarity index 94% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt index 0213d3fc15..de3f7eaa0b 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt @@ -5,12 +5,12 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.produceState -import io.element.android.features.roomlist.impl.filters.selection.FilterSelectionStrategy +import io.element.android.features.home.impl.filters.selection.FilterSelectionStrategy import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.matrix.api.roomlist.RoomListService import kotlinx.collections.immutable.toPersistentList diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt similarity index 83% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt index 3e72aa680b..bb4146ce84 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters -import io.element.android.features.roomlist.impl.filters.selection.FilterSelectionState +import io.element.android.features.home.impl.filters.selection.FilterSelectionState import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toPersistentList diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt similarity index 87% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersStateProvider.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt index e104651af9..8cba01163c 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersStateProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import io.element.android.features.roomlist.impl.filters.selection.FilterSelectionState +import io.element.android.features.home.impl.filters.selection.FilterSelectionState import kotlinx.collections.immutable.toImmutableList class RoomListFiltersStateProvider : PreviewParameterProvider { diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt similarity index 99% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt index 6cb94d9f96..8e2b4d4a22 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/DefaultFilterSelectionStrategy.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt similarity index 92% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/DefaultFilterSelectionStrategy.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt index c89615fea7..26a77da5c7 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/DefaultFilterSelectionStrategy.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters.selection +package io.element.android.features.home.impl.filters.selection import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.features.roomlist.impl.filters.RoomListFilter +import io.element.android.features.home.impl.filters.RoomListFilter import io.element.android.libraries.di.SessionScope import kotlinx.coroutines.flow.MutableStateFlow import javax.inject.Inject diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/FilterSelectionState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt similarity index 67% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/FilterSelectionState.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt index 62ed9f08a3..d604e51f84 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/FilterSelectionState.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters.selection +package io.element.android.features.home.impl.filters.selection -import io.element.android.features.roomlist.impl.filters.RoomListFilter +import io.element.android.features.home.impl.filters.RoomListFilter data class FilterSelectionState( val filter: RoomListFilter, diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/FilterSelectionStrategy.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt similarity index 82% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/FilterSelectionStrategy.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt index c8d3c09fec..8396a4e2a2 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/selection/FilterSelectionStrategy.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters.selection +package io.element.android.features.home.impl.filters.selection -import io.element.android.features.roomlist.impl.filters.RoomListFilter +import io.element.android.features.home.impl.filters.RoomListFilter import kotlinx.coroutines.flow.StateFlow interface FilterSelectionStrategy { diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt index 4b2c1e7afc..3f166a66b4 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.model +package io.element.android.features.home.impl.model import androidx.compose.runtime.Immutable import io.element.android.features.invite.api.InviteData diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt similarity index 99% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt index 111c4bc86b..f06e5a1a27 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.model +package io.element.android.features.home.impl.model import androidx.compose.ui.tooling.preview.PreviewParameterProvider import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomSummaryDisplayType.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt similarity index 86% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomSummaryDisplayType.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt index 4b472d8847..8fcef46faf 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomSummaryDisplayType.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.model +package io.element.android.features.home.impl.model /** * Represents the type of display for a room list item. diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchDataSource.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt similarity index 90% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchDataSource.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt index 34152a7e65..6840809480 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchDataSource.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search -import io.element.android.features.roomlist.impl.datasource.RoomListRoomSummaryFactory -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.datasource.RoomListRoomSummaryFactory +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.matrix.api.roomlist.RoomList import io.element.android.libraries.matrix.api.roomlist.RoomListFilter diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt similarity index 87% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchEvents.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt index b8248d09f5..26f713da81 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchEvents.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search sealed interface RoomListSearchEvents { data object ToggleSearchVisibility : RoomListSearchEvents diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt similarity index 97% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenter.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt index 7a6ec51259..b4d151fe02 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt similarity index 76% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchState.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt index e6bac06ca5..9d50f52a33 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchState.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt @@ -5,9 +5,9 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomListRoomSummary import kotlinx.collections.immutable.ImmutableList data class RoomListSearchState( diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt similarity index 84% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchStateProvider.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt index 640adc7306..cdc69ec0d6 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchStateProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt @@ -5,11 +5,11 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import io.element.android.features.roomlist.impl.aRoomListRoomSummaryList -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.aRoomListRoomSummaryList +import io.element.android.features.home.impl.model.RoomListRoomSummary import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt similarity index 95% rename from features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt index bfb2011dd5..bbefebbf38 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility @@ -34,10 +34,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.tokens.generated.CompoundIcons -import io.element.android.features.roomlist.impl.RoomListEvents -import io.element.android.features.roomlist.impl.components.RoomSummaryRow -import io.element.android.features.roomlist.impl.contentType -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.RoomListEvents +import io.element.android.features.home.impl.components.RoomSummaryRow +import io.element.android.features.home.impl.contentType +import io.element.android.features.home.impl.model.RoomListRoomSummary import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.modifiers.applyIf import io.element.android.libraries.designsystem.preview.ElementPreview diff --git a/features/roomlist/impl/src/main/res/values-be/translations.xml b/features/home/impl/src/main/res/values-be/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-be/translations.xml rename to features/home/impl/src/main/res/values-be/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-bg/translations.xml b/features/home/impl/src/main/res/values-bg/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-bg/translations.xml rename to features/home/impl/src/main/res/values-bg/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-cs/translations.xml b/features/home/impl/src/main/res/values-cs/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-cs/translations.xml rename to features/home/impl/src/main/res/values-cs/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-cy/translations.xml b/features/home/impl/src/main/res/values-cy/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-cy/translations.xml rename to features/home/impl/src/main/res/values-cy/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-de/translations.xml b/features/home/impl/src/main/res/values-de/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-de/translations.xml rename to features/home/impl/src/main/res/values-de/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-el/translations.xml b/features/home/impl/src/main/res/values-el/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-el/translations.xml rename to features/home/impl/src/main/res/values-el/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-en-rUS/translations.xml b/features/home/impl/src/main/res/values-en-rUS/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-en-rUS/translations.xml rename to features/home/impl/src/main/res/values-en-rUS/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-es/translations.xml b/features/home/impl/src/main/res/values-es/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-es/translations.xml rename to features/home/impl/src/main/res/values-es/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-et/translations.xml b/features/home/impl/src/main/res/values-et/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-et/translations.xml rename to features/home/impl/src/main/res/values-et/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-eu/translations.xml b/features/home/impl/src/main/res/values-eu/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-eu/translations.xml rename to features/home/impl/src/main/res/values-eu/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-fa/translations.xml b/features/home/impl/src/main/res/values-fa/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-fa/translations.xml rename to features/home/impl/src/main/res/values-fa/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-fi/translations.xml b/features/home/impl/src/main/res/values-fi/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-fi/translations.xml rename to features/home/impl/src/main/res/values-fi/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-fr/translations.xml b/features/home/impl/src/main/res/values-fr/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-fr/translations.xml rename to features/home/impl/src/main/res/values-fr/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-hu/translations.xml b/features/home/impl/src/main/res/values-hu/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-hu/translations.xml rename to features/home/impl/src/main/res/values-hu/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-in/translations.xml b/features/home/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-in/translations.xml rename to features/home/impl/src/main/res/values-in/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-it/translations.xml b/features/home/impl/src/main/res/values-it/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-it/translations.xml rename to features/home/impl/src/main/res/values-it/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-ka/translations.xml b/features/home/impl/src/main/res/values-ka/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-ka/translations.xml rename to features/home/impl/src/main/res/values-ka/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-lt/translations.xml b/features/home/impl/src/main/res/values-lt/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-lt/translations.xml rename to features/home/impl/src/main/res/values-lt/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-nb/translations.xml b/features/home/impl/src/main/res/values-nb/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-nb/translations.xml rename to features/home/impl/src/main/res/values-nb/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-nl/translations.xml b/features/home/impl/src/main/res/values-nl/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-nl/translations.xml rename to features/home/impl/src/main/res/values-nl/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-pl/translations.xml b/features/home/impl/src/main/res/values-pl/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-pl/translations.xml rename to features/home/impl/src/main/res/values-pl/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-pt-rBR/translations.xml b/features/home/impl/src/main/res/values-pt-rBR/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-pt-rBR/translations.xml rename to features/home/impl/src/main/res/values-pt-rBR/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-pt/translations.xml b/features/home/impl/src/main/res/values-pt/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-pt/translations.xml rename to features/home/impl/src/main/res/values-pt/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-ro/translations.xml b/features/home/impl/src/main/res/values-ro/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-ro/translations.xml rename to features/home/impl/src/main/res/values-ro/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-ru/translations.xml b/features/home/impl/src/main/res/values-ru/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-ru/translations.xml rename to features/home/impl/src/main/res/values-ru/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-sk/translations.xml b/features/home/impl/src/main/res/values-sk/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-sk/translations.xml rename to features/home/impl/src/main/res/values-sk/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-sv/translations.xml b/features/home/impl/src/main/res/values-sv/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-sv/translations.xml rename to features/home/impl/src/main/res/values-sv/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-tr/translations.xml b/features/home/impl/src/main/res/values-tr/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-tr/translations.xml rename to features/home/impl/src/main/res/values-tr/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-uk/translations.xml b/features/home/impl/src/main/res/values-uk/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-uk/translations.xml rename to features/home/impl/src/main/res/values-uk/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-ur/translations.xml b/features/home/impl/src/main/res/values-ur/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-ur/translations.xml rename to features/home/impl/src/main/res/values-ur/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-uz/translations.xml b/features/home/impl/src/main/res/values-uz/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-uz/translations.xml rename to features/home/impl/src/main/res/values-uz/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-zh-rTW/translations.xml b/features/home/impl/src/main/res/values-zh-rTW/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-zh-rTW/translations.xml rename to features/home/impl/src/main/res/values-zh-rTW/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-zh/translations.xml b/features/home/impl/src/main/res/values-zh/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-zh/translations.xml rename to features/home/impl/src/main/res/values-zh/translations.xml diff --git a/features/roomlist/impl/src/main/res/values/localazy.xml b/features/home/impl/src/main/res/values/localazy.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values/localazy.xml rename to features/home/impl/src/main/res/values/localazy.xml diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListContextMenuTest.kt similarity index 99% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListContextMenuTest.kt index 6becb39e7a..7496f4ddfb 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListContextMenuTest.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.activity.ComponentActivity import androidx.compose.ui.test.junit4.AndroidComposeTestRule diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenuTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListDeclineInviteMenuTest.kt similarity index 96% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenuTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListDeclineInviteMenuTest.kt index 8c75027ec5..098a32bf81 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenuTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListDeclineInviteMenuTest.kt @@ -5,12 +5,12 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.activity.ComponentActivity import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary +import io.element.android.features.home.impl.model.aRoomListRoomSummary import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.tests.testutils.EnsureCalledOnceWithParam import io.element.android.tests.testutils.EnsureNeverCalledWithParam diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListPresenterTest.kt similarity index 98% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListPresenterTest.kt index db605b5b6c..89d4e7b5fd 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListPresenterTest.kt @@ -5,13 +5,21 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import app.cash.molecule.RecompositionMode import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import im.vector.app.features.analytics.plan.Interaction +import io.element.android.features.home.impl.datasource.RoomListDataSource +import io.element.android.features.home.impl.datasource.aRoomListRoomSummaryFactory +import io.element.android.features.home.impl.filters.RoomListFiltersState +import io.element.android.features.home.impl.filters.aRoomListFiltersState +import io.element.android.features.home.impl.model.createRoomListRoomSummary +import io.element.android.features.home.impl.search.RoomListSearchEvents +import io.element.android.features.home.impl.search.RoomListSearchState +import io.element.android.features.home.impl.search.aRoomListSearchState import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState @@ -21,14 +29,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomState import io.element.android.features.leaveroom.api.aLeaveRoomState import io.element.android.features.logout.api.direct.aDirectLogoutState import io.element.android.features.rageshake.api.RageshakeFeatureAvailability -import io.element.android.features.roomlist.impl.datasource.RoomListDataSource -import io.element.android.features.roomlist.impl.datasource.aRoomListRoomSummaryFactory -import io.element.android.features.roomlist.impl.filters.RoomListFiltersState -import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState -import io.element.android.features.roomlist.impl.model.createRoomListRoomSummary -import io.element.android.features.roomlist.impl.search.RoomListSearchEvents -import io.element.android.features.roomlist.impl.search.RoomListSearchState -import io.element.android.features.roomlist.impl.search.aRoomListSearchState import io.element.android.libraries.androidutils.system.DateTimeObserver import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.dateformatter.api.DateFormatter diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListState.kt similarity index 84% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListState.kt index faf3fcfb5c..26069bba4f 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListState.kt @@ -5,6 +5,6 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl internal fun RoomListState.contentAsRooms() = contentState as RoomListContentState.Rooms diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListViewTest.kt similarity index 97% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListViewTest.kt index 60da841e96..77d805601e 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/RoomListViewTest.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl +package io.element.android.features.home.impl import androidx.activity.ComponentActivity import androidx.compose.ui.test.junit4.AndroidComposeTestRule @@ -16,9 +16,9 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTouchInput import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.element.android.features.roomlist.impl.components.RoomListMenuAction -import io.element.android.features.roomlist.impl.model.RoomListRoomSummary -import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType +import io.element.android.features.home.impl.components.RoomListMenuAction +import io.element.android.features.home.impl.model.RoomListRoomSummary +import io.element.android.features.home.impl.model.RoomSummaryDisplayType import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.tests.testutils.EnsureNeverCalled diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt similarity index 97% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt index bcb6552d30..03fe2efd94 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt @@ -5,11 +5,11 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.datasource +package io.element.android.features.home.impl.datasource import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.roomlist.impl.FakeDateTimeObserver +import io.element.android.features.home.impl.FakeDateTimeObserver import io.element.android.libraries.androidutils.system.DateTimeObserver import io.element.android.libraries.dateformatter.test.FakeDateFormatter import io.element.android.libraries.matrix.api.roomlist.RoomListService diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt similarity index 92% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt index 86c0981d4f..95444b6c4f 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.datasource +package io.element.android.features.home.impl.datasource import io.element.android.libraries.dateformatter.api.DateFormatter import io.element.android.libraries.dateformatter.test.FakeDateFormatter diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt similarity index 97% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt index 67ef79ac81..3f4f45afae 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt @@ -5,10 +5,10 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import com.google.common.truth.Truth.assertThat -import io.element.android.features.roomlist.impl.R +import io.element.android.features.home.impl.R import org.junit.Test class RoomListFiltersEmptyStateResourcesTest { diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt similarity index 95% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt index 560e5f938e..a71afca607 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt @@ -5,14 +5,14 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import app.cash.molecule.RecompositionMode import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.roomlist.impl.filters.selection.DefaultFilterSelectionStrategy -import io.element.android.features.roomlist.impl.filters.selection.FilterSelectionState +import io.element.android.features.home.impl.filters.selection.DefaultFilterSelectionStrategy +import io.element.android.features.home.impl.filters.selection.FilterSelectionState import io.element.android.libraries.matrix.api.roomlist.RoomListService import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService import io.element.android.tests.testutils.awaitLastSequentialItem diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt similarity index 90% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersViewTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt index 0041ef988d..1fd37d9252 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersViewTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt @@ -5,13 +5,13 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.filters +package io.element.android.features.home.impl.filters import androidx.activity.ComponentActivity import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.element.android.features.roomlist.impl.R -import io.element.android.features.roomlist.impl.filters.selection.FilterSelectionState +import io.element.android.features.home.impl.R +import io.element.android.features.home.impl.filters.selection.FilterSelectionState import io.element.android.libraries.testtags.TestTags import io.element.android.tests.testutils.EventsRecorder import io.element.android.tests.testutils.clickOn diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListBaseRoomSummaryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt similarity index 98% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListBaseRoomSummaryTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt index e6bfb1a9cb..55b3f1ffee 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListBaseRoomSummaryTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.model +package io.element.android.features.home.impl.model import com.google.common.truth.Truth.assertThat import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt similarity index 97% rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt rename to features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt index 5d69d21c1e..7649b6141e 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt @@ -5,13 +5,13 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.roomlist.impl.search +package io.element.android.features.home.impl.search import app.cash.molecule.RecompositionMode import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.roomlist.impl.datasource.aRoomListRoomSummaryFactory +import io.element.android.features.home.impl.datasource.aRoomListRoomSummaryFactory import io.element.android.libraries.dateformatter.test.FakeDateFormatter import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter import io.element.android.libraries.matrix.api.roomlist.RoomListFilter diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts index fa7aeb4bca..8eb3c5d860 100644 --- a/features/preferences/impl/build.gradle.kts +++ b/features/preferences/impl/build.gradle.kts @@ -75,8 +75,8 @@ dependencies { implementation(projects.features.licenses.api) implementation(projects.features.logout.api) implementation(projects.features.deactivation.api) + implementation(projects.features.home.api) implementation(projects.features.invite.api) - implementation(projects.features.roomlist.api) implementation(projects.services.analytics.api) implementation(projects.services.analytics.compose) implementation(projects.services.appnavstate.api) diff --git a/tools/localazy/config.json b/tools/localazy/config.json index dbe8c4221a..9d8d1f09b7 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -162,7 +162,7 @@ ] }, { - "name" : ":features:roomlist:impl", + "name" : ":features:home:impl", "includeRegex" : [ "screen_roomlist_.*", "screen\\.roomlist\\..*",