Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Pinned events : clean up more banner code

Browse source
This commit is contained in:
ganfra 2024-07-31 15:51:19 +02:00
parent 8adabda028
commit 3971ee333d
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt
View file

@ -14,11 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
@file:OptIn(ExperimentalFoundationApi::class)
package io.element.android.features.messages.impl.pinned.banner package io.element.android.features.messages.impl.pinned.banner
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement.spacedBy 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.draw.shadow
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp 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.pinnedMessageBannerBorder
import io.element.android.libraries.designsystem.theme.pinnedMessageBannerIndicator import io.element.android.libraries.designsystem.theme.pinnedMessageBannerIndicator
import io.element.android.libraries.designsystem.utils.annotatedTextWithBold import io.element.android.libraries.designsystem.utils.annotatedTextWithBold
import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
fun PinnedMessagesBannerView( fun PinnedMessagesBannerView(
@ -110,7 +109,7 @@ fun PinnedMessagesBannerView(
message = "This is a pinned message", message = "This is a pinned message",
modifier = Modifier.weight(1f) 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, message: String,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val countMessage = "${index + 1} of $totalCount" val countMessage = stringResource(id = CommonStrings.screen_room_pinned_banner_indicator, index + 1, totalCount)
val fullMessage = "$countMessage Pinned messages" val fullCountMessage = stringResource(id = CommonStrings.screen_room_pinned_banner_indicator_description, countMessage)
Column(modifier = modifier) { Column(modifier = modifier) {
if (totalCount > 1) { if (totalCount > 1) {
Text( Text(
text = annotatedTextWithBold( text = annotatedTextWithBold(
text = fullMessage, text = fullCountMessage,
boldText = countMessage, boldText = countMessage,
), ),
style = ElementTheme.typography.fontBodySmMedium, style = ElementTheme.typography.fontBodySmMedium,

1
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
View file

@ -22,7 +22,6 @@ import kotlinx.coroutines.test.runTest
import org.junit.Test import org.junit.Test
class PinnedMessagesBannerPresenterTest { class PinnedMessagesBannerPresenterTest {
@Test @Test
fun `present - initial state`() = runTest { fun `present - initial state`() = runTest {
val presenter = createPinnedMessagesBannerPresenter() val presenter = createPinnedMessagesBannerPresenter()