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..f9143bc4bb 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,7 @@ 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 kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers 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/x/features/login/changeserver/ChangeServerView.kt index 68846a70ff..55bfee1935 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/x/features/login/changeserver/ChangeServerView.kt @@ -53,7 +53,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.architecture.Async -import io.element.android.x.core.compose.textFieldState +import io.element.android.libraries.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 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/x/features/login/error/ErrorFormatter.kt index 3700575b96..f708f712a6 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/x/features/login/error/ErrorFormatter.kt @@ -18,7 +18,7 @@ package io.element.android.x.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.libraries.core.uri.isValidUrl import io.element.android.x.features.login.root.LoginFormState import io.element.android.x.ui.strings.R as StringR 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/x/features/login/root/LoginRootNode.kt index bccf36fb22..4eb0735345 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/x/features/login/root/LoginRootNode.kt @@ -29,7 +29,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.core.compose.OnLifecycleEvent +import io.element.android.libraries.core.compose.OnLifecycleEvent import io.element.android.x.di.AppScope @ContributesNode(AppScope::class) 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/x/features/login/root/LoginRootScreen.kt index 67a9f19d31..f74b342553 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/x/features/login/root/LoginRootScreen.kt @@ -58,7 +58,7 @@ 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.libraries.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 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/x/features/messages/MessagesView.kt index 7711233699..85d0ed4fc5 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt @@ -56,7 +56,7 @@ 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.libraries.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 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/x/features/messages/textcomposer/MessageComposerPresenter.kt index 63906b31da..73465e37c3 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/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -22,8 +22,8 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.core.data.StableCharSequence -import io.element.android.x.core.data.toStableCharSequence +import io.element.android.libraries.core.data.StableCharSequence +import io.element.android.libraries.core.data.toStableCharSequence import io.element.android.x.matrix.room.MatrixRoom import io.element.android.x.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope 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/x/features/messages/textcomposer/MessageComposerState.kt index 44c8e73d7e..6bca89b333 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/x/features/messages/textcomposer/MessageComposerState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.textcomposer import androidx.compose.runtime.Immutable -import io.element.android.x.core.data.StableCharSequence +import io.element.android.libraries.core.data.StableCharSequence import io.element.android.x.textcomposer.MessageComposerMode @Immutable 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/x/features/messages/timeline/TimelinePresenter.kt index 8aaddfe705..83af2579b2 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/x/features/messages/timeline/TimelinePresenter.kt @@ -25,7 +25,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.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 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/x/features/messages/timeline/TimelineView.kt index b2ecc490b3..aec9b5deae 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/x/features/messages/timeline/TimelineView.kt @@ -58,7 +58,7 @@ 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.libraries.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 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/x/features/rageshake/bugreport/BugReportView.kt index 6fd143e5ab..cefe6cf90a 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/x/features/rageshake/bugreport/BugReportView.kt @@ -51,8 +51,8 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest import io.element.android.libraries.architecture.Async -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.core.compose.textFieldState +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.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 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/x/features/rageshake/crash/CrashDataStore.kt index 07783f3e0b..a489b640e2 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/x/features/rageshake/crash/CrashDataStore.kt @@ -23,7 +23,7 @@ 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.libraries.core.bool.orFalse import io.element.android.x.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow 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/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt index 08a23da860..15ef3256f0 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/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt @@ -18,7 +18,7 @@ package io.element.android.x.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/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt index 494cc0d843..7a676704aa 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/x/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -19,7 +19,7 @@ package io.element.android.x.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.libraries.core.compose.LogCompositions import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR 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/x/features/rageshake/detection/RageshakeDetectionEvents.kt index 0ba2a26bae..3d0c4cef80 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/x/features/rageshake/detection/RageshakeDetectionEvents.kt @@ -16,7 +16,7 @@ package io.element.android.x.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/x/features/rageshake/detection/RageshakeDetectionPresenter.kt index 96657c6933..92b14bad76 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/x/features/rageshake/detection/RageshakeDetectionPresenter.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.core.screenshot.ImageResult +import io.element.android.libraries.core.screenshot.ImageResult import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.x.features.rageshake.rageshake.RageShake 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/x/features/rageshake/detection/RageshakeDetectionView.kt index c438c0a600..042687c8f3 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/x/features/rageshake/detection/RageshakeDetectionView.kt @@ -23,11 +23,11 @@ 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.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.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR 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/x/features/rageshake/logs/VectorFileLogger.kt index 5b39b79cf5..0b4275b3f2 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/x/features/rageshake/logs/VectorFileLogger.kt @@ -18,7 +18,7 @@ package io.element.android.x.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/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt index 35d0198b9e..8a5bb853f7 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/x/features/rageshake/rageshake/RageshakeDataStore.kt @@ -23,7 +23,7 @@ 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.libraries.core.bool.orTrue import io.element.android.x.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow 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/x/features/rageshake/reporter/BugReporter.kt index fe3ca71720..1ff95b8bb7 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/x/features/rageshake/reporter/BugReporter.kt @@ -18,9 +18,9 @@ package io.element.android.x.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.libraries.core.extensions.toOnOff +import io.element.android.libraries.core.file.compressFile +import io.element.android.libraries.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 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/x/features/rageshake/screenshot/ScreenshotHolder.kt index 00f9d74e96..d10feb9076 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/x/features/rageshake/screenshot/ScreenshotHolder.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap -import io.element.android.x.core.bitmap.writeBitmap +import io.element.android.libraries.core.bitmap.writeBitmap import io.element.android.x.di.AppScope import io.element.android.x.di.ApplicationContext import io.element.android.x.di.SingleIn 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/x/features/roomlist/RoomListPresenter.kt index 2ffad36aab..223fc9c7bf 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -26,7 +26,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import io.element.android.libraries.architecture.Presenter -import io.element.android.x.core.coroutine.parallelMap +import io.element.android.libraries.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 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/x/features/roomlist/RoomListView.kt index d5c51b1ea3..9a424cd894 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt @@ -36,7 +36,7 @@ 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.libraries.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 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/x/features/roomlist/components/RoomListTopBar.kt index d8fe56142b..6dcef6d66e 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/x/features/roomlist/components/RoomListTopBar.kt @@ -52,8 +52,8 @@ 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.libraries.core.compose.LogCompositions +import io.element.android.libraries.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 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/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt index b96b1e87fb..90efb11482 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.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 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/x/matrix/auth/RustMatrixAuthenticationService.kt index 3efb6d82c8..43de690583 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt @@ -17,7 +17,7 @@ package io.element.android.x.matrix.auth import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.di.AppScope import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.RustMatrixClient 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/x/matrix/room/RoomSummaryDataSource.kt index 81b9f20af1..249e600c09 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.room -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.sync.roomListDiff import io.element.android.x.matrix.sync.state import java.io.Closeable 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/x/matrix/room/RustMatrixRoom.kt index 7d7c2414fb..21c48fbcf9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.room -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.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 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/x/matrix/sync/SlidingSyncObserverProxy.kt index 014d9c64c8..f10ff0e12d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt @@ -16,7 +16,7 @@ package io.element.android.x.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/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt index ecfce4af7a..bfb4bdf3f2 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.timeline -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.core.EventId import io.element.android.x.matrix.room.RustMatrixRoom import kotlinx.coroutines.CoroutineScope diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt index 7eb8d5dcda..27a0fc1b24 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt @@ -42,9 +42,9 @@ 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.libraries.core.ui.DimensionConverter +import io.element.android.libraries.core.ui.hideKeyboard +import io.element.android.libraries.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