From 6fc3e6ec7e3057208b6bff56e8b310df1c20926a Mon Sep 17 00:00:00 2001
From: Pierre Nicolas <pierre.nicolas@savoirfairelinux.com>
Date: Fri, 24 Nov 2023 10:03:13 -0500
Subject: [PATCH] update credits

Standardizes lists between clients.

GitLab: #1460
Change-Id: I846196a2461aa5edf02bb220b5b460376144ae91
---
 .../app/src/main/res/layout/dialog_about.xml  | 12 ++-
 .../app/src/main/res/values/strings.xml       | 74 ++++++++++++++++++-
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/jami-android/app/src/main/res/layout/dialog_about.xml b/jami-android/app/src/main/res/layout/dialog_about.xml
index 17f6f6cc6..27fa3bc1f 100644
--- a/jami-android/app/src/main/res/layout/dialog_about.xml
+++ b/jami-android/app/src/main/res/layout/dialog_about.xml
@@ -22,7 +22,17 @@
             android:layout_height="wrap_content"
             android:text="@string/credits_developer"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_margin="@dimen/padding_small"
+            android:layout_marginTop="@dimen/padding_small"
+            android:layout_marginHorizontal="@dimen/padding_small"
+            android:textColor="@color/colorOnSurface" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/credits_volunteers"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_marginHorizontal="@dimen/padding_small"
+            android:layout_marginBottom="@dimen/padding_small"
             android:textColor="@color/colorOnSurface" />
 
         <TextView
diff --git a/jami-android/app/src/main/res/values/strings.xml b/jami-android/app/src/main/res/values/strings.xml
index efecc89de..3ffa3580e 100644
--- a/jami-android/app/src/main/res/values/strings.xml
+++ b/jami-android/app/src/main/res/values/strings.xml
@@ -52,7 +52,79 @@ along with this program; if not, write to the Free Software
     <string name="developed_by">Developed by</string>
     <string name="designed_by">Designed by</string>
     <string name="ringtones_by">Ringtones by</string>
-    <string name="credits_developer" translatable="false">Adrien Béraud\nAlbert Babí\nAlexander Lussier-Cullen\nAlexandr Sergheev\nAlexandre Lision\nAlexandre Viau\nAline Bonnet\nAline Gondim Santos\nAmirHossein Naghshzan\nAndreas Traczyk\nAnthony Léonard\nBrando Tovar\nCyrille Béraud\nEdric Milaret\nÉloi Bail\nEmma Falkiewitz\nEmmanuel Lepage-Vallée\nFrédéric Guimont\nGuillaume Heller\nGuillaume Roguez\nHadrien De Sousa\nJulien Grossholtz\nKateryna Kostiuk\nLoïc Siret\nMarianne Forget\nMichel Schmit\nMingrui Zhang\nMohamed Chibani\nMohamed Amine Younes Bouacida\nNicolas Jäger\nNicolas Reynaud\nOlivier Gregoire\nOlivier Soldano\nPatrick Keroulas\nPeymane Marandi\nPhilippe Gorley\nPierre Duchemin\nPierre Nicolas\nRomain Bertozzi\nSaher Azer\nSébastien Blin\nSeva Ivanov\nSilbino Gonçalves Matado\nSimon Désaulniers\nStepan Salenikovich\nSimon Zeni\nThibault Wittemberg</string>
+    <string name="credits_developer" translatable="false">
+        Adrien Béraud
+        \nAlbert Babí
+        \nAlexander Lussier-Cullen
+        \nAlexandr Sergheev
+        \nAlexandre Lision
+        \nAlexandre Viau
+        \nAline Bonnet
+        \nAline Gondim Santos
+        \nAlireza Toghiani
+        \nAmin Bandali
+        \nAmirHossein Naghshzan
+        \nAmna Snene
+        \nAndreas Traczyk
+        \nAnthony Léonard
+        \nBrando Tovar
+        \nCapucine Berthet
+        \nCharles-Francis Damedey
+        \nChristophe Villemer
+        \nCharlotte Hoffmann
+        \nCyrille Béraud
+        \nDorina Mosku
+        \nEden Abitbol
+        \nEdric Milaret
+        \nÉloi Bail
+        \nEmma Falkiewitz
+        \nEmmanuel Lepage-Vallée
+        \nFadi Shehadeh
+        \nFranck Laurent
+        \nFrédéric Guimont
+        \nGuillaume Heller
+        \nGuillaume Roguez
+        \nHadrien De Sousa
+        \nHugo Lefeuvre
+        \nJulien Grossholtz
+        \nKateryna Kostiuk
+        \nLéo Banno-Cloutier
+        \nLiam Courdoson
+        \nLoïc Siret
+        \nMarianne Forget
+        \nMathéo Joseph
+        \nMichel Schmit
+        \nMingrui Zhang
+        \nMohamed Chibani
+        \nMohamed Amine Younes Bouacida
+        \nNicolas Jäger
+        \nNicolas Reynaud
+        \nNicolas Vengeon
+        \nOlivier Gregoire
+        \nOlivier Soldano
+        \nPatrick Keroulas
+        \nPeymane Marandi
+        \nPhilippe Gorley
+        \nPierre Duchemin
+        \nPierre Lespagnol
+        \nPierre Nicolas
+        \nRaphaël Brulé
+        \nRayan Osseiran
+        \nRomain Bertozzi
+        \nSaher Azer
+        \nSébastien Blin
+        \nSeva Ivanov
+        \nSilbino Gonçalves Matado
+        \nSimon Désaulniers
+        \nSimon Zeni
+        \nStepan Salenikovich
+        \nThibault Wittemberg
+        \nThomas Ballasi
+        \nTrevor Tabah
+        \nVsevolod Ivanov
+        \nXavier Jouslin de Noray
+        \nYang Wang</string>
+    <string name="credits_volunteers">And the volunteers who contribute to this project!</string>
     <string name="credits_ringtones" translatable="false">Loïc Bogino</string>
 
     <!-- RingActivity -->
-- 
GitLab