Use existing strings

This commit is contained in:
ganfra
2026-09-29 16:35:33 +02:00
parent d8b6694575
commit 69a1870f58
3 changed files with 4 additions and 17 deletions
@@ -63,6 +63,7 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
import io.element.android.libraries.preferences.api.store.SessionPreferencesStore import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.DisplayFirstTimelineItems import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.DisplayFirstTimelineItems
import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationToMessage import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationToMessage
import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
@@ -275,7 +276,7 @@ class TimelinePresenter(
if (next.isEmpty()) SelectionState.Disabled else current.copy(selectedEventIds = next) if (next.isEmpty()) SelectionState.Disabled else current.copy(selectedEventIds = next)
} }
selected.size >= MAX_SELECTION_COUNT -> { selected.size >= MAX_SELECTION_COUNT -> {
snackbarDispatcher.post(SnackbarMessage(R.string.screen_room_timeline_selection_limit_reached)) snackbarDispatcher.post(SnackbarMessage(CommonStrings.screen_room_maximum_messages_selected))
current current
} }
else -> current.copy(selectedEventIds = (selected + event.eventId).toPersistentSet()) else -> current.copy(selectedEventIds = (selected + event.eventId).toPersistentSet())
@@ -23,6 +23,7 @@ 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.IconButton
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TopAppBar import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.ui.strings.CommonPlurals
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@@ -37,7 +38,7 @@ fun SelectionModeTopBar(
TopAppBar( TopAppBar(
modifier = modifier, modifier = modifier,
title = { title = {
Text(text = pluralStringResource(R.plurals.screen_room_timeline_selection_title, selectedCount, selectedCount)) Text(text = pluralStringResource(CommonPlurals.common_selected_count, selectedCount, selectedCount))
}, },
navigationIcon = { navigationIcon = {
IconButton( IconButton(
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2026 New Vector Ltd.
~
~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
~ Please see LICENSE files in the repository root for full details.
-->
<resources>
<!-- %1$d is the number of selected messages -->
<plurals name="screen_room_timeline_selection_title">
<item quantity="one">%1$d selected</item>
<item quantity="other">%1$d selected</item>
</plurals>
<string name="screen_room_timeline_selection_limit_reached">You can select up to 30 messages</string>
</resources>