From 3971ee333d60bbcafb770bf6ba0381bb00f9a607 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 31 Jul 2024 15:51:19 +0200 Subject: [PATCH] Pinned events : clean up more banner code --- .../impl/pinned/banner/PinnedMessagesBannerView.kt | 13 ++++++------- .../banner/PinnedMessagesBannerPresenterTest.kt | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt index 99ca53fd69..d6139f5aba 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt @@ -14,11 +14,8 @@ * limitations under the License. */ -@file:OptIn(ExperimentalFoundationApi::class) - package io.element.android.features.messages.impl.pinned.banner -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement.spacedBy @@ -44,6 +41,7 @@ import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.shadow import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp @@ -57,6 +55,7 @@ import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.designsystem.theme.pinnedMessageBannerBorder import io.element.android.libraries.designsystem.theme.pinnedMessageBannerIndicator import io.element.android.libraries.designsystem.utils.annotatedTextWithBold +import io.element.android.libraries.ui.strings.CommonStrings @Composable fun PinnedMessagesBannerView( @@ -110,7 +109,7 @@ fun PinnedMessagesBannerView( message = "This is a pinned message", modifier = Modifier.weight(1f) ) - TextButton(text = "View all", onClick = { /*TODO*/ }) + TextButton(text = stringResource(id = CommonStrings.screen_room_pinned_banner_view_all_button_title), onClick = { /*TODO*/ }) } } @@ -168,13 +167,13 @@ private fun PinnedMessageItem( message: String, modifier: Modifier = Modifier, ) { - val countMessage = "${index + 1} of $totalCount" - val fullMessage = "$countMessage Pinned messages" + val countMessage = stringResource(id = CommonStrings.screen_room_pinned_banner_indicator, index + 1, totalCount) + val fullCountMessage = stringResource(id = CommonStrings.screen_room_pinned_banner_indicator_description, countMessage) Column(modifier = modifier) { if (totalCount > 1) { Text( text = annotatedTextWithBold( - text = fullMessage, + text = fullCountMessage, boldText = countMessage, ), style = ElementTheme.typography.fontBodySmMedium, diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt index b57f40abbe..6cf1b8beb0 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt @@ -22,7 +22,6 @@ import kotlinx.coroutines.test.runTest import org.junit.Test class PinnedMessagesBannerPresenterTest { - @Test fun `present - initial state`() = runTest { val presenter = createPinnedMessagesBannerPresenter()