From 330e786d0d010e51b05349ee90b34688b46edc56 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 3 Jul 2023 11:51:10 +0100 Subject: [PATCH] Move pin graphic/component to design system --- .../element/android/features/location/api/StaticMapView.kt | 4 ++-- .../android/features/location/impl/SendLocationView.kt | 4 ++-- .../element/android/features/location/impl/map/MapView.kt | 6 +++--- .../android/libraries/designsystem}/components/PinIcon.kt | 4 ++-- .../src/main/res/drawable/pin.xml | 0 .../libraries/matrix/ui/components/AttachmentThumbnail.kt | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) rename libraries/{matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui => designsystem/src/main/kotlin/io/element/android/libraries/designsystem}/components/PinIcon.kt (94%) rename libraries/{matrixui => designsystem}/src/main/res/drawable/pin.xml (100%) diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt index 20731b5261..0bb741e7a8 100644 --- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt +++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt @@ -44,7 +44,7 @@ import io.element.android.libraries.designsystem.text.toDp import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.theme.ElementTheme import timber.log.Timber -import io.element.android.libraries.matrix.ui.R as MatrixUIR +import io.element.android.libraries.designsystem.R as DesignSystemR /** * Shows a static map image downloaded via a third party service's static maps API. @@ -105,7 +105,7 @@ fun StaticMapView( contentScale = ContentScale.Fit, ) Icon( - resourceId = MatrixUIR.drawable.pin, + resourceId = DesignSystemR.drawable.pin, contentDescription = null, tint = Color.Unspecified, modifier = Modifier.align { size, space, _ -> diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt index 3add47ae42..ba9c8ce47f 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt @@ -52,7 +52,7 @@ import io.element.android.libraries.designsystem.theme.components.CenterAlignedT import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.ui.strings.CommonStrings -import io.element.android.libraries.matrix.ui.R as MatrixUIR +import io.element.android.libraries.designsystem.R as DesignSystemR @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -116,7 +116,7 @@ fun SendLocationView( mapState = mapState, ) Icon( - resourceId = MatrixUIR.drawable.pin, + resourceId = DesignSystemR.drawable.pin, contentDescription = null, tint = Color.Unspecified, modifier = Modifier.align { size, space, _ -> diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/map/MapView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/map/MapView.kt index 0384c4f290..b3104d1ed9 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/map/MapView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/map/MapView.kt @@ -54,7 +54,7 @@ import kotlinx.collections.immutable.toImmutableList import timber.log.Timber import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine -import io.element.android.libraries.matrix.ui.R as MatrixUIR +import io.element.android.libraries.designsystem.R as DesignSystemR /** * Composable wrapper around MapLibre's [MapView]. @@ -149,7 +149,7 @@ fun MapView( LaunchedEffect(mapRefs, mapState.location) { mapRefs?.let { mapRefs -> mapState.location?.let { location -> - context.getDrawable(MatrixUIR.drawable.pin)?.let { mapRefs.style.addImage("pin", it) } + context.getDrawable(DesignSystemR.drawable.pin)?.let { mapRefs.style.addImage("pin", it) } mapRefs.symbolManager.create( SymbolOptions() .withLatLng(LatLng(location.lat, location.lon)) @@ -276,7 +276,7 @@ private fun ContentToPreview() { ), markers = listOf( MapState.Marker( - drawable = MatrixUIR.drawable.pin, + drawable = DesignSystemR.drawable.pin, lat = 0.0, lon = 0.0, ) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/PinIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt similarity index 94% rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/PinIcon.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt index f38a5ca751..60d3cd949d 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/PinIcon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.matrix.ui.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -25,10 +25,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import io.element.android.libraries.designsystem.R import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Icon -import io.element.android.libraries.matrix.ui.R import io.element.android.libraries.theme.ElementTheme @Composable diff --git a/libraries/matrixui/src/main/res/drawable/pin.xml b/libraries/designsystem/src/main/res/drawable/pin.xml similarity index 100% rename from libraries/matrixui/src/main/res/drawable/pin.xml rename to libraries/designsystem/src/main/res/drawable/pin.xml diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt index d2310354c8..cac211bcb5 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import io.element.android.libraries.designsystem.components.BlurHashAsyncImage +import io.element.android.libraries.designsystem.components.PinIcon import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.ui.media.MediaRequestData