From d656c29ea5c47dfc1ec43f916108400e7f314457 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 27 Jul 2023 11:50:16 +0200 Subject: [PATCH] Fix lint false positive. --- .../features/createroom/impl/root/CreateRoomRootView.kt | 6 +++--- .../element/android/libraries/designsystem/VectorIcons.kt | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt index ac8a05f448..7aa5467b11 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt @@ -42,6 +42,7 @@ import androidx.compose.ui.unit.dp import io.element.android.features.createroom.impl.R import io.element.android.features.createroom.impl.components.UserListView import io.element.android.libraries.architecture.Async +import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.dialogs.RetryDialog import io.element.android.libraries.designsystem.preview.ElementPreviewDark @@ -55,7 +56,6 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings -import io.element.android.libraries.designsystem.R as DrawableR @OptIn(ExperimentalLayoutApi::class) @Composable @@ -162,12 +162,12 @@ fun CreateRoomActionButtonsList( ) { Column(modifier = modifier) { CreateRoomActionButton( - iconRes = DrawableR.drawable.ic_groups, + iconRes = VectorIcons.Groups, text = stringResource(id = R.string.screen_create_room_action_create_room), onClick = onNewRoomClicked, ) CreateRoomActionButton( - iconRes = DrawableR.drawable.ic_share, + iconRes = VectorIcons.Share, text = stringResource(id = CommonStrings.action_invite_friends_to_app, state.applicationName), onClick = onInvitePeopleClicked, ) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt index 0e33567129..47b951baa2 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt @@ -25,4 +25,6 @@ object VectorIcons { val DoorOpen = R.drawable.ic_door_open_24 val DeveloperMode = R.drawable.ic_developer_mode val ReportContent = R.drawable.ic_report_content + val Groups = R.drawable.ic_groups + val Share = R.drawable.ic_share }