From 54ca7c1ea5202a5cc4e3b0a489dc81570b2f347f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 20 Sep 2023 17:32:32 +0200 Subject: [PATCH] More cleanup --- .../android/features/location/api/StaticMapView.kt | 4 ++-- .../features/location/impl/send/SendLocationView.kt | 4 ++-- .../features/location/impl/show/ShowLocationView.kt | 3 +-- .../features/messages/impl/media/local/LocalMediaView.kt | 8 ++++---- .../features/roomlist/impl/components/RoomListTopBar.kt | 5 ++--- 5 files changed, 11 insertions(+), 13 deletions(-) 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 716b6d88c6..050d3b5aa7 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 @@ -40,9 +40,9 @@ import io.element.android.features.location.api.internal.centerBottomEdge import io.element.android.libraries.designsystem.preview.DayNightPreviews import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.theme.components.Icon +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.theme.ElementTheme import timber.log.Timber -import io.element.android.libraries.designsystem.R as DesignSystemR /** * Shows a static map image downloaded via a third party service's static maps API. @@ -102,7 +102,7 @@ fun StaticMapView( contentScale = ContentScale.Fit, ) Icon( - resourceId = DesignSystemR.drawable.pin, + resourceId = CommonDrawables.pin, contentDescription = null, tint = Color.Unspecified, modifier = Modifier.centerBottomEdge(this), diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt index e06b60b1a7..75fb65c7d8 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt @@ -60,13 +60,13 @@ import io.element.android.libraries.designsystem.theme.components.FloatingAction import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TopAppBar +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.maplibre.compose.CameraMode import io.element.android.libraries.maplibre.compose.CameraMoveStartedReason import io.element.android.libraries.maplibre.compose.MapboxMap import io.element.android.libraries.maplibre.compose.rememberCameraPositionState import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings -import io.element.android.libraries.designsystem.R as DesignSystemR @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -203,7 +203,7 @@ fun SendLocationView( ), ) Icon( - resourceId = DesignSystemR.drawable.pin, + resourceId = CommonDrawables.pin, contentDescription = null, tint = Color.Unspecified, modifier = Modifier.centerBottomEdge(this), diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt index 9e51ecd99b..5b47df3c0d 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt @@ -62,7 +62,6 @@ import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.compound.generated.TypographyTokens import io.element.android.libraries.ui.strings.CommonStrings import kotlinx.collections.immutable.toImmutableMap -import io.element.android.libraries.designsystem.R as DesignSystemR @OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class) @Composable @@ -166,7 +165,7 @@ fun ShowLocationView( MapboxMap( styleUri = rememberTileStyleUrl(), modifier = Modifier.fillMaxSize(), - images = mapOf(PIN_ID to DesignSystemR.drawable.pin).toImmutableMap(), + images = mapOf(PIN_ID to CommonDrawables.pin).toImmutableMap(), cameraPositionState = cameraPositionState, uiSettings = MapDefaults.uiSettings, symbolManagerSettings = MapDefaults.symbolManagerSettings, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt index ff17029497..631ff71f91 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt @@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Attachment import androidx.compose.material.icons.outlined.GraphicEq import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -64,9 +63,9 @@ import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo -import io.element.android.libraries.designsystem.R import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.designsystem.utils.OnLifecycleEvent import io.element.android.libraries.theme.ElementTheme import me.saket.telephoto.zoomable.ZoomSpec @@ -124,7 +123,7 @@ private fun MediaImageView( ) { if (LocalInspectionMode.current) { Image( - painter = painterResource(id = R.drawable.sample_background), + painter = painterResource(id = CommonDrawables.sample_background), modifier = modifier.fillMaxSize(), contentDescription = null, ) @@ -230,7 +229,8 @@ fun MediaFileView( contentAlignment = Alignment.Center, ) { Icon( - imageVector = if (isAudio) Icons.Outlined.GraphicEq else Icons.Outlined.Attachment, + imageVector = if (isAudio) Icons.Outlined.GraphicEq else null, + resourceId = if (isAudio) null else CommonDrawables.ic_september_attachment, contentDescription = null, tint = MaterialTheme.colorScheme.background, modifier = Modifier diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt index 30fe0e8918..df1132f278 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt @@ -72,7 +72,6 @@ import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings -import io.element.android.libraries.designsystem.R as CommonR private val avatarBloomSize = 430.dp @@ -207,7 +206,7 @@ private fun DefaultRoomListTopBar( onClick = onSearchClicked, ) { Icon( - resourceId = CommonR.drawable.ic_compound_search, + resourceId = CommonDrawables.ic_compound_search, contentDescription = stringResource(CommonStrings.action_search), ) } @@ -215,7 +214,7 @@ private fun DefaultRoomListTopBar( onClick = { showMenu = !showMenu } ) { Icon( - resourceId = CommonR.drawable.ic_compound_overflow_vertical, + resourceId = CommonDrawables.ic_compound_overflow_vertical, contentDescription = null, ) }