Move pin graphic/component to design system

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, _ ->

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, _ ->

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,
                 )

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

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