diff --git a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt index df3dcacdbb..fa7e904e72 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt @@ -18,7 +18,7 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer -import io.element.android.x.features.rageshake.crash.VectorUncaughtExceptionHandler +import io.element.android.features.rageshake.crash.VectorUncaughtExceptionHandler class CrashInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt index 10b7e17ffd..477dbab79c 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt @@ -19,7 +19,7 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer import io.element.android.x.BuildConfig -import io.element.android.x.features.rageshake.logs.VectorFileLogger +import io.element.android.features.rageshake.logs.VectorFileLogger import timber.log.Timber class TimberInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 65836f3f4c..774b42b220 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -36,8 +36,8 @@ import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.SessionComponent -import io.element.android.x.features.preferences.PreferencesFlowNode -import io.element.android.x.features.roomlist.RoomListNode +import io.element.android.features.preferences.PreferencesFlowNode +import io.element.android.features.roomlist.RoomListNode import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.SessionId diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index 3c619c5e38..91a85c1e85 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -27,8 +27,8 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.node import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.replace -import io.element.android.x.features.login.LoginFlowNode -import io.element.android.x.features.onboarding.OnBoardingScreen +import io.element.android.features.login.LoginFlowNode +import io.element.android.features.onboarding.OnBoardingScreen import kotlinx.parcelize.Parcelize import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index e4db559128..0048b143cf 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -29,7 +29,7 @@ import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.RoomComponent -import io.element.android.x.features.messages.MessagesNode +import io.element.android.features.messages.MessagesNode import io.element.android.libraries.matrix.room.MatrixRoom import kotlinx.parcelize.Parcelize import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index e922b14e7d..cf7346f801 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -39,7 +39,7 @@ import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner -import io.element.android.x.features.rageshake.bugreport.BugReportNode +import io.element.android.features.rageshake.bugreport.BugReportNode import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.core.SessionId diff --git a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt index 0ca0efd0bb..dad279bf09 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt @@ -20,9 +20,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.features.rageshake.bugreport.BugReportPresenter -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter -import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter +import io.element.android.features.rageshake.bugreport.BugReportPresenter +import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter +import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter import javax.inject.Inject class RootPresenter @Inject constructor( diff --git a/app/src/main/kotlin/io/element/android/x/root/RootState.kt b/app/src/main/kotlin/io/element/android/x/root/RootState.kt index 6a062d2925..6d516c5c70 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootState.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootState.kt @@ -17,9 +17,9 @@ package io.element.android.x.root import androidx.compose.runtime.Stable -import io.element.android.x.features.rageshake.bugreport.BugReportState -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionState -import io.element.android.x.features.rageshake.detection.RageshakeDetectionState +import io.element.android.features.rageshake.bugreport.BugReportState +import io.element.android.features.rageshake.crash.ui.CrashDetectionState +import io.element.android.features.rageshake.detection.RageshakeDetectionState @Stable data class RootState( diff --git a/app/src/main/kotlin/io/element/android/x/root/RootView.kt b/app/src/main/kotlin/io/element/android/x/root/RootView.kt index 534f7edfda..048c3d8e6c 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootView.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootView.kt @@ -25,10 +25,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import io.element.android.x.component.ShowkaseButton -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionEvents -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView -import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents -import io.element.android.x.features.rageshake.detection.RageshakeDetectionView +import io.element.android.features.rageshake.crash.ui.CrashDetectionEvents +import io.element.android.features.rageshake.crash.ui.CrashDetectionView +import io.element.android.features.rageshake.detection.RageshakeDetectionEvents +import io.element.android.features.rageshake.detection.RageshakeDetectionView import io.element.android.tests.uitests.openShowkase @Composable diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 4b979827d7..1f424d86d5 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "io.element.android.x.features.login" + namespace = "io.element.android.features.login" } anvil { diff --git a/features/login/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt similarity index 96% rename from features/login/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt rename to features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt index 88ae6c4133..3fc011ddf8 100644 --- a/features/login/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt +++ b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt similarity index 92% rename from features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt rename to features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index f564eaf901..ae0f6268a0 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import android.os.Parcelable import androidx.compose.runtime.Composable @@ -26,8 +26,8 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.createNode -import io.element.android.x.features.login.changeserver.ChangeServerNode -import io.element.android.x.features.login.root.LoginRootNode +import io.element.android.features.login.changeserver.ChangeServerNode +import io.element.android.features.login.root.LoginRootNode import kotlinx.parcelize.Parcelize class LoginFlowNode( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerEvents.kt similarity index 92% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerEvents.kt index 78e4e64ffd..70b57b5038 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver sealed interface ChangeServerEvents { data class SetServer(val server: String) : ChangeServerEvents diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt similarity index 96% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt index 6264809ada..01163664b6 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenter.kt similarity index 97% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenter.kt index b1050d59e1..038d2ecea1 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerState.kt similarity index 94% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerState.kt index 19405763e1..9c1b9ac7e2 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import io.element.android.libraries.architecture.Async diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt similarity index 97% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt index 8e7a98f919..b0ddd10efd 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -55,8 +55,8 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.architecture.Async import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.VectorIcon -import io.element.android.x.features.login.R -import io.element.android.x.features.login.error.changeServerError +import io.element.android.features.login.R +import io.element.android.features.login.error.changeServerError import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt b/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt similarity index 93% rename from features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt rename to features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt index eb90f40936..4f79df3be3 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.features.login.error +package io.element.android.features.login.error import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import io.element.android.libraries.core.uri.isValidUrl -import io.element.android.x.features.login.root.LoginFormState +import io.element.android.features.login.root.LoginFormState import io.element.android.libraries.ui.strings.R as StringR @Composable diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootEvents.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootEvents.kt similarity index 94% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootEvents.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootEvents.kt index de72602775..623f80abc7 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootEvents.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root sealed interface LoginRootEvents { object RefreshHomeServer : LoginRootEvents diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt similarity index 97% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index b46b79e995..089f629e6b 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootPresenter.kt similarity index 98% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootPresenter.kt index e6a6ec6c9e..cb80d3784a 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt similarity index 98% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt index 31030f56f1..04d8a474e2 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.login.root +package io.element.android.features.login.root import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -59,7 +59,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.textFieldState -import io.element.android.x.features.login.error.loginError +import io.element.android.features.login.error.loginError import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag import io.element.android.libraries.matrix.core.SessionId diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootState.kt similarity index 96% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootState.kt index 6fc80bcfb6..fab74370f0 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root import android.os.Parcelable import io.element.android.libraries.matrix.core.SessionId diff --git a/features/onboarding/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt b/features/login/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt similarity index 95% rename from features/onboarding/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt rename to features/login/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt index 39a03196df..ee6363e624 100644 --- a/features/onboarding/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt +++ b/features/login/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/logout/build.gradle.kts b/features/logout/build.gradle.kts index 93f9c4f6f2..e022a4cb87 100644 --- a/features/logout/build.gradle.kts +++ b/features/logout/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.features.logout" + namespace = "io.element.android.features.logout" } anvil { diff --git a/features/onboarding/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt similarity index 96% rename from features/onboarding/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt rename to features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt index 88ae6c4133..5fea153e9f 100644 --- a/features/onboarding/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt +++ b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.logout import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceEvents.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceEvents.kt similarity index 93% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceEvents.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceEvents.kt index 83aa2fe14f..b381668974 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceEvents.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout sealed interface LogoutPreferenceEvents { object Logout : LogoutPreferenceEvents diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferencePresenter.kt similarity index 97% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferencePresenter.kt index f29a687f23..3aa626f1fa 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferencePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceScreen.kt similarity index 98% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceScreen.kt index e7bc9d3f7f..cc94f56806 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceScreen.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Logout diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceState.kt similarity index 94% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceState.kt index cfa82c575e..e594a04870 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout import io.element.android.libraries.architecture.Async diff --git a/features/login/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt b/features/logout/src/test/kotlin/io/element/android/features/logout/ExampleUnitTest.kt similarity index 95% rename from features/login/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt rename to features/logout/src/test/kotlin/io/element/android/features/logout/ExampleUnitTest.kt index 39a03196df..065f4e917d 100644 --- a/features/login/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt +++ b/features/logout/src/test/kotlin/io/element/android/features/logout/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.logout import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index 861cb183c4..02c0a245d8 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.features.messages" + namespace = "io.element.android.features.messages" } anvil { diff --git a/features/messages/src/androidTest/kotlin/io/element/android/x/features/messages/ExampleInstrumentedTest.kt b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt similarity index 96% rename from features/messages/src/androidTest/kotlin/io/element/android/x/features/messages/ExampleInstrumentedTest.kt rename to features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt index 86305659f1..30e9a85c26 100644 --- a/features/messages/src/androidTest/kotlin/io/element/android/x/features/messages/ExampleInstrumentedTest.kt +++ b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt similarity index 78% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt index 88e8c52221..d8d5c0c795 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem sealed interface MessagesEvents { data class HandleAction(val action: TimelineItemAction, val messageEvent: TimelineItem.MessageEvent) : MessagesEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt similarity index 97% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt index 3bc779eb22..dbbf1a1d8a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt index 7b9368e2b3..9f32bc74bd 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -27,15 +27,15 @@ import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.features.messages.actionlist.ActionListPresenter -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.textcomposer.MessageComposerEvents -import io.element.android.x.features.messages.textcomposer.MessageComposerPresenter -import io.element.android.x.features.messages.textcomposer.MessageComposerState -import io.element.android.x.features.messages.timeline.TimelineEvents -import io.element.android.x.features.messages.timeline.TimelinePresenter -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.features.messages.actionlist.ActionListPresenter +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.textcomposer.MessageComposerEvents +import io.element.android.features.messages.textcomposer.MessageComposerPresenter +import io.element.android.features.messages.textcomposer.MessageComposerState +import io.element.android.features.messages.timeline.TimelineEvents +import io.element.android.features.messages.timeline.TimelinePresenter +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.ui.MatrixItemHelper diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt similarity index 79% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt index 1e3fea4c67..a3e23d0556 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.actionlist.ActionListState -import io.element.android.x.features.messages.textcomposer.MessageComposerState -import io.element.android.x.features.messages.timeline.TimelineState +import io.element.android.features.messages.actionlist.ActionListState +import io.element.android.features.messages.textcomposer.MessageComposerState +import io.element.android.features.messages.timeline.TimelineState import io.element.android.libraries.matrix.core.RoomId @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt index a543141e6a..dbcf0011a4 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt @@ -19,7 +19,7 @@ ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class, ) -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -59,12 +59,12 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.actionlist.ActionListEvents -import io.element.android.x.features.messages.actionlist.ActionListView -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.textcomposer.MessageComposerView -import io.element.android.x.features.messages.timeline.TimelineView +import io.element.android.features.messages.actionlist.ActionListEvents +import io.element.android.features.messages.actionlist.ActionListView +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.textcomposer.MessageComposerView +import io.element.android.features.messages.timeline.TimelineView import kotlinx.coroutines.launch import timber.log.Timber diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt similarity index 85% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt index 65b26cf84a..f760f08640 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.TimelineItem sealed interface ActionListEvents { object Clear : ActionListEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt similarity index 89% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt index 9a4e3b3168..08140b5a96 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -22,9 +22,9 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import io.element.android.libraries.architecture.Presenter -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt similarity index 84% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt index 00c3ec59ab..6bc7630ec8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist import androidx.compose.runtime.Immutable -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem import kotlinx.collections.immutable.ImmutableList @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt index dfb3018596..c7b641a1a1 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterialApi::class) -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -42,8 +42,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import io.element.android.libraries.designsystem.components.VectorIcon -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt index a43dbdb6a3..84551753b9 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist.model +package io.element.android.features.messages.actionlist.model import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerEvents.kt similarity index 94% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerEvents.kt index 7272f29969..656229555b 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import io.element.android.libraries.textcomposer.MessageComposerMode diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt similarity index 98% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt index 2d1e5401bd..24e3f2461d 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerState.kt similarity index 94% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerState.kt index 396b3c4f19..2b5396cb9e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import androidx.compose.runtime.Immutable import io.element.android.libraries.core.data.StableCharSequence diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerView.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerView.kt index 5acfd7d954..e3b674d32a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineEvents.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineEvents.kt index 31a53849cd..c59b99fe3f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import io.element.android.libraries.matrix.core.EventId diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt similarity index 87% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt index 9438152e6a..dcc36c1388 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt @@ -14,25 +14,25 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.recyclerview.widget.DiffUtil import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.features.messages.timeline.diff.CacheInvalidator -import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback -import io.element.android.x.features.messages.timeline.model.AggregatedReaction -import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.TimelineItemReactions -import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEmoteContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemNoticeContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent -import io.element.android.x.features.messages.timeline.util.invalidateLast +import io.element.android.features.messages.timeline.diff.CacheInvalidator +import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback +import io.element.android.features.messages.timeline.model.AggregatedReaction +import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.TimelineItemReactions +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEmoteContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.content.TimelineItemNoticeContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.util.invalidateLast import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.media.MediaResolver import io.element.android.libraries.matrix.room.MatrixRoom diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt similarity index 98% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt index 5844534219..18ce07896e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt similarity index 88% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt index ec43aa2057..6b8c715f5d 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.compose.runtime.Immutable -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt similarity index 88% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index 1ba9c5a19e..c7d424db2e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -61,25 +61,25 @@ import androidx.compose.ui.zIndex import io.element.android.libraries.core.compose.PairCombinedPreviewParameter import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.timeline.model.AggregatedReaction -import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition -import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider -import io.element.android.x.features.messages.timeline.model.TimelineItemReactions -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.features.messages.timeline.model.content.MessagesTimelineItemContentProvider -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent -import io.element.android.x.features.messages.timeline.components.MessageEventBubble -import io.element.android.x.features.messages.timeline.components.TimelineItemReactionsView -import io.element.android.x.features.messages.timeline.components.TimelineItemEncryptedView -import io.element.android.x.features.messages.timeline.components.TimelineItemImageView -import io.element.android.x.features.messages.timeline.components.TimelineItemRedactedView -import io.element.android.x.features.messages.timeline.components.TimelineItemTextView -import io.element.android.x.features.messages.timeline.components.TimelineItemUnknownView +import io.element.android.features.messages.timeline.model.AggregatedReaction +import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition +import io.element.android.features.messages.timeline.model.TimelineItemGroupPositionProvider +import io.element.android.features.messages.timeline.model.TimelineItemReactions +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.MessagesTimelineItemContentProvider +import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.components.MessageEventBubble +import io.element.android.features.messages.timeline.components.TimelineItemReactionsView +import io.element.android.features.messages.timeline.components.TimelineItemEncryptedView +import io.element.android.features.messages.timeline.components.TimelineItemImageView +import io.element.android.features.messages.timeline.components.TimelineItemRedactedView +import io.element.android.features.messages.timeline.components.TimelineItemTextView +import io.element.android.features.messages.timeline.components.TimelineItemUnknownView import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt index e7c16eefe4..cb52ae9645 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -36,7 +36,7 @@ import io.element.android.libraries.designsystem.SystemGrey5Dark import io.element.android.libraries.designsystem.SystemGrey5Light import io.element.android.libraries.designsystem.SystemGrey6Dark import io.element.android.libraries.designsystem.SystemGrey6Light -import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition +import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition private val BUBBLE_RADIUS = 16.dp diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemEncryptedView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemEncryptedView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt index 0b037c6f1f..9b2be79685 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemEncryptedView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Warning import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent @Composable fun TimelineItemEncryptedView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemImageView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemImageView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt index a630959bcb..e6548a71e8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemImageView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalFoundationApi::class) -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Box @@ -33,7 +33,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import coil.compose.AsyncImage import coil.request.ImageRequest -import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent @Composable fun TimelineItemImageView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemInformativeView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemInformativeView.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemInformativeView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemInformativeView.kt index 6c876f9103..9806bc05c8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemInformativeView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemInformativeView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemReactionsView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemReactionsView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt index 8cc75befea..b061f02f3d 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemReactionsView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Row @@ -32,8 +32,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow -import io.element.android.x.features.messages.timeline.model.AggregatedReaction -import io.element.android.x.features.messages.timeline.model.TimelineItemReactions +import io.element.android.features.messages.timeline.model.AggregatedReaction +import io.element.android.features.messages.timeline.model.TimelineItemReactions @Composable fun TimelineItemReactionsView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemRedactedView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemRedactedView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt index 183b44de74..f752f88c4a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemRedactedView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent @Composable fun TimelineItemRedactedView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt similarity index 92% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt index 8da4a0a1f4..b0924ce999 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import android.text.SpannableString import android.text.style.URLSpan @@ -30,8 +30,8 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.core.text.util.LinkifyCompat import io.element.android.libraries.designsystem.LinkColor import io.element.android.libraries.designsystem.components.ClickableLinkText -import io.element.android.x.features.messages.timeline.components.html.HtmlDocument -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.features.messages.timeline.components.html.HtmlDocument +import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent @Composable fun TimelineItemTextView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemUnknownView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemUnknownView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt index 88355abd90..396bb19cb6 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemUnknownView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent @Composable fun TimelineItemUnknownView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt similarity index 99% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt index efb22538da..21a7cac714 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components.html +package io.element.android.features.messages.timeline.components.html import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/CacheInvalidator.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/CacheInvalidator.kt similarity index 89% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/CacheInvalidator.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/CacheInvalidator.kt index 031d871033..c71fa7bcd1 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/CacheInvalidator.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/CacheInvalidator.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.diff +package io.element.android.features.messages.timeline.diff import androidx.recyclerview.widget.ListUpdateCallback -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.util.invalidateLast +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.util.invalidateLast import timber.log.Timber internal class CacheInvalidator(private val itemStatesCache: MutableList) : diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt index 1de27134a0..fd5119cc2a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.diff +package io.element.android.features.messages.timeline.diff import androidx.recyclerview.widget.DiffUtil import io.element.android.libraries.matrix.timeline.MatrixTimelineItem diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index fba7009f68..d54e0d602f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model +package io.element.android.features.messages.timeline.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemContent import io.element.android.libraries.matrix.core.EventId @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemGroupPosition.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemGroupPosition.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemGroupPosition.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemGroupPosition.kt index 977c498bfc..9a1ebb9362 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemGroupPosition.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemGroupPosition.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model +package io.element.android.features.messages.timeline.model import androidx.compose.runtime.Immutable import androidx.compose.ui.tooling.preview.PreviewParameterProvider diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemReactions.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemReactions.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemReactions.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemReactions.kt index ff0fd549bc..a6470a3784 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemReactions.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemReactions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model +package io.element.android.features.messages.timeline.model import kotlinx.collections.immutable.ImmutableList diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt index 9d7b8c3868..973a4343a3 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import androidx.compose.ui.tooling.preview.PreviewParameterProvider import org.matrix.rustcomponents.sdk.EncryptedMessage diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEmoteContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEmoteContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt index c5c0a8a330..c307b70edb 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEmoteContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt index 62fd231191..937b4d32f6 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.matrix.rustcomponents.sdk.EncryptedMessage diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt similarity index 92% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt index e361ff11a8..ef1c8d85d5 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import io.element.android.libraries.matrix.media.MediaResolver diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemNoticeContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemNoticeContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt index 1bb8df5673..330ef1ff95 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemNoticeContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemRedactedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemRedactedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt index 8de2088052..6dd395f338 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemRedactedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content object TimelineItemRedactedContent : TimelineItemContent diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt index 15f757bf6e..6146a5493f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt index a3a887df66..abb3140b71 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemUnknownContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemUnknownContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt index 44f6cb9af4..e2e0c5a14a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemUnknownContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content object TimelineItemUnknownContent : TimelineItemContent diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/util/MutableListExt.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/MutableListExt.kt similarity index 92% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/util/MutableListExt.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/MutableListExt.kt index d487af0cdc..555cb4cb01 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/util/MutableListExt.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/MutableListExt.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.util +package io.element.android.features.messages.timeline.util internal inline fun MutableList.invalidateLast() { val indexOfLast = size diff --git a/features/logout/src/test/kotlin/io/element/android/x/features/logout/ExampleUnitTest.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/ExampleUnitTest.kt similarity index 95% rename from features/logout/src/test/kotlin/io/element/android/x/features/logout/ExampleUnitTest.kt rename to features/messages/src/test/kotlin/io/element/android/features/messages/ExampleUnitTest.kt index b2b9726114..83296930a7 100644 --- a/features/logout/src/test/kotlin/io/element/android/x/features/logout/ExampleUnitTest.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.messages import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index e002cfb7d7..24b32d6ba1 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.features.onboarding" + namespace = "io.element.android.features.onboarding" } dependencies { diff --git a/features/logout/src/androidTest/kotlin/io/element/android/x/features/logout/ExampleInstrumentedTest.kt b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt similarity index 96% rename from features/logout/src/androidTest/kotlin/io/element/android/x/features/logout/ExampleInstrumentedTest.kt rename to features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt index ada1dafdcb..3fc011ddf8 100644 --- a/features/logout/src/androidTest/kotlin/io/element/android/x/features/logout/ExampleInstrumentedTest.kt +++ b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.login import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt similarity index 99% rename from features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt rename to features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt index be5b4f646a..f0f524cddf 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.onboarding +package io.element.android.features.onboarding import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselState.kt b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselState.kt similarity index 94% rename from features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselState.kt rename to features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselState.kt index 0d491bb236..f6523da7a6 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselState.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.onboarding +package io.element.android.features.onboarding import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselStateFactory.kt similarity index 98% rename from features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt rename to features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselStateFactory.kt index 681eb09466..fc06ba49b6 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselStateFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.onboarding +package io.element.android.features.onboarding import androidx.annotation.DrawableRes import io.element.android.libraries.ui.strings.R as StringR diff --git a/features/rageshake/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt b/features/onboarding/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt similarity index 95% rename from features/rageshake/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt rename to features/onboarding/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt index 39a03196df..ee6363e624 100644 --- a/features/rageshake/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt +++ b/features/onboarding/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/preferences/build.gradle.kts b/features/preferences/build.gradle.kts index e8f5147642..894087b50e 100644 --- a/features/preferences/build.gradle.kts +++ b/features/preferences/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "io.element.android.x.features.preferences" + namespace = "io.element.android.features.preferences" } anvil { diff --git a/features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt similarity index 96% rename from features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt rename to features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt index 6492607f4a..dc6a244d21 100644 --- a/features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt +++ b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences +package io.element.android.features.preferences import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt similarity index 94% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index 98255fd7c4..a3e9e4e283 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences +package io.element.android.features.preferences import android.os.Parcelable import androidx.compose.runtime.Composable @@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import io.element.android.libraries.architecture.createNode -import io.element.android.x.features.preferences.root.PreferencesRootNode +import io.element.android.features.preferences.root.PreferencesRootNode import kotlinx.parcelize.Parcelize class PreferencesFlowNode( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt similarity index 97% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt index 60ff67091b..ae48353d78 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt similarity index 86% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt index 065aef7fd3..e798494aef 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import androidx.compose.runtime.Composable import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter -import io.element.android.x.features.logout.LogoutPreferencePresenter -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter +import io.element.android.features.logout.LogoutPreferencePresenter +import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter import javax.inject.Inject class PreferencesRootPresenter @Inject constructor( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt similarity index 81% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt index b813d0a99b..4a22320f48 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import io.element.android.libraries.architecture.Async -import io.element.android.x.features.logout.LogoutPreferenceState -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState +import io.element.android.features.logout.LogoutPreferenceState +import io.element.android.features.rageshake.preferences.RageshakePreferencesState import io.element.android.libraries.matrix.ui.model.MatrixUser data class PreferencesRootState( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt similarity index 81% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt index c467aa15bb..3c403278d3 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -22,11 +22,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.architecture.Async import io.element.android.libraries.designsystem.components.preferences.PreferenceView -import io.element.android.x.features.logout.LogoutPreferenceState -import io.element.android.x.features.logout.LogoutPreferenceView -import io.element.android.x.features.preferences.user.UserPreferences -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView +import io.element.android.features.logout.LogoutPreferenceState +import io.element.android.features.logout.LogoutPreferenceView +import io.element.android.features.preferences.user.UserPreferences +import io.element.android.features.rageshake.preferences.RageshakePreferencesState +import io.element.android.features.rageshake.preferences.RageshakePreferencesView import io.element.android.libraries.ui.strings.R as StringR @Composable diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/user/UserPreferences.kt similarity index 96% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/user/UserPreferences.kt index 24fd0e2292..f068e71f3b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/user/UserPreferences.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.user +package io.element.android.features.preferences.user import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height diff --git a/features/messages/src/test/kotlin/io/element/android/x/features/messages/ExampleUnitTest.kt b/features/preferences/src/test/kotlin/io/element/android/features/preferences/ExampleUnitTest.kt similarity index 95% rename from features/messages/src/test/kotlin/io/element/android/x/features/messages/ExampleUnitTest.kt rename to features/preferences/src/test/kotlin/io/element/android/features/preferences/ExampleUnitTest.kt index 87aedb9588..3b615c83e9 100644 --- a/features/messages/src/test/kotlin/io/element/android/x/features/messages/ExampleUnitTest.kt +++ b/features/preferences/src/test/kotlin/io/element/android/features/preferences/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.preferences import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt b/features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt deleted file mode 100644 index fda74bd660..0000000000 --- a/features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.x.features.preferences - -import org.junit.Assert.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/features/rageshake/build.gradle.kts b/features/rageshake/build.gradle.kts index b3f8b14ded..fa2aee4b2c 100644 --- a/features/rageshake/build.gradle.kts +++ b/features/rageshake/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "io.element.android.x.features.rageshake" + namespace = "io.element.android.features.rageshake" } anvil { diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEvents.kt similarity index 94% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEvents.kt index c8bbfe2741..0045f29a2c 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport sealed interface BugReportEvents { object SendBugReport : BugReportEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt index 409e429330..5e620310df 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt index 5dfd3392e7..89289888e8 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -26,11 +26,11 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.core.net.toUri import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter -import io.element.android.x.features.rageshake.crash.CrashDataStore -import io.element.android.x.features.rageshake.logs.VectorFileLogger -import io.element.android.x.features.rageshake.reporter.BugReporter -import io.element.android.x.features.rageshake.reporter.ReportType -import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder +import io.element.android.features.rageshake.crash.CrashDataStore +import io.element.android.features.rageshake.logs.VectorFileLogger +import io.element.android.features.rageshake.reporter.BugReporter +import io.element.android.features.rageshake.reporter.ReportType +import io.element.android.features.rageshake.screenshot.ScreenshotHolder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportState.kt similarity index 96% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportState.kt index 85736a76e4..1f66bb58eb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import android.os.Parcelable import io.element.android.libraries.architecture.Async diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt similarity index 99% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt index 945661d6b0..ba209f69bb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt index 886877e89b..166c39a101 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash +package io.element.android.features.rageshake.crash import android.content.Context import androidx.datastore.core.DataStore diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt index 15ef3256f0..84caffc55c 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash +package io.element.android.features.rageshake.crash import android.content.Context import android.os.Build diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionEvents.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionEvents.kt index 93330b4513..0175e1fde2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui sealed interface CrashDetectionEvents { object ResetAllCrashData : CrashDetectionEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt index 918a89ddbb..4172589a74 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.rememberCoroutineScope import io.element.android.libraries.architecture.Presenter -import io.element.android.x.features.rageshake.crash.CrashDataStore +import io.element.android.features.rageshake.crash.CrashDataStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt index bcde245e0a..b3b41ccd09 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionState.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionState.kt index 52774c4cc9..bff17b246a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui data class CrashDetectionState( val crashDetected: Boolean = false, diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt similarity index 94% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt index 3d0c4cef80..3030311674 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import io.element.android.libraries.core.screenshot.ImageResult diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt index 92b14bad76..de6f338b27 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -25,10 +25,10 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.screenshot.ImageResult -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter -import io.element.android.x.features.rageshake.rageshake.RageShake -import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder +import io.element.android.features.rageshake.preferences.RageshakePreferencesEvents +import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter +import io.element.android.features.rageshake.rageshake.RageShake +import io.element.android.features.rageshake.screenshot.ScreenshotHolder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionState.kt similarity index 86% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionState.kt index d32b326dd3..4c99ef264b 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import androidx.compose.runtime.Stable -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState +import io.element.android.features.rageshake.preferences.RageshakePreferencesState @Stable data class RageshakeDetectionState( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt index e376d7cbcf..a63c38d12e 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/LogFormatter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/LogFormatter.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/LogFormatter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/LogFormatter.kt index 007c87f3e1..2f6a50c077 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/LogFormatter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/LogFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.logs +package io.element.android.features.rageshake.logs import java.io.PrintWriter import java.io.StringWriter diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt index 0b4275b3f2..b7443e90bb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.logs +package io.element.android.features.rageshake.logs import android.content.Context import android.util.Log diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesEvents.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesEvents.kt index ae178e9f2f..39b788e003 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences sealed interface RageshakePreferencesEvents { data class SetSensitivity(val sensitivity: Float) : RageshakePreferencesEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt index 9878c26417..167c6a83b8 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -23,8 +23,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.features.rageshake.rageshake.RageShake -import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore +import io.element.android.features.rageshake.rageshake.RageShake +import io.element.android.features.rageshake.rageshake.RageshakeDataStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesState.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesState.kt index 5a71b2a42f..e6c45ddf83 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences data class RageshakePreferencesState( val isEnabled: Boolean = false, diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesView.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesView.kt index d1c9c201f2..ce5d9bcab8 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageShake.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageShake.kt index 14643f8c1c..691da5dbe2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageShake.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.rageshake +package io.element.android.features.rageshake.rageshake import android.content.Context import android.hardware.Sensor diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt index a9e741720b..2f27e9d60f 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.rageshake +package io.element.android.features.rageshake.rageshake import android.content.Context import androidx.datastore.core.DataStore diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt index b12aedc0db..3e495d613f 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.reporter +package io.element.android.features.rageshake.reporter import android.content.Context import android.os.Build @@ -22,10 +22,10 @@ import io.element.android.libraries.core.extensions.toOnOff import io.element.android.libraries.core.file.compressFile import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.di.ApplicationContext -import io.element.android.x.features.rageshake.R -import io.element.android.x.features.rageshake.crash.CrashDataStore -import io.element.android.x.features.rageshake.logs.VectorFileLogger -import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder +import io.element.android.features.rageshake.R +import io.element.android.features.rageshake.crash.CrashDataStore +import io.element.android.features.rageshake.logs.VectorFileLogger +import io.element.android.features.rageshake.screenshot.ScreenshotHolder import java.io.File import java.io.IOException import java.io.OutputStreamWriter diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporterMultipartBody.java b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java similarity index 99% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporterMultipartBody.java rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java index 275ea89298..fdd858abfd 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporterMultipartBody.java +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.reporter; +package io.element.android.features.rageshake.reporter; import java.io.IOException; import java.util.ArrayList; diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/ReportType.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/ReportType.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/ReportType.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/ReportType.kt index 6523f99e2b..a29d29e702 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/ReportType.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/ReportType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.reporter +package io.element.android.features.rageshake.reporter enum class ReportType { BUG_REPORT, diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt similarity index 95% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt index e57513d0fa..d58a60dd4a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.screenshot +package io.element.android.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap diff --git a/features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt b/features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt new file mode 100644 index 0000000000..ee6363e624 --- /dev/null +++ b/features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2022 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.login + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index fe2fd050fe..fa0b3c4661 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.features.roomlist" + namespace = "io.element.android.features.roomlist" } anvil { diff --git a/features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt similarity index 96% rename from features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt rename to features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt index 487d999142..b0cd0e20f1 100644 --- a/features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt +++ b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/LastMessageFormatter.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/LastMessageFormatter.kt similarity index 98% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/LastMessageFormatter.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/LastMessageFormatter.kt index 5e90a52898..037ba5200d 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/LastMessageFormatter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/LastMessageFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import android.text.format.DateFormat import android.text.format.DateUtils diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt similarity index 97% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt index 3c2c3ae19b..b299658643 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt similarity index 95% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt index bf35b48710..3421156e57 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -29,10 +29,10 @@ import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.coroutine.parallelMap import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.features.roomlist.model.RoomListEvents -import io.element.android.x.features.roomlist.model.RoomListRoomSummary -import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders -import io.element.android.x.features.roomlist.model.RoomListState +import io.element.android.features.roomlist.model.RoomListEvents +import io.element.android.features.roomlist.model.RoomListRoomSummary +import io.element.android.features.roomlist.model.RoomListRoomSummaryPlaceholders +import io.element.android.features.roomlist.model.RoomListState import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.media.MediaResolver import io.element.android.libraries.matrix.room.RoomSummary diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt similarity index 92% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt index 1bca826ad6..5b807f0dd0 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding @@ -38,12 +38,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Velocity import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.roomlist.components.RoomListTopBar -import io.element.android.x.features.roomlist.components.RoomSummaryRow -import io.element.android.x.features.roomlist.model.RoomListEvents -import io.element.android.x.features.roomlist.model.RoomListRoomSummary -import io.element.android.x.features.roomlist.model.RoomListState -import io.element.android.x.features.roomlist.model.stubbedRoomSummaries +import io.element.android.features.roomlist.components.RoomListTopBar +import io.element.android.features.roomlist.components.RoomSummaryRow +import io.element.android.features.roomlist.model.RoomListEvents +import io.element.android.features.roomlist.model.RoomListRoomSummary +import io.element.android.features.roomlist.model.RoomListState +import io.element.android.features.roomlist.model.stubbedRoomSummaries import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.UserId import io.element.android.libraries.matrix.ui.model.MatrixUser diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt similarity index 99% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt index 79f14fd3f8..8b5e4c4761 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.roomlist.components +package io.element.android.features.roomlist.components import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.fillMaxWidth diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt similarity index 97% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt index 2c4d647cfb..53d275ad89 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.components +package io.element.android.features.roomlist.components import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -53,7 +53,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.placeholder.material.placeholder import io.element.android.libraries.designsystem.components.avatar.Avatar -import io.element.android.x.features.roomlist.model.RoomListRoomSummary +import io.element.android.features.roomlist.model.RoomListRoomSummary private val minHeight = 72.dp diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListEvents.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListEvents.kt similarity index 93% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListEvents.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListEvents.kt index e4cbf4430b..4349c93341 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListEvents.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model sealed interface RoomListEvents { data class UpdateFilter(val newFilter: String) : RoomListEvents diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummary.kt similarity index 95% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummary.kt index 12a8982989..f88b3da31f 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummary.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt similarity index 96% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt index 6950ab32da..5e6176bcb2 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListState.kt similarity index 94% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListState.kt index 3b54057b44..f2d873654b 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import androidx.compose.runtime.Immutable import io.element.android.libraries.matrix.ui.model.MatrixUser diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/stubbed.kt similarity index 96% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/stubbed.kt index ef3dac79d6..c122752d4d 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/stubbed.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import io.element.android.libraries.designsystem.components.avatar.AvatarData import kotlinx.collections.immutable.ImmutableList diff --git a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt similarity index 87% rename from features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt rename to features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt index 658d15beb0..ce5b486f77 100644 --- a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt +++ b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow @@ -22,6 +22,8 @@ import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.libraries.matrixtest.FakeMatrixClient import io.element.android.libraries.matrix.core.SessionId +import io.element.android.features.roomlist.LastMessageFormatter +import io.element.android.features.roomlist.RoomListPresenter import kotlinx.coroutines.test.runTest import org.junit.Test @@ -33,7 +35,8 @@ class RoomListPresenterTests { val presenter = RoomListPresenter( FakeMatrixClient( SessionId("sessionId") - ), LastMessageFormatter()) + ), LastMessageFormatter() + ) moleculeFlow(RecompositionClock.Immediate) { presenter.present() }.test { diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index 636835c609..f7a265e462 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -24,7 +24,7 @@ plugins { android { // TODO change the namespace (and your classes package) - namespace = "io.element.android.x.features.template" + namespace = "io.element.android.features.template" } anvil { diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateEvents.kt similarity index 94% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateEvents.kt index 588bbd957d..57d0b0cc25 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template // TODO Add your events or remove the file completely if no events sealed interface TemplateEvents { diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt similarity index 97% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt index ca0f5ce7fe..4d907023c8 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplatePresenter.kt similarity index 95% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplatePresenter.kt index f552aea412..254a5fc048 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplatePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import androidx.compose.runtime.Composable import io.element.android.libraries.architecture.Presenter diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateState.kt similarity index 94% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateState.kt index 8f633ae8c2..8bb7f91ae3 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template // TODO add your ui models. Remove the eventSink if you don't have events. data class TemplateState( diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateView.kt similarity index 96% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateView.kt index 015be504bd..0de5a4df96 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import androidx.compose.foundation.layout.Box import androidx.compose.material3.Text diff --git a/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt b/features/template/src/test/kotlin/io/element/android/features/template/TemplatePresenterTests.kt similarity index 96% rename from features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt rename to features/template/src/test/kotlin/io/element/android/features/template/TemplatePresenterTests.kt index e470489bce..39b7e32ea8 100644 --- a/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt +++ b/features/template/src/test/kotlin/io/element/android/features/template/TemplatePresenterTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/BaseDeviceConfig.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/BaseDeviceConfig.kt similarity index 94% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/BaseDeviceConfig.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/BaseDeviceConfig.kt index a46dceaa8e..3732ca66cc 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/BaseDeviceConfig.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/BaseDeviceConfig.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import app.cash.paparazzi.DeviceConfig diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ColorTestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ColorTestPreview.kt similarity index 97% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ColorTestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ColorTestPreview.kt index 9dd2c563d8..ae3722612b 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ColorTestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ColorTestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ComponentTestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ComponentTestPreview.kt similarity index 95% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ComponentTestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ComponentTestPreview.kt index 598acfadb0..e74cb4d59b 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ComponentTestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ComponentTestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.runtime.Composable import com.airbnb.android.showkase.models.ShowkaseBrowserComponent diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt similarity index 97% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt index e05cb7c971..1c26565acf 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import android.content.res.Configuration import android.os.LocaleList @@ -37,7 +37,6 @@ import com.airbnb.android.showkase.models.Showkase import com.google.testing.junit.testparameterinjector.TestParameter import com.google.testing.junit.testparameterinjector.TestParameterInjector import io.element.android.libraries.designsystem.ElementXTheme -import io.element.android.libraries.tests.uitests.getMetadata import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TestPreview.kt similarity index 94% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TestPreview.kt index 6398a418bf..6892665e1a 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.runtime.Composable diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TypographyTestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TypographyTestPreview.kt similarity index 97% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TypographyTestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TypographyTestPreview.kt index 0ff497d5d8..80f27c25a0 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TypographyTestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TypographyTestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding