Merge pull request #4038 from element-hq/feature/bma/emptyWording

Improve title and subtitle for empty states in the gallery.

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt

@@ -32,6 +32,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -213,7 +214,11 @@ private fun MediaGalleryImages(
     onItemClick: (MediaItem.Event) -> Unit,
 ) {
     if (imagesAndVideos.isEmpty()) {
-        EmptyContent()
+        EmptyContent(
+            titleRes = R.string.screen_media_browser_media_empty_state_title,
+            subtitleRes = R.string.screen_media_browser_media_empty_state_subtitle,
+            icon = CompoundIcons.Image(),
+        )
     } else {
         MediaGalleryImageGrid(
             imagesAndVideos = imagesAndVideos,
@@ -230,7 +235,11 @@ private fun MediaGalleryFiles(
     onItemClick: (MediaItem.Event) -> Unit,
 ) {
     if (files.isEmpty()) {
-        EmptyContent()
+        EmptyContent(
+            titleRes = R.string.screen_media_browser_files_empty_state_title,
+            subtitleRes = R.string.screen_media_browser_files_empty_state_subtitle,
+            icon = CompoundIcons.Files(),
+        )
     } else {
         MediaGalleryFilesList(
             files = files,
@@ -394,7 +403,11 @@ private fun ErrorContent(error: Throwable) {
 }
 
 @Composable
-private fun EmptyContent() {
+private fun EmptyContent(
+    titleRes: Int,
+    subtitleRes: Int,
+    icon: ImageVector,
+) {
     Box(
         modifier = Modifier.fillMaxSize(),
     ) {
@@ -403,9 +416,9 @@ private fun EmptyContent() {
                 .fillMaxWidth()
                 .padding(top = 44.dp)
                 .padding(24.dp),
-            title = stringResource(R.string.screen_media_browser_empty_state_title),
-            iconStyle = BigIcon.Style.Default(CompoundIcons.Image()),
-            subtitle = stringResource(R.string.screen_media_browser_empty_state_subtitle),
+            title = stringResource(titleRes),
+            iconStyle = BigIcon.Style.Default(icon),
+            subtitle = stringResource(subtitleRes),
         )
     }
 }

libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_media_browser_empty_state_subtitle">"Obrázky a videa nahraná do této místnosti budou zobrazeny zde."</string>
-  <string name="screen_media_browser_empty_state_title">"Zatím nebyla nahrána žádná média"</string>
   <string name="screen_media_browser_list_loading_files">"Načítání souborů…"</string>
   <string name="screen_media_browser_list_loading_media">"Načítání médií…"</string>
   <string name="screen_media_browser_list_mode_files">"Soubory"</string>
   <string name="screen_media_browser_list_mode_media">"Média"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Obrázky a videa nahraná do této místnosti budou zobrazeny zde."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Zatím nebyla nahrána žádná média"</string>
   <string name="screen_media_browser_title">"Média a soubory"</string>
 </resources>

libraries/mediaviewer/impl/src/main/res/values-de/translations.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_media_browser_empty_state_subtitle">"In diesen Chatroom hochgeladene Bilder und Videos werden hier angezeigt."</string>
-  <string name="screen_media_browser_empty_state_title">"Noch keine Medien hochgeladen"</string>
   <string name="screen_media_browser_list_loading_files">"Dateien werden geladen…"</string>
   <string name="screen_media_browser_list_loading_media">"Medien werden geladen…"</string>
   <string name="screen_media_browser_list_mode_files">"Dateien"</string>
   <string name="screen_media_browser_list_mode_media">"Medien"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"In diesen Chatroom hochgeladene Bilder und Videos werden hier angezeigt."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Noch keine Medien hochgeladen"</string>
   <string name="screen_media_browser_title">"Medien und Dateien"</string>
   <string name="screen_media_details_file_format">"Dateiformat"</string>
   <string name="screen_media_details_filename">"Dateiname"</string>

libraries/mediaviewer/impl/src/main/res/values-et/translations.xml

@@ -2,15 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_media_browser_delete_confirmation_subtitle">"Järgnevaga eemaldame selle faili jututoast ka tema liikmed enam ei pääse failile ligi."</string>
   <string name="screen_media_browser_delete_confirmation_title">"Kas kustutame faili?"</string>
-  <string name="screen_media_browser_empty_state_subtitle">"Antud jututuppa üleslaaditud pildid ja videod kuvatakse siin."</string>
-  <string name="screen_media_browser_empty_state_title">"Mitte keegi pole veel meediat üles laadinud"</string>
   <string name="screen_media_browser_list_loading_files">"Laadime faile…"</string>
   <string name="screen_media_browser_list_loading_media">"Laadime meediat…"</string>
   <string name="screen_media_browser_list_mode_files">"Failid"</string>
   <string name="screen_media_browser_list_mode_media">"Meedia"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Antud jututuppa üleslaaditud pildid ja videod kuvatakse siin."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Mitte keegi pole veel meediat üles laadinud"</string>
   <string name="screen_media_browser_title">"Meedia ja failid"</string>
   <string name="screen_media_details_file_format">"Failivorming"</string>
   <string name="screen_media_details_filename">"Failinimi"</string>
+  <string name="screen_media_details_redact_confirmation_message">"Järgnevaga eemaldame selle faili jututoast ja tema liikmed enam ei pääse failile ligi."</string>
+  <string name="screen_media_details_redact_confirmation_title">"Kas kustutame faili?"</string>
   <string name="screen_media_details_uploaded_by">"Üleslaadija"</string>
   <string name="screen_media_details_uploaded_on">"Üleslaaditud"</string>
 </resources>

libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml

@@ -2,12 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_media_browser_delete_confirmation_subtitle">"Ce fichier sera supprimé du salon et les membres n’y auront plus accès."</string>
   <string name="screen_media_browser_delete_confirmation_title">"Supprimer le fichier ?"</string>
-  <string name="screen_media_browser_empty_state_subtitle">"Les images et vidéos envoyées dans ce salon seront affichées ici."</string>
-  <string name="screen_media_browser_empty_state_title">"Aucun média n’a encore été envoyé dans ce salon"</string>
   <string name="screen_media_browser_list_loading_files">"Chargement des fichiers…"</string>
   <string name="screen_media_browser_list_loading_media">"Chargement des médias…"</string>
   <string name="screen_media_browser_list_mode_files">"Fichiers"</string>
   <string name="screen_media_browser_list_mode_media">"Média"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Les images et vidéos envoyées dans ce salon seront affichées ici."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Aucun média n’a encore été envoyé dans ce salon"</string>
   <string name="screen_media_browser_title">"Médias et fichiers"</string>
   <string name="screen_media_details_file_format">"Format du fichier"</string>
   <string name="screen_media_details_filename">"Nom du fichier"</string>

libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml

@@ -2,12 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_media_browser_delete_confirmation_subtitle">"Ez a fájl el lesz távolítva a szobából, és a tagok nem férhetnek hozzá."</string>
   <string name="screen_media_browser_delete_confirmation_title">"Törli a fájlt?"</string>
-  <string name="screen_media_browser_empty_state_subtitle">"Az ebbe a szobába feltöltött képek és videók itt jelennek meg."</string>
-  <string name="screen_media_browser_empty_state_title">"Még nincs feltöltött média"</string>
   <string name="screen_media_browser_list_loading_files">"Fájlok betöltése…"</string>
   <string name="screen_media_browser_list_loading_media">"Média betöltése…"</string>
   <string name="screen_media_browser_list_mode_files">"Fájlok"</string>
   <string name="screen_media_browser_list_mode_media">"Média"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Az ebbe a szobába feltöltött képek és videók itt jelennek meg."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Még nincs feltöltött média"</string>
   <string name="screen_media_browser_title">"Média és fájlok"</string>
   <string name="screen_media_details_file_format">"Fájlformátum"</string>
   <string name="screen_media_details_filename">"Fájlnév"</string>

libraries/mediaviewer/impl/src/main/res/values-it/translations.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_media_browser_empty_state_subtitle">"Le immagini e i video caricati in questa stanza verranno mostrati qui."</string>
-  <string name="screen_media_browser_empty_state_title">"Nessun file multimediale ancora caricato"</string>
   <string name="screen_media_browser_list_mode_files">"File"</string>
   <string name="screen_media_browser_list_mode_media">"Contenuti multimediali"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Le immagini e i video caricati in questa stanza verranno mostrati qui."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Nessun file multimediale ancora caricato"</string>
   <string name="screen_media_browser_title">"File e contenuti multimediali"</string>
 </resources>

libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml

@@ -2,15 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_media_browser_delete_confirmation_subtitle">"Этот файл будет удален из комнаты и участники не будут иметь к нему доступ."</string>
   <string name="screen_media_browser_delete_confirmation_title">"Удалить файл?"</string>
-  <string name="screen_media_browser_empty_state_subtitle">"Здесь будут показаны изображения и видео, загруженные в данную комнату."</string>
-  <string name="screen_media_browser_empty_state_title">"Пока что нет загруженных медиафайлов"</string>
   <string name="screen_media_browser_list_loading_files">"Загрузка файлов…"</string>
   <string name="screen_media_browser_list_loading_media">"Загрузка медиа…"</string>
   <string name="screen_media_browser_list_mode_files">"Файлы"</string>
   <string name="screen_media_browser_list_mode_media">"Медиа"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Здесь будут показаны изображения и видео, загруженные в данную комнату."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Пока что нет загруженных медиафайлов"</string>
   <string name="screen_media_browser_title">"Медиа и файлы"</string>
   <string name="screen_media_details_file_format">"Формат файла"</string>
   <string name="screen_media_details_filename">"Имя файла"</string>
+  <string name="screen_media_details_redact_confirmation_message">"Этот файл будет удален из комнаты и у участников не будет к нему доступа."</string>
+  <string name="screen_media_details_redact_confirmation_title">"Удалить файл?"</string>
   <string name="screen_media_details_uploaded_by">"Загружено"</string>
   <string name="screen_media_details_uploaded_on">"Загружено на"</string>
 </resources>

libraries/mediaviewer/impl/src/main/res/values/localazy.xml

@@ -2,12 +2,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_media_browser_delete_confirmation_subtitle">"This file will be removed from the room and members won’t have access to it."</string>
   <string name="screen_media_browser_delete_confirmation_title">"Delete file?"</string>
-  <string name="screen_media_browser_empty_state_subtitle">"Images and videos uploaded to this room will be shown here."</string>
-  <string name="screen_media_browser_empty_state_title">"No media uploaded yet"</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Documents, audio files, and voice messages uploaded to this room will be shown here."</string>
+  <string name="screen_media_browser_files_empty_state_title">"No files uploaded yet"</string>
   <string name="screen_media_browser_list_loading_files">"Loading files…"</string>
   <string name="screen_media_browser_list_loading_media">"Loading media…"</string>
   <string name="screen_media_browser_list_mode_files">"Files"</string>
   <string name="screen_media_browser_list_mode_media">"Media"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Images and videos uploaded to this room will be shown here."</string>
+  <string name="screen_media_browser_media_empty_state_title">"No media uploaded yet"</string>
   <string name="screen_media_browser_title">"Media and files"</string>
   <string name="screen_media_details_file_format">"File format"</string>
   <string name="screen_media_details_filename">"File name"</string>

tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b7055ce0a8214e7c445c2d1b7d30ad5ffc63617c9f9f837661dfbd057198681
-size 26092
+oid sha256:d2d9ef7383d17436738abf01c450ad189ebffebcfbee12de253fdc92f6feda93
+size 28593

tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f07b50b154c426638c38897fca296f5d52fb0054ad459eadf8fbe344c9b0526
-size 25475
+oid sha256:bfe8f753f87d3b67ad3ffde246dba0438120bb2a28efe033cbfd2204664fee95
+size 27633