From 34aad88023e2b58d7ddd0ba26699a097ede5a50f Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 4 Mar 2026 16:36:41 +0100 Subject: [PATCH] Remove PinIcon --- .../designsystem/components/PinIcon.kt | 48 ------------------- .../ui/components/AttachmentThumbnail.kt | 9 +--- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt deleted file mode 100644 index 88287ef44b..0000000000 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2025 Element Creations Ltd. - * Copyright 2023-2025 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial. - * Please see LICENSE files in the repository root for full details. - */ - -package io.element.android.libraries.designsystem.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.width -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.dp -import io.element.android.compound.theme.ElementTheme -import io.element.android.libraries.designsystem.R -import io.element.android.libraries.designsystem.preview.ElementPreview -import io.element.android.libraries.designsystem.preview.PreviewsDayNight -import io.element.android.libraries.designsystem.theme.components.Icon - -@Composable -fun PinIcon( - modifier: Modifier = Modifier -) { - Box( - modifier = modifier - .background(ElementTheme.colors.bgSubtlePrimary) - ) { - Icon( - modifier = Modifier - .align(Alignment.Center) - .width(22.dp), - resourceId = R.drawable.pin, - contentDescription = null, - tint = Color.Unspecified, - ) - } -} - -@PreviewsDayNight -@Composable -internal fun PinIconPreview() = ElementPreview { - PinIcon() -} 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 8ffdc1b003..9b55c85524 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 @@ -25,7 +25,6 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.tokens.generated.CompoundIcons -import io.element.android.libraries.designsystem.components.PinIcon import io.element.android.libraries.designsystem.components.blurhash.BlurHashAsyncImage import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight @@ -99,16 +98,10 @@ fun AttachmentThumbnail( ) } AttachmentThumbnailType.Location -> { - PinIcon( - modifier = Modifier.fillMaxSize() - ) - /* - // For coherency across the app, we should us this instead. Waiting for design decision. Icon( - resourceId = R.drawable.ic_september_location, + imageVector = CompoundIcons.LocationPin(), contentDescription = info.textContent, ) - */ } AttachmentThumbnailType.Poll -> { Icon(