Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename designsystem module

Browse source
This commit is contained in:
ganfra 2023-01-20 17:09:12 +01:00
parent f6672fa5de
commit a2f0c64921
55 changed files with 107 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/io/element/android/x/MainActivity.kt
View file

@ -27,7 +27,7 @@ import com.bumble.appyx.core.integration.NodeHost
import com.bumble.appyx.core.integrationpoint.NodeComponentActivity import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.x.di.DaggerComponentOwner 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.di.AppBindings
import io.element.android.x.node.RootFlowNode import io.element.android.x.node.RootFlowNode

2
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
View file

@ -54,7 +54,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.libraries.core.compose.textFieldState 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.R
import io.element.android.x.features.login.error.changeServerError import io.element.android.x.features.login.error.changeServerError
import io.element.android.x.libraries.testtags.TestTags import io.element.android.x.libraries.testtags.TestTags

8
features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
View file

@ -25,10 +25,10 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.ProgressDialog
import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
import io.element.android.x.designsystem.components.preferences.PreferenceCategory import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
import io.element.android.x.designsystem.components.preferences.PreferenceText import io.element.android.libraries.designsystem.components.preferences.PreferenceText
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR
@Composable @Composable

4
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt
View file

@ -25,8 +25,8 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
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.actionlist.ActionListPresenter 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.actionlist.model.TimelineItemAction
import io.element.android.x.features.messages.textcomposer.MessageComposerEvents import io.element.android.x.features.messages.textcomposer.MessageComposerEvents

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.features.messages package io.element.android.x.features.messages
import androidx.compose.runtime.Immutable 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.actionlist.ActionListState
import io.element.android.x.features.messages.textcomposer.MessageComposerState import io.element.android.x.features.messages.textcomposer.MessageComposerState
import io.element.android.x.features.messages.timeline.TimelineState import io.element.android.x.features.messages.timeline.TimelineState

4
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt
View file

@ -57,8 +57,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.LogCompositions
import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.Avatar
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.ActionListEvents 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.ActionListView
import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.actionlist.model.TimelineItemAction

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt
View file

@ -41,7 +41,7 @@ import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp 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.actionlist.model.TimelineItemAction
import io.element.android.x.features.messages.timeline.model.TimelineItem import io.element.android.x.features.messages.timeline.model.TimelineItem
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter

12
features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt
View file

