ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7367 from hayaksi1/fix/2925-room-notification-mute-string

Browse Source 
Use a dedicated string for the Mute room notification mode
This commit is contained in:
Benoit Marty
2026-08-11 15:59:55 +02:00
committed by GitHub
parent 12f4330724 aff71cf1b9
commit 15addc522b
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
+1 -2
View File
@@ -12,7 +12,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import io.element.android.features.roomdetails.impl.R import io.element.android.features.roomdetails.impl.R
import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.matrix.api.room.RoomNotificationMode
import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@@ -36,7 +35,7 @@ fun roomNotificationSettingsItems(): ImmutableList<RoomNotificationSettingsItem>
) )
RoomNotificationMode.MUTE -> RoomNotificationSettingsItem( RoomNotificationMode.MUTE -> RoomNotificationSettingsItem(
mode = it, mode = it,
title = stringResource(CommonStrings.common_mute), title = stringResource(R.string.screen_room_notification_settings_mode_mute),
) )
} }
} }
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
+1 -2
View File
@@ -34,7 +34,6 @@ import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithSt
import io.element.android.libraries.designsystem.theme.components.Scaffold import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.TopAppBar import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.matrix.api.room.RoomNotificationMode
import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
fun RoomNotificationSettingsView( fun RoomNotificationSettingsView(
@@ -118,7 +117,7 @@ private fun RoomSpecificNotificationSettingsView(
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> { RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
stringResource(id = R.string.screen_room_notification_settings_mode_mentions_and_keywords) stringResource(id = R.string.screen_room_notification_settings_mode_mentions_and_keywords)
} }
RoomNotificationMode.MUTE -> stringResource(id = CommonStrings.common_mute) RoomNotificationMode.MUTE -> stringResource(id = R.string.screen_room_notification_settings_mode_mute)
} }
val displayMentionsOnlyDisclaimer = state.displayMentionsOnlyDisclaimer && val displayMentionsOnlyDisclaimer = state.displayMentionsOnlyDisclaimer &&
state.defaultRoomNotificationMode == RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY state.defaultRoomNotificationMode == RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
features/roomdetails/impl/src/main/res/values/temporary.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2026 Element Creations Ltd.
~
~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
~ Please see LICENSE files in the repository root for full details.
-->
<resources>
<string name="screen_room_notification_settings_mode_mute">Mute</string>
</resources>