From f586114458eab40cef48a935c8ac47332d0bbabb Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 8 Apr 2024 17:22:13 +0200 Subject: [PATCH] Room navigation : rename module invitelist to invite --- .../io/element/android/appnav/LoggedInFlowNode.kt | 6 +----- features/{invitelist => invite}/api/build.gradle.kts | 2 +- .../features/invite}/api/InviteListEntryPoint.kt | 2 +- .../android/features/invite}/api/SeenInvitesStore.kt | 2 +- features/{invitelist => invite}/impl/build.gradle.kts | 6 +++--- .../invite}/impl/DefaultInviteListEntryPoint.kt | 4 ++-- .../features/invite}/impl/DefaultSeenInvitesStore.kt | 4 ++-- .../android/features/invite}/impl/InviteListEvents.kt | 4 ++-- .../android/features/invite}/impl/InviteListNode.kt | 4 ++-- .../features/invite}/impl/InviteListPresenter.kt | 8 ++++---- .../android/features/invite}/impl/InviteListState.kt | 4 ++-- .../features/invite}/impl/InviteListStateProvider.kt | 6 +++--- .../android/features/invite}/impl/InviteListView.kt | 4 ++-- .../invite}/impl/components/InviteSummaryRow.kt | 10 +++++----- .../invite}/impl/model/InviteListInviteSummary.kt | 2 +- .../impl/model/InviteListInviteSummaryProvider.kt | 2 +- .../impl/src/main/res/values-be/translations.xml | 0 .../impl/src/main/res/values-bg/translations.xml | 0 .../impl/src/main/res/values-cs/translations.xml | 0 .../impl/src/main/res/values-de/translations.xml | 0 .../impl/src/main/res/values-es/translations.xml | 0 .../impl/src/main/res/values-fr/translations.xml | 0 .../impl/src/main/res/values-hu/translations.xml | 0 .../impl/src/main/res/values-in/translations.xml | 0 .../impl/src/main/res/values-it/translations.xml | 0 .../impl/src/main/res/values-ro/translations.xml | 0 .../impl/src/main/res/values-ru/translations.xml | 0 .../impl/src/main/res/values-sk/translations.xml | 0 .../impl/src/main/res/values-sv/translations.xml | 0 .../impl/src/main/res/values-uk/translations.xml | 0 .../impl/src/main/res/values-zh-rTW/translations.xml | 0 .../impl/src/main/res/values/localazy.xml | 0 .../features/invite}/impl/InviteListPresenterTests.kt | 6 +++--- features/{invitelist => invite}/test/build.gradle.kts | 4 ++-- .../features/invite}/test/FakeSeenInvitesStore.kt | 4 ++-- features/roomlist/impl/build.gradle.kts | 4 ++-- .../impl/datasource/DefaultInviteStateDataSource.kt | 2 +- .../datasource/DefaultInviteStateDataSourceTest.kt | 2 +- samples/minimal/build.gradle.kts | 2 +- .../element/android/samples/minimal/RoomListScreen.kt | 2 +- tools/localazy/config.json | 2 +- 41 files changed, 47 insertions(+), 51 deletions(-) rename features/{invitelist => invite}/api/build.gradle.kts (92%) rename features/{invitelist/api/src/main/kotlin/io/element/android/features/invitelist => invite/api/src/main/kotlin/io/element/android/features/invite}/api/InviteListEntryPoint.kt (96%) rename features/{invitelist/api/src/main/kotlin/io/element/android/features/invitelist => invite/api/src/main/kotlin/io/element/android/features/invite}/api/SeenInvitesStore.kt (94%) rename features/{invitelist => invite}/impl/build.gradle.kts (91%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/DefaultInviteListEntryPoint.kt (92%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/DefaultSeenInvitesStore.kt (94%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/InviteListEvents.kt (88%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/InviteListNode.kt (93%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/InviteListPresenter.kt (96%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/InviteListState.kt (90%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/InviteListStateProvider.kt (93%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/InviteListView.kt (98%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/components/InviteSummaryRow.kt (94%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/model/InviteListInviteSummary.kt (96%) rename features/{invitelist/impl/src/main/kotlin/io/element/android/features/invitelist => invite/impl/src/main/kotlin/io/element/android/features/invite}/impl/model/InviteListInviteSummaryProvider.kt (96%) rename features/{invitelist => invite}/impl/src/main/res/values-be/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-bg/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-cs/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-de/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-es/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-fr/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-hu/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-in/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-it/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-ro/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-ru/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-sk/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-sv/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-uk/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values-zh-rTW/translations.xml (100%) rename features/{invitelist => invite}/impl/src/main/res/values/localazy.xml (100%) rename features/{invitelist/impl/src/test/kotlin/io/element/android/features/invitelist => invite/impl/src/test/kotlin/io/element/android/features/invite}/impl/InviteListPresenterTests.kt (99%) rename features/{invitelist => invite}/test/build.gradle.kts (88%) rename features/{invitelist/test/src/main/kotlin/io/element/android/features/invitelist => invite/test/src/main/kotlin/io/element/android/features/invite}/test/FakeSeenInvitesStore.kt (90%) 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 8ff7ecfaa8..8ba98e5a6b 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt @@ -48,7 +48,7 @@ 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.invitelist.api.InviteListEntryPoint +import io.element.android.features.invite.api.InviteListEntryPoint import io.element.android.features.lockscreen.api.LockScreenEntryPoint import io.element.android.features.lockscreen.api.LockScreenLockState import io.element.android.features.lockscreen.api.LockScreenService @@ -350,10 +350,6 @@ class LoggedInFlowNode @AssistedInject constructor( backstack.pop() } - override fun onInviteClicked(roomId: RoomId) { - backstack.push(NavTarget.Room(roomId)) - } - override fun onInviteAccepted(roomId: RoomId) { backstack.push(NavTarget.Room(roomId)) } diff --git a/features/invitelist/api/build.gradle.kts b/features/invite/api/build.gradle.kts similarity index 92% rename from features/invitelist/api/build.gradle.kts rename to features/invite/api/build.gradle.kts index 6ea2b8a49d..1781ee93ae 100644 --- a/features/invitelist/api/build.gradle.kts +++ b/features/invite/api/build.gradle.kts @@ -19,7 +19,7 @@ plugins { } android { - namespace = "io.element.android.features.invitelist.api" + namespace = "io.element.android.features.invite.api" } dependencies { diff --git a/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/InviteListEntryPoint.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteListEntryPoint.kt similarity index 96% rename from features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/InviteListEntryPoint.kt rename to features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteListEntryPoint.kt index 95d2c94f50..6abfe8f518 100644 --- a/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/InviteListEntryPoint.kt +++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteListEntryPoint.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.api +package io.element.android.features.invite.api import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node diff --git a/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/SeenInvitesStore.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt similarity index 94% rename from features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/SeenInvitesStore.kt rename to features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt index ac143b8740..e34b17cee8 100644 --- a/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/SeenInvitesStore.kt +++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.api +package io.element.android.features.invite.api import io.element.android.libraries.matrix.api.core.RoomId import kotlinx.coroutines.flow.Flow diff --git a/features/invitelist/impl/build.gradle.kts b/features/invite/impl/build.gradle.kts similarity index 91% rename from features/invitelist/impl/build.gradle.kts rename to features/invite/impl/build.gradle.kts index 110eb7946e..7a0b0db372 100644 --- a/features/invitelist/impl/build.gradle.kts +++ b/features/invite/impl/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.features.invitelist.impl" + namespace = "io.element.android.features.invite.impl" } anvil { @@ -32,7 +32,7 @@ anvil { dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) - api(projects.features.invitelist.api) + api(projects.features.invite.api) implementation(libs.androidx.datastore.preferences) implementation(projects.libraries.core) implementation(projects.libraries.architecture) @@ -50,7 +50,7 @@ dependencies { testImplementation(libs.test.turbine) testImplementation(projects.libraries.matrix.test) testImplementation(projects.libraries.push.test) - testImplementation(projects.features.invitelist.test) + testImplementation(projects.features.invite.test) testImplementation(projects.services.analytics.test) testImplementation(projects.tests.testutils) diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultInviteListEntryPoint.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultInviteListEntryPoint.kt similarity index 92% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultInviteListEntryPoint.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultInviteListEntryPoint.kt index 5c2fc780d7..03e7a57dae 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultInviteListEntryPoint.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultInviteListEntryPoint.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.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.invitelist.api.InviteListEntryPoint +import io.element.android.features.invite.api.InviteListEntryPoint import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.AppScope import javax.inject.Inject diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultSeenInvitesStore.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt similarity index 94% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultSeenInvitesStore.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt index 1564b2fa83..bf0423914e 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultSeenInvitesStore.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import android.content.Context import androidx.datastore.core.DataStore @@ -23,7 +23,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringSetPreferencesKey import androidx.datastore.preferences.preferencesDataStore import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.features.invitelist.api.SeenInvitesStore +import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.SessionScope import io.element.android.libraries.matrix.api.core.RoomId diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListEvents.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListEvents.kt similarity index 88% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListEvents.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListEvents.kt index ae4b74bb2c..7bf58aba7a 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListEvents.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl -import io.element.android.features.invitelist.impl.model.InviteListInviteSummary +import io.element.android.features.invite.impl.model.InviteListInviteSummary sealed interface InviteListEvents { data class AcceptInvite(val invite: InviteListInviteSummary) : InviteListEvents diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListNode.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListNode.kt similarity index 93% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListNode.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListNode.kt index 31d742e4e7..1f3236e916 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListNode.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -25,7 +25,7 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode -import io.element.android.features.invitelist.api.InviteListEntryPoint +import io.element.android.features.invite.api.InviteListEntryPoint import io.element.android.libraries.di.SessionScope import io.element.android.libraries.matrix.api.core.RoomId diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListPresenter.kt similarity index 96% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListPresenter.kt index aa7cead66e..f616450d25 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -26,9 +26,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import im.vector.app.features.analytics.plan.JoinedRoom -import io.element.android.features.invitelist.api.SeenInvitesStore -import io.element.android.features.invitelist.impl.model.InviteListInviteSummary -import io.element.android.features.invitelist.impl.model.InviteSender +import io.element.android.features.invite.api.SeenInvitesStore +import io.element.android.features.invite.impl.model.InviteListInviteSummary +import io.element.android.features.invite.impl.model.InviteSender import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.runCatchingUpdatingState diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListState.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListState.kt similarity index 90% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListState.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListState.kt index b576861475..42d73de547 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListState.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import androidx.compose.runtime.Immutable -import io.element.android.features.invitelist.impl.model.InviteListInviteSummary +import io.element.android.features.invite.impl.model.InviteListInviteSummary import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.matrix.api.core.RoomId import kotlinx.collections.immutable.ImmutableList diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListStateProvider.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListStateProvider.kt similarity index 93% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListStateProvider.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListStateProvider.kt index e61bd9ff93..5f1d5dcc0f 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListStateProvider.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListStateProvider.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import io.element.android.features.invitelist.impl.model.InviteListInviteSummary -import io.element.android.features.invitelist.impl.model.InviteSender +import io.element.android.features.invite.impl.model.InviteListInviteSummary +import io.element.android.features.invite.impl.model.InviteSender import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.UserId diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListView.kt similarity index 98% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListView.kt index ff8ba55c0b..34da18f02f 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/InviteListView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -36,7 +36,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme -import io.element.android.features.invitelist.impl.components.InviteSummaryRow +import io.element.android.features.invite.impl.components.InviteSummaryRow import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/components/InviteSummaryRow.kt similarity index 94% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/components/InviteSummaryRow.kt index 7c3c1ad1db..0987f6cf57 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/components/InviteSummaryRow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl.components +package io.element.android.features.invite.impl.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -40,10 +40,10 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme -import io.element.android.features.invitelist.impl.R -import io.element.android.features.invitelist.impl.model.InviteListInviteSummary -import io.element.android.features.invitelist.impl.model.InviteListInviteSummaryProvider -import io.element.android.features.invitelist.impl.model.InviteSender +import io.element.android.features.invite.impl.R +import io.element.android.features.invite.impl.model.InviteListInviteSummary +import io.element.android.features.invite.impl.model.InviteListInviteSummaryProvider +import io.element.android.features.invite.impl.model.InviteSender import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.preview.ElementPreview diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/model/InviteListInviteSummary.kt similarity index 96% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/model/InviteListInviteSummary.kt index 9f74b90142..e17dcc997c 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/model/InviteListInviteSummary.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl.model +package io.element.android.features.invite.impl.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/model/InviteListInviteSummaryProvider.kt similarity index 96% rename from features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/model/InviteListInviteSummaryProvider.kt index c872d05817..11f6742345 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/model/InviteListInviteSummaryProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl.model +package io.element.android.features.invite.impl.model import androidx.compose.ui.tooling.preview.PreviewParameterProvider import io.element.android.libraries.matrix.api.core.RoomId diff --git a/features/invitelist/impl/src/main/res/values-be/translations.xml b/features/invite/impl/src/main/res/values-be/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-be/translations.xml rename to features/invite/impl/src/main/res/values-be/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-bg/translations.xml b/features/invite/impl/src/main/res/values-bg/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-bg/translations.xml rename to features/invite/impl/src/main/res/values-bg/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-cs/translations.xml b/features/invite/impl/src/main/res/values-cs/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-cs/translations.xml rename to features/invite/impl/src/main/res/values-cs/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-de/translations.xml b/features/invite/impl/src/main/res/values-de/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-de/translations.xml rename to features/invite/impl/src/main/res/values-de/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-es/translations.xml b/features/invite/impl/src/main/res/values-es/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-es/translations.xml rename to features/invite/impl/src/main/res/values-es/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-fr/translations.xml b/features/invite/impl/src/main/res/values-fr/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-fr/translations.xml rename to features/invite/impl/src/main/res/values-fr/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-hu/translations.xml b/features/invite/impl/src/main/res/values-hu/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-hu/translations.xml rename to features/invite/impl/src/main/res/values-hu/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-in/translations.xml b/features/invite/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-in/translations.xml rename to features/invite/impl/src/main/res/values-in/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-it/translations.xml b/features/invite/impl/src/main/res/values-it/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-it/translations.xml rename to features/invite/impl/src/main/res/values-it/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-ro/translations.xml b/features/invite/impl/src/main/res/values-ro/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-ro/translations.xml rename to features/invite/impl/src/main/res/values-ro/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-ru/translations.xml b/features/invite/impl/src/main/res/values-ru/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-ru/translations.xml rename to features/invite/impl/src/main/res/values-ru/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-sk/translations.xml b/features/invite/impl/src/main/res/values-sk/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-sk/translations.xml rename to features/invite/impl/src/main/res/values-sk/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-sv/translations.xml b/features/invite/impl/src/main/res/values-sv/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-sv/translations.xml rename to features/invite/impl/src/main/res/values-sv/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-uk/translations.xml b/features/invite/impl/src/main/res/values-uk/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-uk/translations.xml rename to features/invite/impl/src/main/res/values-uk/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-zh-rTW/translations.xml b/features/invite/impl/src/main/res/values-zh-rTW/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-zh-rTW/translations.xml rename to features/invite/impl/src/main/res/values-zh-rTW/translations.xml diff --git a/features/invitelist/impl/src/main/res/values/localazy.xml b/features/invite/impl/src/main/res/values/localazy.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values/localazy.xml rename to features/invite/impl/src/main/res/values/localazy.xml diff --git a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/InviteListPresenterTests.kt similarity index 99% rename from features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt rename to features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/InviteListPresenterTests.kt index fa0cf663a2..b9acd5eb0b 100644 --- a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt +++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/InviteListPresenterTests.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.element.android.features.invitelist.impl +package io.element.android.features.invite.impl import app.cash.molecule.RecompositionMode import app.cash.molecule.moleculeFlow import app.cash.turbine.TurbineTestContext import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.invitelist.api.SeenInvitesStore -import io.element.android.features.invitelist.test.FakeSeenInvitesStore +import io.element.android.features.invite.api.SeenInvitesStore +import io.element.android.features.invite.test.FakeSeenInvitesStore import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize diff --git a/features/invitelist/test/build.gradle.kts b/features/invite/test/build.gradle.kts similarity index 88% rename from features/invitelist/test/build.gradle.kts rename to features/invite/test/build.gradle.kts index ce9b0dabe4..44d9d3030c 100644 --- a/features/invitelist/test/build.gradle.kts +++ b/features/invite/test/build.gradle.kts @@ -19,11 +19,11 @@ plugins { } android { - namespace = "io.element.android.features.invitelist.test" + namespace = "io.element.android.features.invite.test" } dependencies { implementation(libs.coroutines.core) implementation(projects.libraries.matrix.api) - api(projects.features.invitelist.api) + api(projects.features.invite.api) } diff --git a/features/invitelist/test/src/main/kotlin/io/element/android/features/invitelist/test/FakeSeenInvitesStore.kt b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/FakeSeenInvitesStore.kt similarity index 90% rename from features/invitelist/test/src/main/kotlin/io/element/android/features/invitelist/test/FakeSeenInvitesStore.kt rename to features/invite/test/src/main/kotlin/io/element/android/features/invite/test/FakeSeenInvitesStore.kt index 94b232b2ac..f2a21ac768 100644 --- a/features/invitelist/test/src/main/kotlin/io/element/android/features/invitelist/test/FakeSeenInvitesStore.kt +++ b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/FakeSeenInvitesStore.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.features.invitelist.test +package io.element.android.features.invite.test -import io.element.android.features.invitelist.api.SeenInvitesStore +import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.libraries.matrix.api.core.RoomId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/features/roomlist/impl/build.gradle.kts b/features/roomlist/impl/build.gradle.kts index 207be1df5b..ff67ebe42a 100644 --- a/features/roomlist/impl/build.gradle.kts +++ b/features/roomlist/impl/build.gradle.kts @@ -53,7 +53,7 @@ dependencies { implementation(projects.libraries.indicator.api) implementation(projects.libraries.deeplink) implementation(projects.libraries.preferences.api) - implementation(projects.features.invitelist.api) + implementation(projects.features.invite.api) implementation(projects.features.networkmonitor.api) implementation(projects.features.leaveroom.api) implementation(projects.services.analytics.api) @@ -75,7 +75,7 @@ dependencies { testImplementation(projects.libraries.indicator.impl) testImplementation(projects.libraries.permissions.noop) testImplementation(projects.libraries.preferences.test) - testImplementation(projects.features.invitelist.test) + testImplementation(projects.features.invite.test) testImplementation(projects.services.analytics.test) testImplementation(projects.features.networkmonitor.test) testImplementation(projects.tests.testutils) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSource.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSource.kt index 9057bf23ae..16baf4e41b 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSource.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSource.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.features.invitelist.api.SeenInvitesStore +import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.features.roomlist.impl.InvitesState import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.di.SessionScope diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSourceTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSourceTest.kt index 802d8ee40f..a1e08cd93b 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSourceTest.kt +++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSourceTest.kt @@ -20,7 +20,7 @@ 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.invitelist.test.FakeSeenInvitesStore +import io.element.android.features.invite.test.FakeSeenInvitesStore import io.element.android.features.roomlist.impl.InvitesState import io.element.android.libraries.matrix.test.A_ROOM_ID import io.element.android.libraries.matrix.test.A_ROOM_ID_2 diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts index 7a3540e7eb..402d1a48b8 100644 --- a/samples/minimal/build.gradle.kts +++ b/samples/minimal/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { implementation(projects.libraries.eventformatter.impl) implementation(projects.libraries.preferences.impl) implementation(projects.libraries.indicator.impl) - implementation(projects.features.invitelist.impl) + implementation(projects.features.invite.impl) implementation(projects.features.roomlist.impl) implementation(projects.features.leaveroom.impl) implementation(projects.features.login.impl) diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt index 264a754e73..48f629af4d 100644 --- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt @@ -20,7 +20,7 @@ import android.content.Context import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.ui.Modifier -import io.element.android.features.invitelist.impl.DefaultSeenInvitesStore +import io.element.android.features.invite.impl.DefaultSeenInvitesStore import io.element.android.features.leaveroom.impl.LeaveRoomPresenterImpl import io.element.android.features.networkmonitor.impl.NetworkMonitorImpl import io.element.android.features.roomlist.impl.RoomListPresenter diff --git a/tools/localazy/config.json b/tools/localazy/config.json index 566ea071e0..35e13730c2 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -33,7 +33,7 @@ ] }, { - "name" : ":features:invitelist:impl", + "name" : ":features:invite:impl", "includeRegex" : [ "screen_invites_.*" ]