From cc50d4514128c7561aa351591187d3bb2003702b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 19 Dec 2023 18:49:20 +0100 Subject: [PATCH] Use icon from library and move and rename retry.xml to the library. Also fix contentDescription for pause button. --- .../components/event/TimelineItemVoiceView.kt | 14 +++++++------- .../messages/impl/src/main/res/drawable/pause.xml | 9 --------- .../messages/impl/src/main/res/drawable/play.xml | 9 --------- .../libraries/designsystem/icons/IconsList.kt | 1 + .../src/main/res/drawable/ic_pause.xml | 2 +- .../src/main/res/drawable/ic_retry.xml | 2 +- 6 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 features/messages/impl/src/main/res/drawable/pause.xml delete mode 100644 features/messages/impl/src/main/res/drawable/play.xml rename features/messages/impl/src/main/res/drawable/retry.xml => libraries/designsystem/src/main/res/drawable/ic_retry.xml (96%) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt index 309b424587..ed7e031392 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import io.element.android.features.messages.impl.R +import io.element.android.compound.theme.ElementTheme import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContentProvider import io.element.android.features.messages.impl.voicemessages.timeline.VoiceMessageEvents @@ -56,7 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.IconButton import io.element.android.libraries.designsystem.theme.components.Text -import io.element.android.compound.theme.ElementTheme +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.ui.strings.CommonStrings import kotlinx.coroutines.delay @@ -119,7 +119,7 @@ private fun PlayButton( enabled = enabled, ) { Icon( - resourceId = R.drawable.play, + resourceId = CommonDrawables.ic_play, contentDescription = stringResource(id = CommonStrings.a11y_play), ) } @@ -133,8 +133,8 @@ private fun PauseButton( onClick = onClick, ) { Icon( - resourceId = R.drawable.pause, - contentDescription = stringResource(id = CommonStrings.a11y_play), + resourceId = CommonDrawables.ic_pause, + contentDescription = stringResource(id = CommonStrings.a11y_pause), ) } } @@ -147,7 +147,7 @@ private fun RetryButton( onClick = onClick, ) { Icon( - resourceId = R.drawable.retry, + resourceId = CommonDrawables.ic_retry, contentDescription = stringResource(id = CommonStrings.action_retry), ) } @@ -183,7 +183,7 @@ private fun ProgressButton( ) } else { Icon( - resourceId = R.drawable.pause, + resourceId = CommonDrawables.ic_pause, contentDescription = stringResource(id = CommonStrings.a11y_pause), ) } diff --git a/features/messages/impl/src/main/res/drawable/pause.xml b/features/messages/impl/src/main/res/drawable/pause.xml deleted file mode 100644 index 875a9ce403..0000000000 --- a/features/messages/impl/src/main/res/drawable/pause.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/features/messages/impl/src/main/res/drawable/play.xml b/features/messages/impl/src/main/res/drawable/play.xml deleted file mode 100644 index 4e9df7b71d..0000000000 --- a/features/messages/impl/src/main/res/drawable/play.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt index 5240633320..cd7e36d611 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt @@ -44,6 +44,7 @@ internal val iconsOther = listOf( R.drawable.ic_plus, R.drawable.ic_quote, R.drawable.ic_reply, + R.drawable.ic_retry, R.drawable.ic_sign_out, R.drawable.ic_strikethrough, R.drawable.ic_take_photo_camera, diff --git a/libraries/designsystem/src/main/res/drawable/ic_pause.xml b/libraries/designsystem/src/main/res/drawable/ic_pause.xml index bc6deee55a..8c23a73376 100644 --- a/libraries/designsystem/src/main/res/drawable/ic_pause.xml +++ b/libraries/designsystem/src/main/res/drawable/ic_pause.xml @@ -5,5 +5,5 @@ android:viewportHeight="20"> + android:fillColor="@android:color/white"/> diff --git a/features/messages/impl/src/main/res/drawable/retry.xml b/libraries/designsystem/src/main/res/drawable/ic_retry.xml similarity index 96% rename from features/messages/impl/src/main/res/drawable/retry.xml rename to libraries/designsystem/src/main/res/drawable/ic_retry.xml index c3fda8bca6..1990c52f0c 100644 --- a/features/messages/impl/src/main/res/drawable/retry.xml +++ b/libraries/designsystem/src/main/res/drawable/ic_retry.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@android:color/white"/>