From 2be4f691f2ce18a640ce67d172180541762f2c9a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 29 Oct 2024 16:37:43 +0100 Subject: [PATCH] Added participants count in conversation info --- .../ui/main/chat/viewmodel/ConversationInfoViewModel.kt | 8 ++++++++ app/src/main/res/layout/chat_info_fragment.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt index 6d59e7310..42d849986 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt @@ -50,6 +50,8 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi val participants = MutableLiveData>() + val participantsLabel = MutableLiveData() + val isGroup = MutableLiveData() val isEndToEndEncrypted = MutableLiveData() @@ -573,6 +575,12 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi avatarModel.postValue(avatar) participants.postValue(participantsList) + participantsLabel.postValue( + AppUtils.getFormattedString( + R.string.conversation_info_participants_list_title, + participantsList.size.toString() + ) + ) } @WorkerThread diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index a4a6ca10e..49ed5f770 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -301,7 +301,7 @@ android:drawableTint="?attr/color_main2_600" android:onClick="@{() -> viewModel.toggleParticipantsExpand()}" android:padding="5dp" - android:text="@string/conversation_info_participants_list_title" + android:text="@{viewModel.participantsLabel, default=@string/conversation_info_participants_list_title}" android:visibility="@{viewModel.isGroup ? View.VISIBLE : View.GONE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0e776d70c..8222bbf22 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -470,7 +470,7 @@ Aucun résultat trouvé Dernier résultat atteint - Membres du groupe + Membres du groupe (%s) Ajouter des membres Administrateur Supprimer l\'historique diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0aedd85da..be3cb197e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -508,7 +508,7 @@ No matching result found Last matching result reached - Group members + Group members (%s) Add participants Admin Delete history