From b82f8aed2b6a6d6d941b66aa10ca961fb4b91995 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 23 Jan 2024 14:39:49 +0100
Subject: [PATCH] Fixed meeting invitation participant label with only 1
 participant

---
 .../linphone/ui/call/model/ConferenceModel.kt | 19 ++++++++++++++-----
 .../ui/main/chat/model/MessageModel.kt        |  6 +++++-
 ..._conference_participants_list_fragment.xml |  2 +-
 app/src/main/res/values/strings.xml           |  5 ++++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt b/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt
index ed435d735..d238b8e12 100644
--- a/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt
@@ -298,9 +298,10 @@ class ConferenceModel {
         participantDevices.postValue(sortParticipantDevicesList(devicesList))
         participants.postValue(participantsList)
         participantsLabel.postValue(
-            AppUtils.getFormattedString(
-                R.string.conference_participants_list_title,
-                participantsList.size
+            AppUtils.getStringWithPlural(
+                R.plurals.conference_participants_list_title,
+                participantsList.size,
+                "${participantsList.size}"
             )
         )
     }
@@ -338,7 +339,11 @@ class ConferenceModel {
 
         participants.postValue(list)
         participantsLabel.postValue(
-            AppUtils.getFormattedString(R.string.conference_participants_list_title, list.size)
+            AppUtils.getStringWithPlural(
+                R.plurals.conference_participants_list_title,
+                list.size,
+                "${list.size}"
+            )
         )
     }
 
@@ -368,7 +373,11 @@ class ConferenceModel {
 
         participants.postValue(list)
         participantsLabel.postValue(
-            AppUtils.getFormattedString(R.string.conference_participants_list_title, list.size)
+            AppUtils.getStringWithPlural(
+                R.plurals.conference_participants_list_title,
+                list.size,
+                "${list.size}"
+            )
         )
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index 717b8dff6..0293947a2 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -590,7 +590,11 @@ class MessageModel @WorkerThread constructor(
                 count += 1
             }
             meetingParticipants.postValue(
-                AppUtils.getFormattedString(R.string.conference_participants_list_title, "$count")
+                AppUtils.getStringWithPlural(
+                    R.plurals.conference_participants_list_title,
+                    count,
+                    "$count"
+                )
             )
 
             meetingFound.postValue(true)
diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
index 2e1842b03..117f2bd63 100644
--- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml
+++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
@@ -37,7 +37,7 @@
             android:layout_height="@dimen/top_bar_height"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:text="@{viewModel.conferenceModel.participantsLabel, default=@string/conference_participants_list_title}"
+            android:text="@{viewModel.conferenceModel.participantsLabel, default=`1 participant`}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/back"
             app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83f76f09c..ba5b954c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -537,7 +537,10 @@
     <string name="conference_call_empty">Waiting for other participants…</string>
     <string name="conference_action_screen_sharing">Screen share</string>
     <string name="conference_action_show_participants">Participants</string>
-    <string name="conference_participants_list_title">%s participants</string>
+    <plurals name="conference_participants_list_title">
+        <item quantity="one">%s participant</item>
+        <item quantity="other">%s participants</item>
+    </plurals>
 
     <string name="conference_layout_grid">Mosaic</string>
     <string name="conference_layout_active_speaker">Speaker</string>