@ -18,7 +18,7 @@ package io.element.android.x.features.messages.actionlist.model
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import io.element.android.x.designsystem.VectorIcons import io.element.android.libraries.designsystem.VectorIcons
@Immutable @Immutable
sealed class TimelineItemAction( sealed class TimelineItemAction(
@ -26,9 +26,9 @@ sealed class TimelineItemAction(
@DrawableRes val icon: Int, @DrawableRes val icon: Int,
val destructive: Boolean = false val destructive: Boolean = false
) { ) {
object Forward : TimelineItemAction("Forward", VectorIcons.ArrowForward) object Forward : TimelineItemAction("Forward", io.element.android.libraries.designsystem.VectorIcons.ArrowForward)
object Copy : TimelineItemAction("Copy", VectorIcons.Copy) object Copy : TimelineItemAction("Copy", io.element.android.libraries.designsystem.VectorIcons.Copy)
object Redact : TimelineItemAction("Redact", VectorIcons.Delete, destructive = true) object Redact : TimelineItemAction("Redact", io.element.android.libraries.designsystem.VectorIcons.Delete, destructive = true)
object Reply : TimelineItemAction("Reply", VectorIcons.Reply) object Reply : TimelineItemAction("Reply", io.element.android.libraries.designsystem.VectorIcons.Reply)
object Edit : TimelineItemAction("Edit", VectorIcons.Edit) object Edit : TimelineItemAction("Edit", io.element.android.libraries.designsystem.VectorIcons.Edit)
} }

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
View file

@ -18,7 +18,7 @@ package io.element.android.x.features.messages.textcomposer
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier 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 import io.element.android.x.textcomposer.TextComposer
@Composable @Composable

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.features.messages.timeline package io.element.android.x.features.messages.timeline
import androidx.recyclerview.widget.DiffUtil 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.CacheInvalidator
import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback
import io.element.android.x.features.messages.timeline.model.AggregatedReaction import io.element.android.x.features.messages.timeline.model.AggregatedReaction

4
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt
View file

@ -59,8 +59,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import io.element.android.libraries.core.compose.PairCombinedPreviewParameter import io.element.android.libraries.core.compose.PairCombinedPreviewParameter
import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.Avatar
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.AggregatedReaction 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.MessagesItemGroupPosition
import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider

14
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt
View file

@ -29,13 +29,13 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.x.designsystem.LocalIsDarkTheme import io.element.android.libraries.designsystem.LocalIsDarkTheme
import io.element.android.x.designsystem.MessageHighlightDark import io.element.android.libraries.designsystem.MessageHighlightDark
import io.element.android.x.designsystem.MessageHighlightLight import io.element.android.libraries.designsystem.MessageHighlightLight
import io.element.android.x.designsystem.SystemGrey5Dark import io.element.android.libraries.designsystem.SystemGrey5Dark
import io.element.android.x.designsystem.SystemGrey5Light import io.element.android.libraries.designsystem.SystemGrey5Light
import io.element.android.x.designsystem.SystemGrey6Dark import io.element.android.libraries.designsystem.SystemGrey6Dark
import io.element.android.x.designsystem.SystemGrey6Light import io.element.android.libraries.designsystem.SystemGrey6Light
import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition
private val BUBBLE_RADIUS = 16.dp private val BUBBLE_RADIUS = 16.dp

4
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt
View file

@ -28,8 +28,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.buildAnnotatedString
import androidx.core.text.util.LinkifyCompat import androidx.core.text.util.LinkifyCompat
import io.element.android.x.designsystem.LinkColor import io.element.android.libraries.designsystem.LinkColor
import io.element.android.x.designsystem.components.ClickableLinkText 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.components.html.HtmlDocument
import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent

4
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt
View file

@ -47,8 +47,8 @@ import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.FlowRow
import io.element.android.x.designsystem.LinkColor import io.element.android.libraries.designsystem.LinkColor
import io.element.android.x.designsystem.components.ClickableLinkText import io.element.android.libraries.designsystem.components.ClickableLinkText
import io.element.android.x.matrix.permalink.PermalinkData import io.element.android.x.matrix.permalink.PermalinkData
import io.element.android.x.matrix.permalink.PermalinkParser import io.element.android.x.matrix.permalink.PermalinkParser
import kotlinx.collections.immutable.persistentMapOf import kotlinx.collections.immutable.persistentMapOf

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.features.messages.timeline.model package io.element.android.x.features.messages.timeline.model
import androidx.compose.runtime.Immutable 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.features.messages.timeline.model.content.TimelineItemContent
import io.element.android.x.matrix.core.EventId import io.element.android.x.matrix.core.EventId

2
features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt
View file

@ -49,7 +49,7 @@ import com.google.accompanist.pager.ExperimentalPagerApi
import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPager
import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.HorizontalPagerIndicator
import com.google.accompanist.pager.rememberPagerState 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.TestTags
import io.element.android.x.libraries.testtags.testTag import io.element.android.x.libraries.testtags.testTag
import kotlinx.coroutines.delay import kotlinx.coroutines.delay

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt
View file

@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.libraries.architecture.Async 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.LogoutPreferenceState
import io.element.android.x.features.logout.LogoutPreferenceView import io.element.android.x.features.logout.LogoutPreferenceView
import io.element.android.x.features.preferences.user.UserPreferences import io.element.android.x.features.preferences.user.UserPreferences

4
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
View file

@ -53,8 +53,8 @@ import coil.request.ImageRequest
import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.LogCompositions
import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.core.compose.textFieldState
import io.element.android.x.designsystem.components.LabelledCheckbox import io.element.android.libraries.designsystem.components.LabelledCheckbox
import io.element.android.x.designsystem.components.dialogs.ErrorDialog import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt
View file

@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.libraries.core.compose.LogCompositions 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 import io.element.android.x.ui.strings.R as StringR
@Composable @Composable

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt
View file

@ -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.hardware.vibrate
import io.element.android.libraries.core.screenshot.ImageResult import io.element.android.libraries.core.screenshot.ImageResult
import io.element.android.libraries.core.screenshot.screenshot 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 import io.element.android.x.ui.strings.R as StringR
@Composable @Composable

8
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt
View file

@ -23,10 +23,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.x.designsystem.components.preferences.PreferenceCategory import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
import io.element.android.x.designsystem.components.preferences.PreferenceSlide import io.element.android.libraries.designsystem.components.preferences.PreferenceSlide
import io.element.android.x.designsystem.components.preferences.PreferenceSwitch import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
import io.element.android.x.designsystem.components.preferences.PreferenceText import io.element.android.libraries.designsystem.components.preferences.PreferenceText
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR
@Composable @Composable

4
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt
View file

@ -27,8 +27,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.coroutine.parallelMap import io.element.android.libraries.core.coroutine.parallelMap
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.x.designsystem.components.avatar.AvatarSize 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.RoomListEvents
import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListRoomSummary
import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt
View file

@ -37,7 +37,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Velocity import androidx.compose.ui.unit.Velocity
import io.element.android.libraries.core.compose.LogCompositions 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.RoomListTopBar
import io.element.android.x.features.roomlist.components.RoomSummaryRow import io.element.android.x.features.roomlist.components.RoomSummaryRow
import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListEvents

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
View file

@ -54,7 +54,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.LogCompositions
import io.element.android.libraries.core.compose.textFieldState 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.matrix.ui.model.MatrixUser
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
View file

@ -52,7 +52,7 @@ import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.google.accompanist.placeholder.material.placeholder 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 import io.element.android.x.features.roomlist.model.RoomListRoomSummary
private val minHeight = 72.dp private val minHeight = 72.dp

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.features.roomlist.model package io.element.android.x.features.roomlist.model
import androidx.compose.runtime.Immutable 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 import io.element.android.x.matrix.core.RoomId
@Immutable @Immutable

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt
View file

@ -16,7 +16,7 @@
package io.element.android.x.features.roomlist.model 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 { object RoomListRoomSummaryPlaceholders {

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt
View file

@ -16,7 +16,7 @@
package io.element.android.x.features.roomlist.model 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.ImmutableList
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.designsystem package io.element.android.libraries.designsystem
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import com.airbnb.android.showkase.annotation.ShowkaseColor import com.airbnb.android.showkase.annotation.ShowkaseColor

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.designsystem package io.element.android.libraries.designsystem
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.designsystem package io.element.android.libraries.designsystem
import android.os.Build import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.designsystem package io.element.android.libraries.designsystem
import androidx.compose.material3.Typography import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle

2
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.designsystem package io.element.android.libraries.designsystem
import io.element.android.x.libraries.designsystem.R import io.element.android.x.libraries.designsystem.R

2
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.gestures.detectTapGestures
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource

2
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.Row
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth

2
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.background
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box

2
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.Button
import androidx.compose.material3.Text import androidx.compose.material3.Text

2
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.Icon
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor

8
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.background
import androidx.compose.foundation.layout.Box 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.tooling.preview.Preview
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import coil.compose.AsyncImage import coil.compose.AsyncImage
import io.element.android.x.designsystem.AvatarGradientEnd import io.element.android.libraries.designsystem.AvatarGradientEnd
import io.element.android.x.designsystem.AvatarGradientStart import io.element.android.libraries.designsystem.AvatarGradientStart
import timber.log.Timber import timber.log.Timber
@Composable @Composable

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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 import androidx.compose.runtime.Immutable

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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 import androidx.compose.ui.unit.dp

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.Arrangement
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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 import androidx.compose.ui.unit.dp

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.Column
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope

4
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.Column
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope

8
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.annotation.FloatRange
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -31,8 +31,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview 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
import io.element.android.x.designsystem.toEnabledColor import io.element.android.libraries.designsystem.toEnabledColor
@Composable @Composable
fun PreferenceSlide( fun PreferenceSlide(

8
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -32,8 +32,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview 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
import io.element.android.x.designsystem.toEnabledColor import io.element.android.libraries.designsystem.toEnabledColor
@Composable @Composable
fun PreferenceSwitch( fun PreferenceSwitch(

6
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -31,7 +31,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview 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 @Composable
fun PreferenceText( fun PreferenceText(

6
libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * 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.Spacer
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -24,7 +24,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.x.designsystem.toEnabledColor import io.element.android.libraries.designsystem.toEnabledColor
@Composable @Composable
fun PreferenceIcon( fun PreferenceIcon(

4
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt
View file

@ -16,8 +16,8 @@
package io.element.android.x.matrix.ui package io.element.android.x.matrix.ui
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import io.element.android.x.matrix.media.MediaResolver import io.element.android.x.matrix.media.MediaResolver
import io.element.android.x.matrix.room.MatrixRoom import io.element.android.x.matrix.room.MatrixRoom

6
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt
View file

@ -33,9 +33,9 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.x.matrix.core.UserId 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.MatrixUser
import io.element.android.x.matrix.ui.model.getBestName import io.element.android.x.matrix.ui.model.getBestName

4
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt
View file

@ -33,8 +33,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.Avatar
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 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.MatrixUser
import io.element.android.x.matrix.ui.model.getBestName import io.element.android.x.matrix.ui.model.getBestName

2
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.matrix.ui.model package io.element.android.x.matrix.ui.model
import androidx.compose.runtime.Immutable 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 import io.element.android.x.matrix.core.UserId
@Immutable @Immutable

2
tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt
View file

@ -36,7 +36,7 @@ import app.cash.paparazzi.Paparazzi
import com.airbnb.android.showkase.models.Showkase import com.airbnb.android.showkase.models.Showkase
import com.google.testing.junit.testparameterinjector.TestParameter import com.google.testing.junit.testparameterinjector.TestParameter
import com.google.testing.junit.testparameterinjector.TestParameterInjector 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.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith