diff --git a/anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt similarity index 95% rename from anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt rename to anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt index 1367dc0dc7..cf9f2f3684 100644 --- a/anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt +++ b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.anvilannotations +package io.element.android.anvilannotations import kotlin.reflect.KClass diff --git a/anvilcodegen/build.gradle.kts b/anvilcodegen/build.gradle.kts index da817a5edb..e8b6ab285c 100644 --- a/anvilcodegen/build.gradle.kts +++ b/anvilcodegen/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - implementation(project(":anvilannotations")) + implementation(projects.anvilannotations) api(libs.anvil.compiler.api) implementation(libs.anvil.compiler.utils) implementation("com.squareup:kotlinpoet:1.12.0") diff --git a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt similarity index 96% rename from anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt rename to anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt index 0ca9da53af..576a52df89 100644 --- a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt +++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalAnvilApi::class) -package io.element.android.x.anvilcodegen +package io.element.android.anvilcodegen import com.google.auto.service.AutoService import com.squareup.anvil.annotations.ContributesTo @@ -46,7 +46,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.multibindings.IntoMap -import io.element.android.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile @@ -148,7 +148,7 @@ class ContributesNodeCodeGenerator : CodeGenerator { } companion object { - private val assistedNodeFactoryFqName = FqName("io.element.android.x.architecture.AssistedNodeFactory") - private val nodeKeyFqName = FqName("io.element.android.x.architecture.NodeKey") + private val assistedNodeFactoryFqName = FqName("io.element.android.libraries.architecture.AssistedNodeFactory") + private val nodeKeyFqName = FqName("io.element.android.libraries.architecture.NodeKey") } } diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a3818bf972..41029596ab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -164,9 +164,9 @@ knit { dependencies { allLibraries() allFeatures() - implementation(project(":tests:uitests")) - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) + implementation(projects.tests.uitests) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) // https://developer.android.com/studio/write/java8-support#library-desugaring-versions coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index 4532276e11..a1168f4efb 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -18,7 +18,7 @@ package io.element.android.x import android.app.Application import androidx.startup.AppInitializer -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.AppComponent import io.element.android.x.di.DaggerAppComponent import io.element.android.x.initializer.CrashInitializer diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt index 2630c78c7e..364ab6396d 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -25,9 +25,9 @@ import androidx.compose.ui.Modifier import androidx.core.view.WindowCompat import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integrationpoint.NodeComponentActivity -import io.element.android.x.architecture.bindings -import io.element.android.x.di.DaggerComponentOwner -import io.element.android.x.designsystem.ElementXTheme +import io.element.android.libraries.architecture.bindings +import io.element.android.libraries.di.DaggerComponentOwner +import io.element.android.libraries.designsystem.ElementXTheme import io.element.android.x.di.AppBindings import io.element.android.x.node.RootFlowNode diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 78f40f0322..f63a68f922 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -17,7 +17,8 @@ package io.element.android.x.di import com.squareup.anvil.annotations.ContributesTo -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.x.root.RootPresenter import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt index 342c18e3a4..ded3c333d7 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt @@ -20,7 +20,10 @@ import android.content.Context import com.squareup.anvil.annotations.MergeComponent import dagger.BindsInstance import dagger.Component -import io.element.android.x.architecture.NodeFactoriesBindings +import io.element.android.libraries.architecture.NodeFactoriesBindings +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn @SingleIn(AppScope::class) @MergeComponent(AppScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt index c1b3ff42e7..7cb3fb55c3 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt @@ -20,7 +20,10 @@ import android.content.Context import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index cfd7eee471..c60eba1575 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt @@ -20,8 +20,11 @@ import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.MergeSubcomponent import dagger.BindsInstance import dagger.Subcomponent -import io.element.android.x.architecture.NodeFactoriesBindings -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.architecture.NodeFactoriesBindings +import io.element.android.libraries.di.RoomScope +import io.element.android.libraries.di.SessionScope +import io.element.android.libraries.di.SingleIn +import io.element.android.libraries.matrix.room.MatrixRoom @SingleIn(RoomScope::class) @MergeSubcomponent(RoomScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 8da31df8eb..be558f6f63 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt @@ -20,8 +20,11 @@ import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.MergeSubcomponent import dagger.BindsInstance import dagger.Subcomponent -import io.element.android.x.architecture.NodeFactoriesBindings -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.architecture.NodeFactoriesBindings +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.SessionScope +import io.element.android.libraries.di.SingleIn +import io.element.android.libraries.matrix.MatrixClient @SingleIn(SessionScope::class) @MergeSubcomponent(SessionScope::class) 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/MatrixInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt index bfcdaea612..b6e88590a0 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt @@ -19,8 +19,8 @@ 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.matrix.tracing.TracingConfigurations -import io.element.android.x.matrix.tracing.setupTracing +import io.element.android.libraries.matrix.tracing.TracingConfigurations +import io.element.android.libraries.matrix.tracing.setupTracing class MatrixInitializer : 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 8a5a967875..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 @@ -32,16 +32,16 @@ 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.push -import io.element.android.x.architecture.bindings -import io.element.android.x.architecture.createNode -import io.element.android.x.di.DaggerComponentOwner +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.x.matrix.MatrixClient -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.ui.di.MatrixUIBindings +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 +import io.element.android.libraries.matrix.ui.di.MatrixUIBindings import kotlinx.parcelize.Parcelize class LoggedInFlowNode( 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 9db5f5cfb5..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 @@ -25,12 +25,12 @@ import com.bumble.appyx.core.modality.BuildContext 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.x.architecture.bindings -import io.element.android.x.architecture.createNode -import io.element.android.x.di.DaggerComponentOwner +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.x.matrix.room.MatrixRoom +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 9dee857470..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 @@ -36,13 +36,13 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.newRoot import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push -import io.element.android.x.architecture.createNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.DaggerComponentOwner -import io.element.android.x.features.rageshake.bugreport.BugReportNode -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.auth.MatrixAuthenticationService -import io.element.android.x.matrix.core.SessionId +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.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 import io.element.android.x.root.RootPresenter import io.element.android.x.root.RootView import kotlinx.coroutines.flow.distinctUntilChanged 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 2bcf49505a..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 @@ -19,10 +19,10 @@ package io.element.android.x.root import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.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.libraries.architecture.Presenter +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 b767fb164f..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,11 +25,11 @@ 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.x.tests.uitests.openShowkase +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 fun RootView( diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 4b979827d7..13d386671c 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 { @@ -32,17 +32,17 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:testtags")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.testtags) implementation(libs.appyx.core) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) 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 89% 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..4ad31d222f 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 @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.login.test", appContext.packageName) + assertEquals("io.element.android.features.login.test", appContext.packageName) } } 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 90% 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 12aa0887f2..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 @@ -25,9 +25,9 @@ import com.bumble.appyx.core.node.Node 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.x.architecture.createNode -import io.element.android.x.features.login.changeserver.ChangeServerNode -import io.element.android.x.features.login.root.LoginRootNode +import io.element.android.libraries.architecture.createNode +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 87% 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 2e20380182..4cec3ad0be 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 @@ -25,9 +25,9 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class ChangeServerNode @AssistedInject constructor( 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 88% 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 13259baf42..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 @@ -22,10 +22,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Async -import io.element.android.x.architecture.Presenter -import io.element.android.x.architecture.execute -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.architecture.execute +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject 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 88% 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 90dcb8ce64..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async data class ChangeServerState( val homeserver: String = "", 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 94% 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 3dfb1b1a25..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 @@ -52,13 +52,13 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.architecture.Async -import io.element.android.x.core.compose.textFieldState -import io.element.android.x.designsystem.components.VectorIcon -import io.element.android.x.features.login.R -import io.element.android.x.features.login.error.changeServerError -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +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.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 @Composable fun ChangeServerView( 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 86% 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 3700575b96..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,13 +14,13 @@ * 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.x.core.uri.isValidUrl -import io.element.android.x.features.login.root.LoginFormState -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.core.uri.isValidUrl +import io.element.android.features.login.root.LoginFormState +import io.element.android.libraries.ui.strings.R as StringR @Composable fun loginError( 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 87% 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 eb1f1d304b..87a1c3d248 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 @@ -27,10 +27,10 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.core.compose.OnLifecycleEvent -import io.element.android.x.di.AppScope +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.libraries.core.compose.OnLifecycleEvent +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class LoginRootNode @AssistedInject constructor( 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 94% 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 e6908dab5b..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 @@ -22,8 +22,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject 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 96% 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 67a9f19d31..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 @@ -58,12 +58,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.core.compose.textFieldState -import io.element.android.x.features.login.error.loginError -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.core.compose.textFieldState +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 +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable 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 93% 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 4481b3afff..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,10 +14,10 @@ * 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.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import kotlinx.parcelize.Parcelize data class LoginRootState( 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..71f4f78df4 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 { @@ -31,15 +31,15 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) 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 89% 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..1316448d00 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 @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.login.test", appContext.packageName) + assertEquals("io.element.android.features.login.test", appContext.packageName) } } 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 83% 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 578de59787..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,22 +14,23 @@ * 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 import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.x.architecture.Async -import io.element.android.x.architecture.Presenter -import io.element.android.x.architecture.execute -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.architecture.execute +import io.element.android.libraries.matrix.MatrixClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject -class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) : Presenter { +class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) : + Presenter { @Composable override fun present(): LogoutPreferenceState { 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 84% 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 5f76d9e3b4..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 @@ -24,12 +24,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.architecture.Async -import io.element.android.x.designsystem.components.ProgressDialog -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.designsystem.components.preferences.PreferenceCategory -import io.element.android.x.designsystem.components.preferences.PreferenceText -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.designsystem.components.ProgressDialog +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory +import io.element.android.libraries.designsystem.components.preferences.PreferenceText +import io.element.android.libraries.ui.strings.R as StringR @Composable fun LogoutPreferenceView( 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 88% 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 70e637899b..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async data class LogoutPreferenceState( val logoutAction: Async = Async.Uninitialized, 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..f11c076f27 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 { @@ -31,15 +31,15 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:textcomposer")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.textcomposer) implementation(libs.appyx.core) implementation(libs.coil.compose) implementation(libs.datetime) 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 89% 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..97ef4f5a3b 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 @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.messages.test", appContext.packageName) + assertEquals("io.element.android.features.messages.test", appContext.packageName) } } 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 87% 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 dd7b435ef0..ff8776b6aa 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 @@ -25,9 +25,9 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.RoomScope +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.libraries.di.RoomScope @ContributesNode(RoomScope::class) class MessagesNode @AssistedInject constructor( 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 79% 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 8324dc806b..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 @@ -24,22 +24,22 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.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.x.matrix.MatrixClient -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.ui.MatrixItemHelper -import io.element.android.x.textcomposer.MessageComposerMode +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.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 +import io.element.android.libraries.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber 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 70% 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 af3b0793b5..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,14 +14,14 @@ * 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.x.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.actionlist.ActionListState -import io.element.android.x.features.messages.textcomposer.MessageComposerState -import io.element.android.x.features.messages.timeline.TimelineState -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.designsystem.components.avatar.AvatarData +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 data class MessagesState( 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 90% 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 7711233699..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 @@ -56,15 +56,15 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.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.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.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 87% 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 cc894931c6..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,17 +14,17 @@ * 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 import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.x.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.libraries.architecture.Presenter +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 94% 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 7984577de4..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 @@ -41,9 +41,9 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import io.element.android.x.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.libraries.designsystem.components.VectorIcon +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 54% 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 4e23eb34f0..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,11 +14,11 @@ * 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 -import io.element.android.x.designsystem.VectorIcons +import io.element.android.libraries.designsystem.VectorIcons @Immutable sealed class TimelineItemAction( @@ -26,9 +26,9 @@ sealed class TimelineItemAction( @DrawableRes val icon: Int, val destructive: Boolean = false ) { - object Forward : TimelineItemAction("Forward", VectorIcons.ArrowForward) - object Copy : TimelineItemAction("Copy", VectorIcons.Copy) - object Redact : TimelineItemAction("Redact", VectorIcons.Delete, destructive = true) - object Reply : TimelineItemAction("Reply", VectorIcons.Reply) - object Edit : TimelineItemAction("Edit", VectorIcons.Edit) + object Forward : TimelineItemAction("Forward", io.element.android.libraries.designsystem.VectorIcons.ArrowForward) + object Copy : TimelineItemAction("Copy", io.element.android.libraries.designsystem.VectorIcons.Copy) + object Redact : TimelineItemAction("Redact", io.element.android.libraries.designsystem.VectorIcons.Delete, destructive = true) + object Reply : TimelineItemAction("Reply", io.element.android.libraries.designsystem.VectorIcons.Reply) + object Edit : TimelineItemAction("Edit", io.element.android.libraries.designsystem.VectorIcons.Edit) } 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 88% 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 8e4e3ffddd..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.textcomposer.MessageComposerMode sealed interface MessageComposerEvents { object ToggleFullScreenState : MessageComposerEvents 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 90% 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 aba47ec90b..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,18 +14,18 @@ * 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 import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter -import io.element.android.x.core.data.StableCharSequence -import io.element.android.x.core.data.toStableCharSequence -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.core.data.StableCharSequence +import io.element.android.libraries.core.data.toStableCharSequence +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject 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 82% 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 44c8e73d7e..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,11 +14,11 @@ * 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.x.core.data.StableCharSequence -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.core.data.StableCharSequence +import io.element.android.libraries.textcomposer.MessageComposerMode @Immutable data class MessageComposerState( 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 90% 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 e5555bf477..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,12 +14,12 @@ * 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 -import io.element.android.x.designsystem.LocalIsDarkTheme -import io.element.android.x.textcomposer.TextComposer +import io.element.android.libraries.designsystem.LocalIsDarkTheme +import io.element.android.libraries.textcomposer.TextComposer @Composable fun MessageComposerView( 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 87% 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 733a082d73..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId sealed interface TimelineEvents { object LoadMore : TimelineEvents 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 84% 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 0b8a3bfc48..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,30 +14,30 @@ * 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.x.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.x.matrix.core.EventId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.timeline.MatrixTimelineItem -import io.element.android.x.matrix.ui.MatrixItemHelper +import io.element.android.libraries.designsystem.components.avatar.AvatarSize +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 +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.ui.MatrixItemHelper import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.MutableStateFlow 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 87% 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 9cbd2a4acf..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 @@ -24,14 +24,14 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter -import io.element.android.x.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimelineItem -import io.element.android.x.matrix.ui.MatrixItemHelper +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.ui.MatrixItemHelper import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn 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 83% 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 c4ea612334..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,11 +14,11 @@ * 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.x.matrix.core.EventId +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList @Immutable 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 87% 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 b2ecc490b3..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 @@ -58,29 +58,29 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import io.element.android.x.core.compose.PairCombinedPreviewParameter -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.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.x.matrix.core.EventId +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.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 import kotlinx.coroutines.flow.distinctUntilChanged 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 86% 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 7466d38e1a..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 @@ -29,14 +29,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Shape import androidx.compose.ui.unit.dp -import io.element.android.x.designsystem.LocalIsDarkTheme -import io.element.android.x.designsystem.MessageHighlightDark -import io.element.android.x.designsystem.MessageHighlightLight -import io.element.android.x.designsystem.SystemGrey5Dark -import io.element.android.x.designsystem.SystemGrey5Light -import io.element.android.x.designsystem.SystemGrey6Dark -import io.element.android.x.designsystem.SystemGrey6Light -import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition +import io.element.android.libraries.designsystem.LocalIsDarkTheme +import io.element.android.libraries.designsystem.MessageHighlightDark +import io.element.android.libraries.designsystem.MessageHighlightLight +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.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 88% 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 4751f2ae0d..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 @@ -28,10 +28,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.core.text.util.LinkifyCompat -import io.element.android.x.designsystem.LinkColor -import io.element.android.x.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.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText +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 98% 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 e5dcfc1112..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 @@ -47,10 +47,10 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow -import io.element.android.x.designsystem.LinkColor -import io.element.android.x.designsystem.components.ClickableLinkText -import io.element.android.x.matrix.permalink.PermalinkData -import io.element.android.x.matrix.permalink.PermalinkParser +import io.element.android.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText +import io.element.android.libraries.matrix.permalink.PermalinkData +import io.element.android.libraries.matrix.permalink.PermalinkParser import kotlinx.collections.immutable.persistentMapOf import org.jsoup.nodes.Document import org.jsoup.nodes.Element 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 92% 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 45b754043a..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,10 +14,10 @@ * 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.x.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem internal class MatrixTimelineItemsDiffCallback( private val oldList: List, 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 82% 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 ef93d38aa2..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,12 +14,12 @@ * 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.x.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.libraries.matrix.core.EventId @Immutable sealed interface TimelineItem { 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 85% 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 25e983d6a4..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,9 +14,9 @@ * 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.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver data class TimelineItemImageContent( val body: String, 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..00f4503666 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -22,16 +22,16 @@ plugins { } android { - namespace = "io.element.android.x.features.onboarding" + namespace = "io.element.android.features.onboarding" } dependencies { - implementation(project(":libraries:core")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:testtags")) + implementation(projects.libraries.core) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.architecture) + implementation(projects.libraries.testtags) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) implementation(libs.appyx.core) 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 89% 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..4ad31d222f 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 @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.login.test", appContext.packageName) + assertEquals("io.element.android.features.login.test", appContext.packageName) } } 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 95% 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 138840e222..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 @@ -49,12 +49,12 @@ import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState -import io.element.android.x.designsystem.components.VectorButton -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +import io.element.android.libraries.designsystem.components.VectorButton +import io.element.android.libraries.testtags.TestTags +import io.element.android.libraries.testtags.testTag import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalPagerApi::class) @Composable 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 96% 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 c25fb89815..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,10 +14,10 @@ * 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.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR class SplashCarouselStateFactory { fun create(): SplashCarouselState { 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..10b3f4917d 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 { @@ -32,17 +32,17 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrixui")) - implementation(project(":features:rageshake")) - implementation(project(":features:logout")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.libraries.matrixui) + implementation(projects.features.rageshake) + implementation(projects.features.logout) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.datetime) implementation(libs.accompanist.placeholder) testImplementation(libs.test.junit) diff --git a/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..3b0a6ee9ae --- /dev/null +++ b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt @@ -0,0 +1,38 @@ +/* + * 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.preferences + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("io.element.android.features.preferences.test", appContext.packageName) + } +} 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/x/features/preferences/ExampleInstrumentedTest.kt deleted file mode 100644 index 6492607f4a..0000000000 --- a/features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,38 +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 androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.preferences.test", appContext.packageName) - } -} 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 91% 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 6a5397074f..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 @@ -24,8 +24,8 @@ import com.bumble.appyx.core.modality.BuildContext 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.x.architecture.createNode -import io.element.android.x.features.preferences.root.PreferencesRootNode +import io.element.android.libraries.architecture.createNode +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 88% 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 429609e207..b1ef84646b 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 @@ -26,9 +26,9 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.SessionScope +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.libraries.di.SessionScope @ContributesNode(SessionScope::class) class PreferencesRootNode @AssistedInject constructor( 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 79% 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 dbc233b805..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.x.architecture.Async -import io.element.android.x.architecture.Presenter -import io.element.android.x.features.logout.LogoutPreferencePresenter -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter +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 70% 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 9339f00464..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,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root -import io.element.android.x.architecture.Async -import io.element.android.x.features.logout.LogoutPreferenceState -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.architecture.Async +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( val logoutState: LogoutPreferenceState, 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 73% 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 5d3e1dab7b..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,20 +14,20 @@ * 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 import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.architecture.Async -import io.element.android.x.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.x.ui.strings.R as StringR +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.designsystem.components.preferences.PreferenceView +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 fun PreferencesRootView( 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 82% 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 5422a3f3f5..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,16 +14,16 @@ * 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 import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import io.element.android.x.architecture.Async -import io.element.android.x.matrix.ui.components.MatrixUserHeader -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.matrix.ui.components.MatrixUserHeader +import io.element.android.libraries.matrix.ui.model.MatrixUser @Composable fun UserPreferences( 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..16f529db26 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 { @@ -32,14 +32,14 @@ anvil { } dependencies { - implementation(project(":libraries:core")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":anvilannotations")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.core) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.anvilannotations) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.squareup.seismic) implementation(libs.androidx.datastore.preferences) implementation(libs.coil) 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 88% 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 c01f153ddd..b7a32c9b05 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 @@ -26,9 +26,9 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class BugReportNode @AssistedInject constructor( 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 91% 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 c6f2f473e3..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 @@ -24,13 +24,13 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.core.net.toUri -import io.element.android.x.architecture.Async -import io.element.android.x.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.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter +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 93% 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 80912a7923..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,10 +14,10 @@ * 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.x.architecture.Async +import io.element.android.libraries.architecture.Async import kotlinx.parcelize.Parcelize data class BugReportState( 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 95% 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 009ca812ef..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 @@ -50,12 +50,12 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest -import io.element.android.x.architecture.Async -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.core.compose.textFieldState -import io.element.android.x.designsystem.components.LabelledCheckbox -import io.element.android.x.designsystem.components.dialogs.ErrorDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.core.compose.textFieldState +import io.element.android.libraries.designsystem.components.LabelledCheckbox +import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable 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 93% 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 07783f3e0b..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 @@ -23,8 +23,8 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import io.element.android.x.core.bool.orFalse -import io.element.android.x.di.ApplicationContext +import io.element.android.libraries.core.bool.orFalse +import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map 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 96% 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 08a23da860..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,11 +14,11 @@ * 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 -import io.element.android.x.core.data.tryOrNull +import io.element.android.libraries.core.data.tryOrNull import java.io.PrintWriter import java.io.StringWriter import timber.log.Timber 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 87% 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 3549bf3cb7..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,18 +14,19 @@ * 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.x.architecture.Presenter -import io.element.android.x.features.rageshake.crash.CrashDataStore +import io.element.android.libraries.architecture.Presenter +import io.element.android.features.rageshake.crash.CrashDataStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject -class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) : Presenter { +class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) : + Presenter { @Composable override fun present(): CrashDetectionState { 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 88% 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 494cc0d843..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,14 +14,14 @@ * 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 import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.ui.strings.R as StringR @Composable fun CrashDetectionView( 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 88% 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 0ba2a26bae..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection -import io.element.android.x.core.screenshot.ImageResult +import io.element.android.libraries.core.screenshot.ImageResult sealed interface RageshakeDetectionEvents { object Dismiss : RageshakeDetectionEvents 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 89% 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 62e974703d..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 @@ -23,12 +23,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter -import io.element.android.x.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.libraries.architecture.Presenter +import io.element.android.libraries.core.screenshot.ImageResult +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 85% 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 c438c0a600..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 @@ -23,13 +23,13 @@ import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.lifecycle.Lifecycle -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.core.compose.OnLifecycleEvent -import io.element.android.x.core.hardware.vibrate -import io.element.android.x.core.screenshot.ImageResult -import io.element.android.x.core.screenshot.screenshot -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.core.compose.OnLifecycleEvent +import io.element.android.libraries.core.hardware.vibrate +import io.element.android.libraries.core.screenshot.ImageResult +import io.element.android.libraries.core.screenshot.screenshot +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RageshakeDetectionView( 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 97% 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 5b39b79cf5..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,11 +14,11 @@ * 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 -import io.element.android.x.core.data.tryOrNull +import io.element.android.libraries.core.data.tryOrNull import java.io.File import java.io.PrintWriter import java.io.StringWriter 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 90% 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 e435a1a756..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 @@ -22,9 +22,9 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter -import io.element.android.x.features.rageshake.rageshake.RageShake -import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore +import io.element.android.libraries.architecture.Presenter +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 86% 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 43f7f94d03..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 @@ -23,11 +23,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.PreferenceCategory -import io.element.android.x.designsystem.components.preferences.PreferenceSlide -import io.element.android.x.designsystem.components.preferences.PreferenceSwitch -import io.element.android.x.designsystem.components.preferences.PreferenceText -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory +import io.element.android.libraries.designsystem.components.preferences.PreferenceSlide +import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch +import io.element.android.libraries.designsystem.components.preferences.PreferenceText +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RageshakePreferencesView( 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 90% 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 ae9c3531c5..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,16 +14,16 @@ * 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 import android.hardware.SensorManager import androidx.core.content.getSystemService import com.squareup.seismic.ShakeDetector -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import javax.inject.Inject @SingleIn(AppScope::class) 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 92% 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 35d0198b9e..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 @@ -23,8 +23,8 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import io.element.android.x.core.bool.orTrue -import io.element.android.x.di.ApplicationContext +import io.element.android.libraries.core.bool.orTrue +import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map 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 97% 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 fe3ca71720..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,18 +14,18 @@ * 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 -import io.element.android.x.core.extensions.toOnOff -import io.element.android.x.core.file.compressFile -import io.element.android.x.core.mimetype.MimeTypes -import io.element.android.x.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.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.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 80% 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 00f9d74e96..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,14 +14,14 @@ * 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 -import io.element.android.x.core.bitmap.writeBitmap -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.core.bitmap.writeBitmap +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import java.io.File import javax.inject.Inject 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..2d23e891cc 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 { @@ -31,18 +31,18 @@ anvil { } dependencies { - anvil(project(":anvilcodegen")) - implementation(project(":anvilannotations")) + anvil(projects.anvilcodegen) + implementation(projects.anvilannotations) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) implementation(libs.appyx.core) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.datetime) implementation(libs.accompanist.placeholder) @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(project(":libraries:matrixtest")) + testImplementation(projects.libraries.matrixtest) androidTestImplementation(libs.test.junitext) diff --git a/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..e66201078b --- /dev/null +++ b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt @@ -0,0 +1,38 @@ +/* + * 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.roomlist + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("io.element.android.features.roomlist.test", appContext.packageName) + } +} 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/x/features/roomlist/ExampleInstrumentedTest.kt deleted file mode 100644 index 487d999142..0000000000 --- a/features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,38 +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.roomlist - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.roomlist.test", appContext.packageName) - } -} 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 87% 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 246545588f..4e153a2328 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 @@ -26,10 +26,10 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.SessionScope -import io.element.android.x.matrix.core.RoomId +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.libraries.di.SessionScope +import io.element.android.libraries.matrix.core.RoomId @ContributesNode(SessionScope::class) class RoomListNode @AssistedInject constructor( 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 87% 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 991239ba59..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 @@ -25,18 +25,18 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import io.element.android.x.architecture.Presenter -import io.element.android.x.core.coroutine.parallelMap -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.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.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.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.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 +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList 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 86% 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 d5c51b1ea3..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 @@ -36,17 +36,17 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Velocity -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.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.x.matrix.core.RoomId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.designsystem.components.avatar.AvatarData +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 import kotlinx.collections.immutable.ImmutableList @Composable 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 94% 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 d8fe56142b..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 @@ -52,11 +52,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.core.compose.textFieldState -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.core.compose.textFieldState +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RoomListTopBar( 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 96% 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 ef8b4ac341..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 @@ -52,8 +52,8 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.placeholder.material.placeholder -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.features.roomlist.model.RoomListRoomSummary +import io.element.android.libraries.designsystem.components.avatar.Avatar +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 84% 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 4bac53544c..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,11 +14,11 @@ * 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.x.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.matrix.core.RoomId @Immutable data class RoomListRoomSummary( 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 90% 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 c714baf3d3..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData object RoomListRoomSummaryPlaceholders { 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 88% 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 ce2e679fa0..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,10 +14,10 @@ * 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.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList @Immutable 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 91% 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 71ba70829f..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,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf 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 80% 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 cd1b148ce5..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,14 +14,16 @@ * 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 import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.x.libraries.matrixtest.FakeMatrixClient -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrixtest.FakeMatrixClient +import io.element.android.libraries.matrix.core.SessionId +import 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..fea038bf14 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 { @@ -32,17 +32,17 @@ anvil { } dependencies { - anvil(project(":anvilcodegen")) - implementation(project(":anvilannotations")) + anvil(projects.anvilcodegen) + implementation(projects.anvilannotations) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.appyx.core) @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(project(":libraries:matrixtest")) + testImplementation(projects.libraries.matrixtest) androidTestImplementation(libs.test.junitext) 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 88% 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 7c5c4e78de..6e08d6887d 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 @@ -25,9 +25,9 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.libraries.architecture.presenterConnector +import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.di.AppScope // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope @ContributesNode(AppScope::class) 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 90% 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 3f6b5938e6..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,10 +14,10 @@ * 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import javax.inject.Inject class TemplatePresenter @Inject constructor() : 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/libraries/architecture/build.gradle.kts b/libraries/architecture/build.gradle.kts index 2fad440e85..9c4ae9e3ac 100644 --- a/libraries/architecture/build.gradle.kts +++ b/libraries/architecture/build.gradle.kts @@ -21,11 +21,11 @@ plugins { } android { - namespace = "io.element.android.x.libraries.architecture" + namespace = "io.element.android.libraries.architecture" } dependencies { - api(project(":libraries:di")) + api(projects.libraries.di) api(libs.dagger) api(libs.appyx.core) api(libs.molecule.runtime) diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt similarity index 94% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt index eb1d416fa7..6852bf9adb 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt similarity index 97% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt index 9428eda509..94d81a28e2 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import androidx.compose.runtime.MutableState import androidx.compose.runtime.Stable diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt similarity index 94% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt index be09103db3..e4a6d7ae7d 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import android.content.Context import android.content.ContextWrapper import com.bumble.appyx.core.node.Node -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner inline fun Node.bindings() = bindings(T::class.java) inline fun Context.bindings() = bindings(T::class.java) diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt similarity index 96% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt index c7a82bd481..6a4d52d20e 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt similarity index 94% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt index 59150edf5f..b28d5a8145 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import com.bumble.appyx.core.node.Node import dagger.MapKey diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt similarity index 93% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt index 6d5e7de444..9bfd089c27 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import androidx.compose.runtime.Composable diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt similarity index 96% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt index 61659c7f80..0e97dba712 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope diff --git a/libraries/core/build.gradle.kts b/libraries/core/build.gradle.kts index 4004ca1041..290ec420ba 100644 --- a/libraries/core/build.gradle.kts +++ b/libraries/core/build.gradle.kts @@ -19,5 +19,5 @@ plugins { } android { - namespace = "io.element.android.x.core" + namespace = "io.element.android.libraries.core" } diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/bitmap/Bitmap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/bitmap/Bitmap.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt index 028c871041..3bb978f67d 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/bitmap/Bitmap.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.bitmap +package io.element.android.libraries.core.bitmap import android.graphics.Bitmap import java.io.File diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/bool/Booleans.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt similarity index 93% rename from libraries/core/src/main/kotlin/io/element/android/x/core/bool/Booleans.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt index 46244de753..2613176643 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/bool/Booleans.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.bool +package io.element.android.libraries.core.bool fun Boolean?.orTrue() = this ?: true diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/Keyboard.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/Keyboard.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt index b0b95fc2dc..4e66199845 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/Keyboard.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.WindowInsets diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/LogCompositions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt similarity index 89% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/LogCompositions.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt index ec88d4433a..eff24198db 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/LogCompositions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.runtime.remember -import io.element.android.x.core.BuildConfig +import io.element.android.libraries.core.BuildConfig import timber.log.Timber // Note the inline function below which ensures that this function is essentially diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/OnLifecycleEvent.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/OnLifecycleEvent.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt index 499ab20bbe..51a117bacf 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/OnLifecycleEvent.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt index 74c04cdded..253ee8fb5c 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.ui.tooling.preview.PreviewParameterProvider diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/TextFieldLocalState.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/TextFieldLocalState.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt index fa4b9eea85..c1a311492b 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/TextFieldLocalState.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/CoroutineDispatchers.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/CoroutineDispatchers.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt index d36b9240dd..39e5e0dd51 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/CoroutineDispatchers.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.coroutine +package io.element.android.libraries.core.coroutine import kotlinx.coroutines.CoroutineDispatcher diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/TimingOperators.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt similarity index 98% rename from libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/TimingOperators.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt index 67405aeb9f..68e92e0289 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/TimingOperators.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.coroutine +package io.element.android.libraries.core.coroutine import android.os.SystemClock import kotlinx.coroutines.CoroutineScope diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/pmap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/pmap.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt index a952d74222..f823116898 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/pmap.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.coroutine +package io.element.android.libraries.core.coroutine import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/data/StableCharSequence.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/StableCharSequence.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/x/core/data/StableCharSequence.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/data/StableCharSequence.kt index 92e9cae64a..25f68f2fea 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/data/StableCharSequence.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/StableCharSequence.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.data +package io.element.android.libraries.core.data /** * Wrapper for a CharSequence, which support mutation of the CharSequence. diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/data/Try.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/data/Try.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt index ccaf5fb54b..21e4bb7738 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/data/Try.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.data +package io.element.android.libraries.core.data import timber.log.Timber diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt similarity index 97% rename from libraries/core/src/main/kotlin/io/element/android/x/core/extensions/BasicExtensions.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt index 5e77bb3b91..9ae50826c6 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/extensions/BasicExtensions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.extensions +package io.element.android.libraries.core.extensions import android.util.Patterns diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/file/compressFile.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/file/compressFile.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt index aade7bf8e3..ff6fc22178 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/file/compressFile.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.file +package io.element.android.libraries.core.file import java.io.File import java.util.zip.GZIPOutputStream diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/hardware/vibrator.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/x/core/hardware/vibrator.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt index de22f9c463..e7f95a20d9 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/hardware/vibrator.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.hardware +package io.element.android.libraries.core.hardware import android.content.Context import android.os.Build diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/mimetype/MimeTypes.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt similarity index 92% rename from libraries/core/src/main/kotlin/io/element/android/x/core/mimetype/MimeTypes.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt index fa21816cfd..082623b4de 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/mimetype/MimeTypes.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.core.mimetype +package io.element.android.libraries.core.mimetype -import io.element.android.x.core.bool.orFalse +import io.element.android.libraries.core.bool.orFalse // The Android SDK does not provide constant for mime type, add some of them here object MimeTypes { diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/screenshot/Screenshot.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt similarity index 97% rename from libraries/core/src/main/kotlin/io/element/android/x/core/screenshot/Screenshot.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt index 26a2e57c9e..c1e1a3be80 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/screenshot/Screenshot.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.screenshot +package io.element.android.libraries.core.screenshot import android.app.Activity import android.graphics.Bitmap diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/DimensionConverter.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/ui/DimensionConverter.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt index f0395b1d3d..cde1a49cda 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/DimensionConverter.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.element.android.x.core.ui +package io.element.android.libraries.core.ui import android.content.res.Resources import android.util.TypedValue diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/View.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/ui/View.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt index 99147d76a6..5d10fdd50a 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/View.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.ui +package io.element.android.libraries.core.ui import android.view.View import android.view.inputmethod.InputMethodManager diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/uri/UrlUtils.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/uri/UrlUtils.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt index 8574727e35..4fb5e986fd 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/uri/UrlUtils.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.uri +package io.element.android.libraries.core.uri import java.net.URL diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts index 597d8a4514..45430e5d82 100644 --- a/libraries/designsystem/build.gradle.kts +++ b/libraries/designsystem/build.gradle.kts @@ -22,14 +22,14 @@ plugins { } android { - namespace = "io.element.android.x.libraries.designsystem" + namespace = "io.element.android.libraries.designsystem" dependencies { // Should not be there, but this is a POC implementation(libs.coil.compose) implementation(libs.accompanist.systemui) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt similarity index 95% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt index c2ce45f879..936f102a85 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import androidx.compose.ui.graphics.Color import com.airbnb.android.showkase.annotation.ShowkaseColor diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt similarity index 91% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt index 7ecf7c428e..b15bfc49db 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt similarity index 97% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt index 34bda66a21..d2168f644e 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt similarity index 98% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt index df87fba257..6e97bfa4fb 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt similarity index 86% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt index d29ff12b9e..a11b0b96bb 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,9 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem - -import io.element.android.x.libraries.designsystem.R +package io.element.android.libraries.designsystem object VectorIcons { val Copy = R.drawable.ic_content_copy diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt similarity index 98% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt index 1166a20f92..591baf1152 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt similarity index 96% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt index fcbc6f8d02..f1ad5738ac 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt similarity index 97% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt index c374dec691..8bcc77226b 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt index e728636d55..928e83cfa4 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.material3.Button import androidx.compose.material3.Text diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt index f0e93aefd0..60e7c644ad 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt similarity index 92% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt index e2465e3f13..bda58ec0f0 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.avatar +package io.element.android.libraries.designsystem.components.avatar import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -32,8 +32,8 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp import coil.compose.AsyncImage -import io.element.android.x.designsystem.AvatarGradientEnd -import io.element.android.x.designsystem.AvatarGradientStart +import io.element.android.libraries.designsystem.AvatarGradientEnd +import io.element.android.libraries.designsystem.AvatarGradientStart import timber.log.Timber @Composable diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt similarity index 93% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt index d4fb492901..0ccc89eeaf 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.avatar +package io.element.android.libraries.designsystem.components.avatar import androidx.compose.runtime.Immutable diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt similarity index 87% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt index a0b4643191..35689817b0 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.avatar +package io.element.android.libraries.designsystem.components.avatar import androidx.compose.ui.unit.dp diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt similarity index 95% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt index 9d74a2da87..6059b6b998 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.dialogs +package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun ConfirmationDialog( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt similarity index 92% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt index 241d47fe9f..99e473fdbd 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.dialogs +package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row @@ -28,7 +28,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun ErrorDialog( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt similarity index 86% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt index ffce99028d..1bae5df7cc 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.ui.unit.dp diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt index e74645950c..c9e6ac6740 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt similarity index 97% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt index 2d2e42c9df..4b5f007506 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt similarity index 91% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt index af6641f13d..aadb0ab236 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.annotation.FloatRange import androidx.compose.foundation.layout.Box @@ -31,8 +31,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon -import io.element.android.x.designsystem.toEnabledColor +import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon +import io.element.android.libraries.designsystem.toEnabledColor @Composable fun PreferenceSlide( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt similarity index 90% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt index 4dc6609a41..68a402296c 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -32,8 +32,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon -import io.element.android.x.designsystem.toEnabledColor +import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon +import io.element.android.libraries.designsystem.toEnabledColor @Composable fun PreferenceSwitch( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt similarity index 91% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt index 5922a1a92c..bef45830e2 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -31,7 +31,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon +import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon @Composable fun PreferenceText( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt similarity index 88% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt index 9dc5fe0e8f..6a821333cc 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences.components +package io.element.android.libraries.designsystem.components.preferences.components import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding @@ -24,7 +24,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import io.element.android.x.designsystem.toEnabledColor +import io.element.android.libraries.designsystem.toEnabledColor @Composable fun PreferenceIcon( diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt index 79782c60d9..2b40d59894 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class AppScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt index 7ed9251cee..2108678097 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di import javax.inject.Qualifier diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt similarity index 95% rename from libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt index eaf3371be3..57f5540c16 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di /** * A [DaggerComponentOwner] is anything that "owns" a Dagger Component. diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt index bcdb76c31d..af25c4cda5 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class RoomScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt index 55fbb71a8e..8ebd6ecaee 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class SessionScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt index 9e9fb7e24e..42a6b860ca 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di import javax.inject.Scope import kotlin.reflect.KClass diff --git a/libraries/elementresources/build.gradle.kts b/libraries/elementresources/build.gradle.kts index 3202b47a8d..b61593b700 100644 --- a/libraries/elementresources/build.gradle.kts +++ b/libraries/elementresources/build.gradle.kts @@ -19,7 +19,7 @@ plugins { } android { - namespace = "io.element.android.x.element.resources" + namespace = "io.element.android.element.resources" } dependencies { diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts index 56f33523a7..6db92e02f3 100644 --- a/libraries/matrix/build.gradle.kts +++ b/libraries/matrix/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.matrix" + namespace = "io.element.android.libraries.matrix" } anvil { @@ -31,10 +31,10 @@ anvil { } dependencies { - api(project(":libraries:rustsdk")) - implementation(project(":libraries:di")) + api(projects.libraries.rustsdk) + implementation(projects.libraries.di) implementation(libs.dagger) - implementation(project(":libraries:core")) + implementation(projects.libraries.core) implementation("net.java.dev.jna:jna:5.13.0@aar") implementation(libs.androidx.datastore.preferences) implementation(libs.serialization.json) diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt index b48137013e..85c1e6010e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix internal const val LOG_TAG = "Matrix" diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt similarity index 76% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt index d0d446909b..1d3fc62ff7 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import org.matrix.rustcomponents.sdk.MediaSource import java.io.Closeable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index b96b1e87fb..64b1cb4e34 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,22 +14,22 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix -import io.element.android.x.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.media.RustMediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource -import io.element.android.x.matrix.room.RustMatrixRoom -import io.element.android.x.matrix.room.RustRoomSummaryDataSource -import io.element.android.x.matrix.session.PreferencesSessionStore -import io.element.android.x.matrix.session.SessionStore -import io.element.android.x.matrix.session.sessionId -import io.element.android.x.matrix.sync.SlidingSyncObserverProxy +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.RustMediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.room.RustMatrixRoom +import io.element.android.libraries.matrix.room.RustRoomSummaryDataSource +import io.element.android.libraries.matrix.session.PreferencesSessionStore +import io.element.android.libraries.matrix.session.SessionStore +import io.element.android.libraries.matrix.session.sessionId +import io.element.android.libraries.matrix.sync.SlidingSyncObserverProxy import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.withContext import org.matrix.rustcomponents.sdk.Client diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt index f353a4d789..122c079971 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.auth +package io.element.android.libraries.matrix.auth -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.flow.Flow interface MatrixAuthenticationService { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt index 3efb6d82c8..d0d115123f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.element.android.x.matrix.auth +package io.element.android.libraries.matrix.auth import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.x.core.coroutine.CoroutineDispatchers -import io.element.android.x.di.AppScope -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.RustMatrixClient -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.session.SessionStore -import io.element.android.x.matrix.session.sessionId -import io.element.android.x.matrix.util.logError +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.RustMatrixClient +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.session.SessionStore +import io.element.android.libraries.matrix.session.sessionId +import io.element.android.libraries.matrix.util.logError import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt index 77460d5b86..7ad4235e5e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt similarity index 98% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt index c6a4ae4dcd..b2043d216b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core -import io.element.android.x.matrix.BuildConfig +import io.element.android.libraries.matrix.BuildConfig import timber.log.Timber /** diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt index db166d57a0..1a50c6a83a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt index d75f4c15a7..bf1ce0c04b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt index 685d4627ef..63f2c85216 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt index 2808c3667b..9b0583d2d1 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.di +package io.element.android.libraries.matrix.di import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides -import io.element.android.x.di.AppScope -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.SingleIn import org.matrix.rustcomponents.sdk.AuthenticationService import java.io.File diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt index 0fb796a421..aad5d11d58 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.media +package io.element.android.libraries.matrix.media import org.matrix.rustcomponents.sdk.MediaSource diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt index f8c1ca3868..1b1eaf7bc9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.media +package io.element.android.libraries.matrix.media -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import org.matrix.rustcomponents.sdk.mediaSourceFromUrl internal class RustMediaResolver(private val client: MatrixClient) : MediaResolver { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt index 8b0468277e..8ef0bbcd08 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt index e1c489331e..b5f8b7fd92 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt index a69d71516c..411ba1576f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri import android.net.UrlQuerySanitizer -import io.element.android.x.matrix.core.MatrixPatterns +import io.element.android.libraries.matrix.core.MatrixPatterns import java.net.URLDecoder import timber.log.Timber diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt similarity index 85% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt index f2ecdb2b70..06c1fa0f76 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.timeline.MatrixTimeline import kotlinx.coroutines.flow.Flow interface MatrixRoom { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt index 2fc0a23a21..e307bf0dad 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt index 56e479e1d5..8b922b322d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId sealed interface RoomSummary { data class Empty(val identifier: String) : RoomSummary diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt index 81b9f20af1..25f1af2269 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.sync.roomListDiff -import io.element.android.x.matrix.sync.state +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.sync.roomListDiff +import io.element.android.libraries.matrix.sync.state import java.io.Closeable import java.util.Collections import java.util.UUID diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt index 93202ef742..d295f9848e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.room.message.RoomMessageFactory +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.room.message.RoomMessageFactory import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.SlidingSyncRoom diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt similarity index 91% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt index 7d7c2414fb..c481b7c3d5 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.RustMatrixTimeline +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.RustMatrixTimeline import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt similarity index 77% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt index da9e097540..3bfe5b5edb 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room.message +package io.element.android.libraries.matrix.room.message -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.UserId data class RoomMessage( val eventId: EventId, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt similarity index 84% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt index 318e429070..348551835d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room.message +package io.element.android.libraries.matrix.room.message -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.UserId import org.matrix.rustcomponents.sdk.EventTimelineItem class RoomMessageFactory { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt index 6c8f6498e3..02241bc0f9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session import android.content.Context import androidx.datastore.core.DataStore @@ -23,9 +23,9 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt index 53b69ce975..a1943f273c 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import org.matrix.rustcomponents.sdk.Session fun Session.sessionId() = SessionId("${userId}_${deviceId}") diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt index 4380518ce9..07c40ab54a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.Session diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt index 014d9c64c8..5774e23cb4 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.sync +package io.element.android.libraries.matrix.sync -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt index 0fed5ee936..a3d323b8d0 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.sync +package io.element.android.libraries.matrix.sync -import io.element.android.x.matrix.util.mxCallbackFlow +import io.element.android.libraries.matrix.util.mxCallbackFlow import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt index 2f383cebf2..67ab8969b3 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.TimelineListener diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt index 365319d803..022988fd4f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline import org.matrix.rustcomponents.sdk.EventTimelineItem import org.matrix.rustcomponents.sdk.TimelineItem diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt index ecfce4af7a..1f6722d823 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline -import io.element.android.x.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.room.RustMatrixRoom +import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.room.RustMatrixRoom import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt index e73449c43f..9c7dc1632d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.tracing +package io.element.android.libraries.matrix.tracing data class TracingConfiguration( val common: LogLevel = LogLevel.Warn, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt index 8625325cab..3b82cc2489 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.util +package io.element.android.libraries.matrix.util import kotlinx.coroutines.channels.ProducerScope import kotlinx.coroutines.channels.awaitClose diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt index a2d1720041..d480262f81 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.util +package io.element.android.libraries.matrix.util import org.matrix.rustcomponents.sdk.ClientException import timber.log.Timber diff --git a/libraries/matrixtest/build.gradle.kts b/libraries/matrixtest/build.gradle.kts index f4ba43aaac..39641e7eed 100644 --- a/libraries/matrixtest/build.gradle.kts +++ b/libraries/matrixtest/build.gradle.kts @@ -21,10 +21,10 @@ plugins { } android { - namespace = "io.element.android.x.libraries.matrix.test" + namespace = "io.element.android.libraries.matrix.test" } dependencies { - api(project(":libraries:matrix")) + api(projects.libraries.matrix) api(libs.coroutines.core) } diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt similarity index 72% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt index 5e55b6dc79..fb2a1b2341 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest +package io.element.android.libraries.matrixtest -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.libraries.matrixtest.media.FakeMediaResolver -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.libraries.matrixtest.room.FakeMatrixRoom -import io.element.android.x.libraries.matrixtest.room.InMemoryRoomSummaryDataSource -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrixtest.media.FakeMediaResolver +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrixtest.room.FakeMatrixRoom +import io.element.android.libraries.matrixtest.room.InMemoryRoomSummaryDataSource +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import org.matrix.rustcomponents.sdk.MediaSource class FakeMatrixClient(override val sessionId: SessionId) : MatrixClient { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt similarity index 88% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt index 07fc24c468..ef171e5a09 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.media +package io.element.android.libraries.matrixtest.media -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver class FakeMediaResolver : MediaResolver { override suspend fun resolve(url: String?, kind: MediaResolver.Kind): ByteArray? { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt similarity index 83% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt index fca74a59d9..254f460f25 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.room +package io.element.android.libraries.matrixtest.room -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.libraries.matrixtest.timeline.FakeMatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimeline import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt similarity index 83% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt index eaa75e1448..cb4f002859 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.room +package io.element.android.libraries.matrixtest.room -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt similarity index 87% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt index 27443bde6f..60fa211b1d 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.timeline +package io.element.android.libraries.matrixtest.timeline -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import org.matrix.rustcomponents.sdk.TimelineListener diff --git a/libraries/matrixui/build.gradle.kts b/libraries/matrixui/build.gradle.kts index 9e32aea0a8..38004098ca 100644 --- a/libraries/matrixui/build.gradle.kts +++ b/libraries/matrixui/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.matrix.ui" + namespace = "io.element.android.libraries.matrix.ui" } anvil { @@ -30,12 +30,12 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:core")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.core) implementation(libs.coil.compose) } diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt similarity index 82% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt index 49a97b3a5f..d1060bd39a 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui +package io.element.android.libraries.matrix.ui -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt similarity index 85% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt index 08acd79a0c..ca4ffb247b 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.components +package io.element.android.libraries.matrix.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -33,12 +33,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.matrix.ui.model.getBestName +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.getBestName @Composable fun MatrixUserHeader( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt similarity index 87% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt index e121ced17c..1a9b7e0c18 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.components +package io.element.android.libraries.matrix.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -33,11 +33,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.matrix.ui.model.getBestName +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.getBestName @Composable fun MatrixUserRow( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt similarity index 76% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt index 557d896cb8..a5734f5b9c 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.di +package io.element.android.libraries.matrix.ui.di import com.squareup.anvil.annotations.ContributesTo -import io.element.android.x.di.SessionScope -import io.element.android.x.matrix.ui.media.LoggedInImageLoaderFactory -import io.element.android.x.matrix.ui.media.NotLoggedInImageLoaderFactory +import io.element.android.libraries.di.SessionScope +import io.element.android.libraries.matrix.ui.media.LoggedInImageLoaderFactory +import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactory @ContributesTo(SessionScope::class) interface MatrixUIBindings { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt similarity index 89% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt index eecb25f9f2..19f84f4393 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import android.content.Context import coil.ImageLoader import coil.ImageLoaderFactory -import io.element.android.x.di.ApplicationContext -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.matrix.MatrixClient import javax.inject.Inject class LoggedInImageLoaderFactory @Inject constructor( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt similarity index 88% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt index a443f7486d..dc90947a87 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import coil.ImageLoader import coil.fetch.FetchResult import coil.fetch.Fetcher import coil.request.Options -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver import java.nio.ByteBuffer internal class MediaFetcher( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt similarity index 87% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt index 0831f6815e..1ce5390fc9 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import coil.key.Keyer import coil.request.Options -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver internal class MediaKeyer : Keyer { override fun key(data: MediaResolver.Meta, options: Options): String? { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt similarity index 79% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt index 835ea35a7a..3d673628ff 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.model +package io.element.android.libraries.matrix.ui.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.matrix.core.UserId @Immutable data class MatrixUser( diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts index 21e6f2a384..88ad19677c 100644 --- a/libraries/testtags/build.gradle.kts +++ b/libraries/testtags/build.gradle.kts @@ -19,5 +19,5 @@ plugins { } android { - namespace = "io.element.android.x.libraries.testtags" + namespace = "io.element.android.libraries.testtags" } diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt similarity index 91% rename from libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt rename to libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt index 5d75a31674..5a2d8fee19 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt @@ -14,13 +14,14 @@ * limitations under the License. */ -package io.element.android.x.libraries.testtags +package io.element.android.libraries.testtags import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId +import io.element.android.libraries.testtags.TestTag /** * Add a testTag to a Modifier, to be used by external tool, like TrafficLight for instance. diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt similarity index 96% rename from libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt rename to libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt index 1e96c61373..a254a636ef 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.libraries.testtags +package io.element.android.libraries.testtags @JvmInline value class TestTag internal constructor(val value: String) diff --git a/libraries/textcomposer/build.gradle.kts b/libraries/textcomposer/build.gradle.kts index 41cc543ba2..040a265f80 100644 --- a/libraries/textcomposer/build.gradle.kts +++ b/libraries/textcomposer/build.gradle.kts @@ -23,17 +23,17 @@ plugins { } android { - namespace = "io.element.android.x.textcomposer" + namespace = "io.element.android.libraries.textcomposer" buildFeatures { viewBinding = true } } dependencies { - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrix")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) + implementation(projects.libraries.core) + implementation(projects.libraries.matrix) implementation(libs.wysiwyg) implementation(libs.androidx.constraintlayout) implementation("com.google.android.material:material:1.7.0") diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerMode.kt similarity index 91% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerMode.kt index 715b9c6cd6..fed8265656 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerMode.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.os.Parcelable -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.parcelize.Parcelize sealed interface MessageComposerMode : Parcelable { diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerView.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerView.kt similarity index 94% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerView.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerView.kt index 8592ec1809..d646a09ffc 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerView.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerView.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.net.Uri import android.text.Editable diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt similarity index 97% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index 7eb8d5dcda..86c1084f5d 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.annotation.SuppressLint import android.content.Context @@ -42,16 +42,16 @@ import androidx.core.view.updateLayoutParams import com.google.android.material.shape.MaterialShapeDrawable import io.element.android.wysiwyg.EditorEditText import io.element.android.wysiwyg.inputhandlers.models.InlineFormat -import io.element.android.x.core.ui.DimensionConverter -import io.element.android.x.core.ui.hideKeyboard -import io.element.android.x.core.ui.showKeyboard -import io.element.android.x.textcomposer.databinding.ComposerRichTextLayoutBinding -import io.element.android.x.textcomposer.databinding.ViewRichTextMenuButtonBinding -import io.element.android.x.textcomposer.tools.setTextIfDifferent +import io.element.android.libraries.core.ui.DimensionConverter +import io.element.android.libraries.core.ui.hideKeyboard +import io.element.android.libraries.core.ui.showKeyboard +import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLayoutBinding +import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuButtonBinding +import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction -import io.element.android.x.element.resources.R as ElementR -import io.element.android.x.ui.strings.R as StringR +import io.element.android.element.resources.R as ElementR +import io.element.android.libraries.ui.strings.R as StringR // Imported from Element Android class RichTextComposerLayout @JvmOverloads constructor( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt similarity index 97% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index 6dbc649acb..930b5d6f77 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.graphics.Color import android.net.Uri @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.view.isInvisible import androidx.core.view.isVisible -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun TextComposer( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/EditTextExtensions.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/EditTextExtensions.kt similarity index 94% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/EditTextExtensions.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/EditTextExtensions.kt index d429385a9a..03d501f258 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/EditTextExtensions.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/EditTextExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer.tools +package io.element.android.libraries.textcomposer.tools import android.text.Spanned import android.widget.EditText diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/SimpleTransitionListener.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/SimpleTransitionListener.kt similarity index 95% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/SimpleTransitionListener.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/SimpleTransitionListener.kt index e165f18dc7..0aab1bdb6a 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/SimpleTransitionListener.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/SimpleTransitionListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer.tools +package io.element.android.libraries.textcomposer.tools import androidx.transition.Transition diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/ViewExtensions.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/ViewExtensions.kt similarity index 93% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/ViewExtensions.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/ViewExtensions.kt index 94b1e4613e..8f1a1aacca 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/ViewExtensions.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/ViewExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer.tools +package io.element.android.libraries.textcomposer.tools import android.view.ViewGroup import androidx.transition.ChangeBounds diff --git a/libraries/ui-strings/build.gradle.kts b/libraries/ui-strings/build.gradle.kts index dc4693ad7f..33dc7d6ba6 100644 --- a/libraries/ui-strings/build.gradle.kts +++ b/libraries/ui-strings/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.ui.strings" + namespace = "io.element.android.libraries.ui.strings" } // forcing the stem string template generator to be cacheable, without this the templates diff --git a/settings.gradle.kts b/settings.gradle.kts index 22dc8447ad..669bac4635 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,6 +32,9 @@ dependencyResolutionManagement { } } } + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + rootProject.name = "ElementX" include(":app") include(":libraries:core") diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts index e8f2ca47ad..6d970e34b0 100644 --- a/tests/uitests/build.gradle.kts +++ b/tests/uitests/build.gradle.kts @@ -26,7 +26,7 @@ plugins { } android { - namespace = "io.element.android.x.tests.uitests" + namespace = "io.element.android.tests.uitests" } dependencies { diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt similarity index 94% rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt index 6250bcaba8..0c3fab67eb 100644 --- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt +++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import com.airbnb.android.showkase.annotation.ShowkaseRoot import com.airbnb.android.showkase.annotation.ShowkaseRootModule diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt similarity index 96% rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt index ba8f111f13..9ae1b78577 100644 --- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt +++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 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. @@ -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.padding import androidx.compose.foundation.layout.size diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt similarity index 94% rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt index 4ed7328ad3..bf252a1755 100644 --- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt +++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import android.app.Activity import com.airbnb.android.showkase.models.Showkase 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 3d1804884d..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 @@ -36,7 +36,7 @@ import app.cash.paparazzi.Paparazzi 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.x.designsystem.ElementXTheme +import io.element.android.libraries.designsystem.ElementXTheme 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