Rename all features modules

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

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

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.features.preferences.PreferencesFlowNode
-import io.element.android.x.features.roomlist.RoomListNode
+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

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.features.login.LoginFlowNode
-import io.element.android.x.features.onboarding.OnBoardingScreen
+import io.element.android.features.onboarding.OnBoardingScreen
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 

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

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

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.features.rageshake.bugreport.BugReportPresenter
-import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter
+import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter
-import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter
+import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter
 import javax.inject.Inject
 
 class RootPresenter @Inject constructor(

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.features.rageshake.bugreport.BugReportState
-import io.element.android.x.features.rageshake.crash.ui.CrashDetectionState
+import io.element.android.features.rageshake.crash.ui.CrashDetectionState
-import io.element.android.x.features.rageshake.detection.RageshakeDetectionState
+import io.element.android.features.rageshake.detection.RageshakeDetectionState
 
 @Stable
 data class RootState(

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.features.rageshake.crash.ui.CrashDetectionEvents
-import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView
+import io.element.android.features.rageshake.crash.ui.CrashDetectionView
-import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents
+import io.element.android.features.rageshake.detection.RageshakeDetectionEvents
-import io.element.android.x.features.rageshake.detection.RageshakeDetectionView
+import io.element.android.features.rageshake.detection.RageshakeDetectionView
 import io.element.android.tests.uitests.openShowkase
 
 @Composable

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 {

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

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.features.login.changeserver.ChangeServerNode
-import io.element.android.x.features.login.root.LoginRootNode
+import io.element.android.features.login.root.LoginRootNode
 import kotlinx.parcelize.Parcelize
 
 class LoginFlowNode(

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

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

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

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
 

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.features.login.R
-import io.element.android.x.features.login.error.changeServerError
+import io.element.android.features.login.error.changeServerError
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 

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

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

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

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

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

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

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

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 {

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

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

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

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

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
 

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

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 {

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

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.features.messages.actionlist.model.TimelineItemAction
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
 
 sealed interface MessagesEvents {
     data class HandleAction(val action: TimelineItemAction, val messageEvent: TimelineItem.MessageEvent) : MessagesEvents

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

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.features.messages.actionlist.ActionListPresenter
-import io.element.android.x.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.actionlist.model.TimelineItemAction
-import io.element.android.x.features.messages.textcomposer.MessageComposerEvents
+import io.element.android.features.messages.textcomposer.MessageComposerEvents
-import io.element.android.x.features.messages.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.textcomposer.MessageComposerPresenter
-import io.element.android.x.features.messages.textcomposer.MessageComposerState
+import io.element.android.features.messages.textcomposer.MessageComposerState
-import io.element.android.x.features.messages.timeline.TimelineEvents
+import io.element.android.features.messages.timeline.TimelineEvents
-import io.element.android.x.features.messages.timeline.TimelinePresenter
+import io.element.android.features.messages.timeline.TimelinePresenter
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent
+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

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.features.messages.actionlist.ActionListState
-import io.element.android.x.features.messages.textcomposer.MessageComposerState
+import io.element.android.features.messages.textcomposer.MessageComposerState
-import io.element.android.x.features.messages.timeline.TimelineState
+import io.element.android.features.messages.timeline.TimelineState
 import io.element.android.libraries.matrix.core.RoomId
 
 @Immutable

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.features.messages.actionlist.ActionListEvents
-import io.element.android.x.features.messages.actionlist.ActionListView
+import io.element.android.features.messages.actionlist.ActionListView
-import io.element.android.x.features.messages.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.actionlist.model.TimelineItemAction
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
-import io.element.android.x.features.messages.textcomposer.MessageComposerView
+import io.element.android.features.messages.textcomposer.MessageComposerView
-import io.element.android.x.features.messages.timeline.TimelineView
+import io.element.android.features.messages.timeline.TimelineView
 import kotlinx.coroutines.launch
 import timber.log.Timber
 

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

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.features.messages.actionlist.model.TimelineItemAction
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch

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.features.messages.actionlist.model.TimelineItemAction
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
 import kotlinx.collections.immutable.ImmutableList
 
 @Immutable

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.features.messages.actionlist.model.TimelineItemAction
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 

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

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
 

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

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

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

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
 

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.features.messages.timeline.diff.CacheInvalidator
-import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback
+import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback
-import io.element.android.x.features.messages.timeline.model.AggregatedReaction
+import io.element.android.features.messages.timeline.model.AggregatedReaction
-import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition
+import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
-import io.element.android.x.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.timeline.model.TimelineItemReactions
-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.x.features.messages.timeline.model.content.TimelineItemEmoteContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemEmoteContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemNoticeContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemNoticeContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent
-import io.element.android.x.features.messages.timeline.util.invalidateLast
+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

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

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
 

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.features.messages.timeline.model.AggregatedReaction
-import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition
+import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition
-import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider
+import io.element.android.features.messages.timeline.model.TimelineItemGroupPositionProvider
-import io.element.android.x.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.timeline.model.TimelineItemReactions
-import io.element.android.x.features.messages.timeline.model.TimelineItem
+import io.element.android.features.messages.timeline.model.TimelineItem
-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.x.features.messages.timeline.model.content.MessagesTimelineItemContentProvider
+import io.element.android.features.messages.timeline.model.content.MessagesTimelineItemContentProvider
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent
-import io.element.android.x.features.messages.timeline.components.MessageEventBubble
+import io.element.android.features.messages.timeline.components.MessageEventBubble
-import io.element.android.x.features.messages.timeline.components.TimelineItemReactionsView
+import io.element.android.features.messages.timeline.components.TimelineItemReactionsView
-import io.element.android.x.features.messages.timeline.components.TimelineItemEncryptedView
+import io.element.android.features.messages.timeline.components.TimelineItemEncryptedView
-import io.element.android.x.features.messages.timeline.components.TimelineItemImageView
+import io.element.android.features.messages.timeline.components.TimelineItemImageView
-import io.element.android.x.features.messages.timeline.components.TimelineItemRedactedView
+import io.element.android.features.messages.timeline.components.TimelineItemRedactedView
-import io.element.android.x.features.messages.timeline.components.TimelineItemTextView
+import io.element.android.features.messages.timeline.components.TimelineItemTextView
-import io.element.android.x.features.messages.timeline.components.TimelineItemUnknownView
+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

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
 

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(

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(

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

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.features.messages.timeline.model.AggregatedReaction
-import io.element.android.x.features.messages.timeline.model.TimelineItemReactions
+import io.element.android.features.messages.timeline.model.TimelineItemReactions
 
 @Composable
 fun TimelineItemReactionsView(

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(

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.features.messages.timeline.components.html.HtmlDocument
-import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent
+import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent
 
 @Composable
 fun TimelineItemTextView(

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(

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

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.features.messages.timeline.model.TimelineItem
-import io.element.android.x.features.messages.timeline.util.invalidateLast
+import io.element.android.features.messages.timeline.util.invalidateLast
 import timber.log.Timber
 
 internal class CacheInvalidator(private val itemStatesCache: MutableList<TimelineItem?>) :

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

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

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

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
 

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

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
 

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
 

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
 

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
 

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

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
 

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
 

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

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 <reified T> MutableList<T?>.invalidateLast() {
     val indexOfLast = size

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

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 {

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

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

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

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

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

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 {

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

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(

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

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.features.logout.LogoutPreferencePresenter
-import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter
+import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter
 import javax.inject.Inject
 
 class PreferencesRootPresenter @Inject constructor(

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.features.logout.LogoutPreferenceState
-import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState
+import io.element.android.features.rageshake.preferences.RageshakePreferencesState
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 
 data class PreferencesRootState(

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.features.logout.LogoutPreferenceState
-import io.element.android.x.features.logout.LogoutPreferenceView
+import io.element.android.features.logout.LogoutPreferenceView
-import io.element.android.x.features.preferences.user.UserPreferences
+import io.element.android.features.preferences.user.UserPreferences
-import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState
+import io.element.android.features.rageshake.preferences.RageshakePreferencesState
-import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView
+import io.element.android.features.rageshake.preferences.RageshakePreferencesView
 import io.element.android.libraries.ui.strings.R as StringR
 
 @Composable

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

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

features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt

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

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 {

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

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

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.features.rageshake.crash.CrashDataStore
-import io.element.android.x.features.rageshake.logs.VectorFileLogger
+import io.element.android.features.rageshake.logs.VectorFileLogger
-import io.element.android.x.features.rageshake.reporter.BugReporter
+import io.element.android.features.rageshake.reporter.BugReporter
-import io.element.android.x.features.rageshake.reporter.ReportType
+import io.element.android.features.rageshake.reporter.ReportType
-import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder
+import io.element.android.features.rageshake.screenshot.ScreenshotHolder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject

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

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

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