From 9234f47ce3f893fd1030167ddfd0f0bfad3a2985 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 14 Feb 2023 13:23:38 +0100 Subject: [PATCH] Move and rename VectorIcon --- .../login/changeserver/ChangeServerView.kt | 5 ++- .../messages/actionlist/ActionListView.kt | 5 ++- .../designsystem/components/VectorIcon.kt | 37 ------------------- .../designsystem/theme/components/Icon.kt | 17 +++++++++ 4 files changed, 23 insertions(+), 41 deletions(-) delete mode 100644 libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt diff --git a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt index e934675f91..9610e43f3f 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt @@ -48,12 +48,12 @@ import androidx.compose.ui.unit.sp import io.element.android.features.login.R import io.element.android.features.login.error.changeServerError import io.element.android.libraries.architecture.Async -import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.libraries.designsystem.components.form.textFieldState import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Button import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator +import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.OutlinedTextField import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.testtags.TestTags @@ -91,12 +91,13 @@ fun ChangeServerView( shape = RoundedCornerShape(32.dp) ) ) { - VectorIcon( + Icon( modifier = Modifier .align(Alignment.Center) .size(width = 48.dp, height = 48.dp), // TODO Update with design input resourceId = R.drawable.ic_baseline_dataset_24, + contentDescription = "", ) } Text( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt index a3ca2eb2d6..01719a7f9c 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt @@ -42,9 +42,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.features.messages.actionlist.model.TimelineItemAction import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.libraries.designsystem.components.VectorIcon 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.designsystem.theme.components.ModalBottomSheetLayout import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch @@ -121,8 +121,9 @@ private fun SheetContent( ) }, icon = { - VectorIcon( + Icon( resourceId = action.icon, + contentDescription = "", tint = if (action.destructive) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary, ) } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt deleted file mode 100644 index d576b1dacc..0000000000 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2022 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.libraries.designsystem.components - -import androidx.compose.material3.LocalContentColor -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource - -@Composable -fun VectorIcon( - resourceId: Int, - modifier: Modifier = Modifier, - tint: Color = LocalContentColor.current, -) { - androidx.compose.material3.Icon( - painter = painterResource(id = resourceId), - contentDescription = null, - modifier = modifier, - tint = tint - ) -} diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt index 5682cb4bd5..7f67d0034f 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt @@ -16,6 +16,7 @@ package io.element.android.libraries.designsystem.theme.components +import androidx.annotation.DrawableRes import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close import androidx.compose.material3.LocalContentColor @@ -24,6 +25,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight @@ -58,6 +60,21 @@ fun Icon( ) } +@Composable +fun Icon( + @DrawableRes resourceId: Int, + contentDescription: String?, + modifier: Modifier = Modifier, + tint: Color = LocalContentColor.current, +) { + androidx.compose.material3.Icon( + painter = painterResource(id = resourceId), + contentDescription = contentDescription, + modifier = modifier, + tint = tint + ) +} + @Preview @Composable internal fun IconImageVectorLightPreview() =