From a2f0c6492194ffbedfa4e41476b1a618ee5c7bcb Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:09:12 +0100 Subject: [PATCH] Rename designsystem module --- .../kotlin/io/element/android/x/MainActivity.kt | 2 +- .../login/changeserver/ChangeServerView.kt | 2 +- .../x/features/logout/LogoutPreferenceScreen.kt | 8 ++++---- .../x/features/messages/MessagesPresenter.kt | 4 ++-- .../android/x/features/messages/MessagesState.kt | 2 +- .../android/x/features/messages/MessagesView.kt | 4 ++-- .../features/messages/actionlist/ActionListView.kt | 2 +- .../actionlist/model/TimelineItemAction.kt | 12 ++++++------ .../messages/textcomposer/MessageComposerView.kt | 2 +- .../messages/timeline/TimelineItemsFactory.kt | 2 +- .../x/features/messages/timeline/TimelineView.kt | 4 ++-- .../timeline/components/MessageEventBubble.kt | 14 +++++++------- .../timeline/components/TimelineItemTextView.kt | 4 ++-- .../timeline/components/html/HtmlDocument.kt | 4 ++-- .../messages/timeline/model/TimelineItem.kt | 2 +- .../x/features/onboarding/OnBoardingScreen.kt | 2 +- .../preferences/root/PreferencesRootView.kt | 2 +- .../features/rageshake/bugreport/BugReportView.kt | 4 ++-- .../rageshake/crash/ui/CrashDetectionScreen.kt | 2 +- .../rageshake/detection/RageshakeDetectionView.kt | 2 +- .../preferences/RageshakePreferencesView.kt | 8 ++++---- .../x/features/roomlist/RoomListPresenter.kt | 4 ++-- .../android/x/features/roomlist/RoomListView.kt | 2 +- .../features/roomlist/components/RoomListTopBar.kt | 2 +- .../features/roomlist/components/RoomSummaryRow.kt | 2 +- .../features/roomlist/model/RoomListRoomSummary.kt | 2 +- .../model/RoomListRoomSummaryPlaceholders.kt | 2 +- .../android/x/features/roomlist/model/stubbed.kt | 2 +- .../android/{x => libraries}/designsystem/Color.kt | 4 ++-- .../{x => libraries}/designsystem/ColorUtil.kt | 4 ++-- .../android/{x => libraries}/designsystem/Theme.kt | 4 ++-- .../android/{x => libraries}/designsystem/Type.kt | 4 ++-- .../{x => libraries}/designsystem/VectorIcons.kt | 2 +- .../designsystem/components/ClickableLinkText.kt | 2 +- .../designsystem/components/LabelledCheckbox.kt | 2 +- .../designsystem/components/ProgressDialog.kt | 2 +- .../designsystem/components/VectorButton.kt | 2 +- .../designsystem/components/VectorIcon.kt | 2 +- .../designsystem/components/avatar/Avatar.kt | 8 ++++---- .../designsystem/components/avatar/AvatarData.kt | 4 ++-- .../designsystem/components/avatar/AvatarSize.kt | 4 ++-- .../components/dialogs/ConfirmationDialog.kt | 4 ++-- .../designsystem/components/dialogs/ErrorDialog.kt | 4 ++-- .../designsystem/components/preferences/Config.kt | 4 ++-- .../components/preferences/PreferenceCategory.kt | 4 ++-- .../components/preferences/PreferenceScreen.kt | 4 ++-- .../components/preferences/PreferenceSlide.kt | 8 ++++---- .../components/preferences/PreferenceSwitch.kt | 8 ++++---- .../components/preferences/PreferenceText.kt | 6 +++--- .../preferences/components/PreferenceIcon.kt | 6 +++--- .../android/x/matrix/ui/MatrixItemHelper.kt | 4 ++-- .../x/matrix/ui/components/MatrixUserHeader.kt | 6 +++--- .../x/matrix/ui/components/MatrixUserRow.kt | 4 ++-- .../android/x/matrix/ui/model/MatrixUser.kt | 2 +- .../android/x/tests/uitests/ScreenshotTest.kt | 2 +- 55 files changed, 107 insertions(+), 107 deletions(-) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/Color.kt (95%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/ColorUtil.kt (91%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/Theme.kt (97%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/Type.kt (98%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/VectorIcons.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/ClickableLinkText.kt (98%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/LabelledCheckbox.kt (96%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/ProgressDialog.kt (97%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/VectorButton.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/VectorIcon.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/avatar/Avatar.kt (92%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/avatar/AvatarData.kt (93%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/avatar/AvatarSize.kt (87%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/dialogs/ConfirmationDialog.kt (96%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/dialogs/ErrorDialog.kt (95%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/Config.kt (86%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceCategory.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceScreen.kt (97%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceSlide.kt (91%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceSwitch.kt (90%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceText.kt (91%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/components/PreferenceIcon.kt (88%) 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 dc050debb4..796601bffe 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integrationpoint.NodeComponentActivity import io.element.android.libraries.architecture.bindings import io.element.android.x.di.DaggerComponentOwner -import io.element.android.x.designsystem.ElementXTheme +import io.element.android.libraries.designsystem.ElementXTheme import io.element.android.x.di.AppBindings import io.element.android.x.node.RootFlowNode 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 55bfee1935..56d54b44d7 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 @@ -54,7 +54,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.architecture.Async import io.element.android.libraries.core.compose.textFieldState -import io.element.android.x.designsystem.components.VectorIcon +import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError import io.element.android.x.libraries.testtags.TestTags 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/x/features/logout/LogoutPreferenceScreen.kt index 28b259a989..147e890200 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt @@ -25,10 +25,10 @@ import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.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.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.x.ui.strings.R as StringR @Composable 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/x/features/messages/MessagesPresenter.kt index 778efa5a79..d682133968 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt @@ -25,8 +25,8 @@ 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.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.features.messages.actionlist.ActionListPresenter import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.textcomposer.MessageComposerEvents 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/x/features/messages/MessagesState.kt index af3b0793b5..8d011fc6d2 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListState import io.element.android.x.features.messages.textcomposer.MessageComposerState import io.element.android.x.features.messages.timeline.TimelineState 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 85d0ed4fc5..a543141e6a 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 @@ -57,8 +57,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp 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.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListEvents import io.element.android.x.features.messages.actionlist.ActionListView import io.element.android.x.features.messages.actionlist.model.TimelineItemAction 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/x/features/messages/actionlist/ActionListView.kt index 7984577de4..dfb3018596 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/x/features/messages/actionlist/ActionListView.kt @@ -41,7 +41,7 @@ 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.libraries.designsystem.components.VectorIcon import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.timeline.model.TimelineItem import kotlinx.coroutines.flow.filter 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/x/features/messages/actionlist/model/TimelineItemAction.kt index 4e23eb34f0..a43dbdb6a3 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/x/features/messages/actionlist/model/TimelineItemAction.kt @@ -18,7 +18,7 @@ package io.element.android.x.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/MessageComposerView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt index e5555bf477..0077cb8e19 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/x/features/messages/textcomposer/MessageComposerView.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.designsystem.LocalIsDarkTheme +import io.element.android.libraries.designsystem.LocalIsDarkTheme import io.element.android.x.textcomposer.TextComposer @Composable 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/x/features/messages/timeline/TimelineItemsFactory.kt index 0b8a3bfc48..3bab3ec9a2 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/x/features/messages/timeline/TimelineItemsFactory.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.timeline import androidx.recyclerview.widget.DiffUtil -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.features.messages.timeline.diff.CacheInvalidator import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback import io.element.android.x.features.messages.timeline.model.AggregatedReaction 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 aec9b5deae..4225ec77b3 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 @@ -59,8 +59,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex 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.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.AggregatedReaction import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider 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/x/features/messages/timeline/components/MessageEventBubble.kt index 7466d38e1a..e7c16eefe4 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/x/features/messages/timeline/components/MessageEventBubble.kt @@ -29,13 +29,13 @@ 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.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.x.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/TimelineItemTextView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt index 4751f2ae0d..8da4a0a1f4 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/x/features/messages/timeline/components/TimelineItemTextView.kt @@ -28,8 +28,8 @@ 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.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText import io.element.android.x.features.messages.timeline.components.html.HtmlDocument import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent 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/x/features/messages/timeline/components/html/HtmlDocument.kt index e5dcfc1112..b9049e55b7 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/x/features/messages/timeline/components/html/HtmlDocument.kt @@ -47,8 +47,8 @@ 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.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText import io.element.android.x.matrix.permalink.PermalinkData import io.element.android.x.matrix.permalink.PermalinkParser import kotlinx.collections.immutable.persistentMapOf 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/x/features/messages/timeline/model/TimelineItem.kt index ef93d38aa2..f274f5c7f9 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/x/features/messages/timeline/model/TimelineItem.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.timeline.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent import io.element.android.x.matrix.core.EventId 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/x/features/onboarding/OnBoardingScreen.kt index 138840e222..634ce740be 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -49,7 +49,7 @@ 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.libraries.designsystem.components.VectorButton import io.element.android.x.libraries.testtags.TestTags import io.element.android.x.libraries.testtags.testTag import kotlinx.coroutines.delay 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/x/features/preferences/root/PreferencesRootView.kt index ed9f72b43b..d632c1cf87 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/x/features/preferences/root/PreferencesRootView.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.architecture.Async -import io.element.android.x.designsystem.components.preferences.PreferenceView +import io.element.android.libraries.designsystem.components.preferences.PreferenceView import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.logout.LogoutPreferenceView import io.element.android.x.features.preferences.user.UserPreferences 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 cefe6cf90a..51ec736ffd 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 @@ -53,8 +53,8 @@ import coil.request.ImageRequest 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.x.designsystem.components.LabelledCheckbox -import io.element.android.x.designsystem.components.dialogs.ErrorDialog +import io.element.android.libraries.designsystem.components.LabelledCheckbox +import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog import io.element.android.x.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) 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 7a676704aa..578f0eb877 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 @@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.core.compose.LogCompositions -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR @Composable 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 042687c8f3..f2d208e359 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 @@ -28,7 +28,7 @@ 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.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR @Composable 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/x/features/rageshake/preferences/RageshakePreferencesView.kt index 43f7f94d03..83e95a52d9 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/x/features/rageshake/preferences/RageshakePreferencesView.kt @@ -23,10 +23,10 @@ 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.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.x.ui.strings.R as StringR @Composable 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 223fc9c7bf..8d0dea57ce 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 @@ -27,8 +27,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import io.element.android.libraries.architecture.Presenter 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.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders 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 9a424cd894..046e804691 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 @@ -37,7 +37,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Velocity import io.element.android.libraries.core.compose.LogCompositions -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.roomlist.components.RoomListTopBar import io.element.android.x.features.roomlist.components.RoomSummaryRow import io.element.android.x.features.roomlist.model.RoomListEvents 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 6dcef6d66e..ea913a30a5 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 @@ -54,7 +54,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp 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.libraries.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/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt index ef8b4ac341..2c4d647cfb 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/x/features/roomlist/components/RoomSummaryRow.kt @@ -52,7 +52,7 @@ 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.libraries.designsystem.components.avatar.Avatar import io.element.android.x.features.roomlist.model.RoomListRoomSummary private val minHeight = 72.dp 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/x/features/roomlist/model/RoomListRoomSummary.kt index 4bac53544c..038ffaea47 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/x/features/roomlist/model/RoomListRoomSummary.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.roomlist.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.matrix.core.RoomId @Immutable 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/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt index c714baf3d3..6950ab32da 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/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt @@ -16,7 +16,7 @@ package io.element.android.x.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/stubbed.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt index 71ba70829f..ef3dac79d6 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/x/features/roomlist/model/stubbed.kt @@ -16,7 +16,7 @@ package io.element.android.x.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/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 94% 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..330da95154 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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import io.element.android.x.libraries.designsystem.R 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 96% 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..e5e793a703 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 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 95% 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..22f8624dad 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 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/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt index 49a97b3a5f..a5f06d8f54 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt @@ -16,8 +16,8 @@ package io.element.android.x.matrix.ui -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.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 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/x/matrix/ui/components/MatrixUserHeader.kt index 08acd79a0c..91e4f04609 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/x/matrix/ui/components/MatrixUserHeader.kt @@ -33,9 +33,9 @@ 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.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.x.matrix.core.UserId import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.matrix.ui.model.getBestName 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/x/matrix/ui/components/MatrixUserRow.kt index e121ced17c..b98275ba2d 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/x/matrix/ui/components/MatrixUserRow.kt @@ -33,8 +33,8 @@ 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.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.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 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/x/matrix/ui/model/MatrixUser.kt index 835ea35a7a..09ca3b46c7 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/x/matrix/ui/model/MatrixUser.kt @@ -17,7 +17,7 @@ package io.element.android.x.matrix.ui.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.matrix.core.UserId @Immutable 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/x/tests/uitests/ScreenshotTest.kt index 3d1804884d..994b65675a 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt @@ -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