diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt index c780be9b44..39d90a21f8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 Signal Messenger, LLC + * Copyright 2024 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ @@ -201,15 +201,31 @@ private fun getSnackbarText(state: RaiseHandState): String { val additionalHandsCount = state.raisedHands.size - 1 return if (!state.isExpanded) { if (state.raisedHands.size == 1) { - stringResource(id = R.string.CallRaiseHandSnackbar_raised_hands_singular, displayedName) + if (state.raisedHands.first().sender.isSelf) { + stringResource(id = R.string.CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single, displayedName) + } else { + stringResource(id = R.string.CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular, displayedName) + } } else { - pluralStringResource(id = R.plurals.CallRaiseHandSnackbar_raised_hands_plural, count = additionalHandsCount, displayedName, state.raisedHands.size - 1) + if (state.raisedHands.first().sender.isSelf) { + pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple, count = additionalHandsCount, displayedName, additionalHandsCount) + } else { + pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple, count = additionalHandsCount, displayedName, additionalHandsCount) + } } } else { if (state.raisedHands.size == 1) { - stringResource(id = R.string.CallRaiseHandSnackbar__raised_a_hand_singular, displayedName) + if (state.raisedHands.first().sender.isSelf) { + stringResource(id = R.string.CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single, displayedName) + } else { + stringResource(id = R.string.CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single, displayedName) + } } else { - pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__raised_a_hand_plural, count = additionalHandsCount, displayedName, state.raisedHands.size - 1) + if (state.raisedHands.first().sender.isSelf) { + pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple, count = additionalHandsCount, displayedName, additionalHandsCount) + } else { + pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple, count = additionalHandsCount, displayedName, additionalHandsCount) + } } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c3de5a822..35ac0f2540 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,9 @@ + + Signal @@ -2126,19 +2131,35 @@ View - - %1$s raised a hand - - + + + %1$s raised a hand + + %1$s +%2$d raised a hand %1$s +%2$d raised a hand + + %1$s raised a hand + + + %1$s +%2$d raised a hand + %1$s +%2$d raised a hand + - - %1$s - - + + %1$s + + + %1$s +%2$d + %1$s +%2$d + + + + %1$s + + %1$s +%2$d %1$s +%2$d