Skip to content

Commit ba8d57f

Browse files
committed
Improve title and subtitle for empty states in the gallery.
1 parent 2a3fd99 commit ba8d57f

File tree

9 files changed

+41
-22
lines changed

9 files changed

+41
-22
lines changed

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import androidx.compose.runtime.getValue
3232
import androidx.compose.runtime.rememberUpdatedState
3333
import androidx.compose.ui.Alignment
3434
import androidx.compose.ui.Modifier
35+
import androidx.compose.ui.graphics.vector.ImageVector
3536
import androidx.compose.ui.platform.LocalConfiguration
3637
import androidx.compose.ui.res.stringResource
3738
import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -213,7 +214,11 @@ private fun MediaGalleryImages(
213214
onItemClick: (MediaItem.Event) -> Unit,
214215
) {
215216
if (imagesAndVideos.isEmpty()) {
216-
EmptyContent()
217+
EmptyContent(
218+
titleRes = R.string.screen_media_browser_media_empty_state_title,
219+
subtitleRes = R.string.screen_media_browser_media_empty_state_subtitle,
220+
icon = CompoundIcons.Image(),
221+
)
217222
} else {
218223
MediaGalleryImageGrid(
219224
imagesAndVideos = imagesAndVideos,
@@ -230,7 +235,11 @@ private fun MediaGalleryFiles(
230235
onItemClick: (MediaItem.Event) -> Unit,
231236
) {
232237
if (files.isEmpty()) {
233-
EmptyContent()
238+
EmptyContent(
239+
titleRes = R.string.screen_media_browser_files_empty_state_title,
240+
subtitleRes = R.string.screen_media_browser_files_empty_state_subtitle,
241+
icon = CompoundIcons.Files(),
242+
)
234243
} else {
235244
MediaGalleryFilesList(
236245
files = files,
@@ -394,7 +403,11 @@ private fun ErrorContent(error: Throwable) {
394403
}
395404

396405
@Composable
397-
private fun EmptyContent() {
406+
fun EmptyContent(
407+
titleRes: Int,
408+
subtitleRes: Int,
409+
icon: ImageVector,
410+
) {
398411
Box(
399412
modifier = Modifier.fillMaxSize(),
400413
) {
@@ -403,9 +416,9 @@ private fun EmptyContent() {
403416
.fillMaxWidth()
404417
.padding(top = 44.dp)
405418
.padding(24.dp),
406-
title = stringResource(R.string.screen_media_browser_empty_state_title),
407-
iconStyle = BigIcon.Style.Default(CompoundIcons.Image()),
408-
subtitle = stringResource(R.string.screen_media_browser_empty_state_subtitle),
419+
title = stringResource(titleRes),
420+
iconStyle = BigIcon.Style.Default(icon),
421+
subtitle = stringResource(subtitleRes),
409422
)
410423
}
411424
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3-
<string name="screen_media_browser_empty_state_subtitle">"Obrázky a videa nahraná do této místnosti budou zobrazeny zde."</string>
4-
<string name="screen_media_browser_empty_state_title">"Zatím nebyla nahrána žádná média"</string>
53
<string name="screen_media_browser_list_loading_files">"Načítání souborů…"</string>
64
<string name="screen_media_browser_list_loading_media">"Načítání médií…"</string>
75
<string name="screen_media_browser_list_mode_files">"Soubory"</string>
86
<string name="screen_media_browser_list_mode_media">"Média"</string>
7+
<string name="screen_media_browser_media_empty_state_subtitle">"Obrázky a videa nahraná do této místnosti budou zobrazeny zde."</string>
8+
<string name="screen_media_browser_media_empty_state_title">"Zatím nebyla nahrána žádná média"</string>
99
<string name="screen_media_browser_title">"Média a soubory"</string>
1010
</resources>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3-
<string name="screen_media_browser_empty_state_subtitle">"In diesen Chatroom hochgeladene Bilder und Videos werden hier angezeigt."</string>
4-
<string name="screen_media_browser_empty_state_title">"Noch keine Medien hochgeladen"</string>
53
<string name="screen_media_browser_list_loading_files">"Dateien werden geladen…"</string>
64
<string name="screen_media_browser_list_loading_media">"Medien werden geladen…"</string>
75
<string name="screen_media_browser_list_mode_files">"Dateien"</string>
86
<string name="screen_media_browser_list_mode_media">"Medien"</string>
7+
<string name="screen_media_browser_media_empty_state_subtitle">"In diesen Chatroom hochgeladene Bilder und Videos werden hier angezeigt."</string>
8+
<string name="screen_media_browser_media_empty_state_title">"Noch keine Medien hochgeladen"</string>
99
<string name="screen_media_browser_title">"Medien und Dateien"</string>
1010
<string name="screen_media_details_file_format">"Dateiformat"</string>
1111
<string name="screen_media_details_filename">"Dateiname"</string>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<string name="screen_media_browser_delete_confirmation_subtitle">"Järgnevaga eemaldame selle faili jututoast ka tema liikmed enam ei pääse failile ligi."</string>
44
<string name="screen_media_browser_delete_confirmation_title">"Kas kustutame faili?"</string>
5-
<string name="screen_media_browser_empty_state_subtitle">"Antud jututuppa üleslaaditud pildid ja videod kuvatakse siin."</string>
6-
<string name="screen_media_browser_empty_state_title">"Mitte keegi pole veel meediat üles laadinud"</string>
75
<string name="screen_media_browser_list_loading_files">"Laadime faile…"</string>
86
<string name="screen_media_browser_list_loading_media">"Laadime meediat…"</string>
97
<string name="screen_media_browser_list_mode_files">"Failid"</string>
108
<string name="screen_media_browser_list_mode_media">"Meedia"</string>
9+
<string name="screen_media_browser_media_empty_state_subtitle">"Antud jututuppa üleslaaditud pildid ja videod kuvatakse siin."</string>
10+
<string name="screen_media_browser_media_empty_state_title">"Mitte keegi pole veel meediat üles laadinud"</string>
1111
<string name="screen_media_browser_title">"Meedia ja failid"</string>
1212
<string name="screen_media_details_file_format">"Failivorming"</string>
1313
<string name="screen_media_details_filename">"Failinimi"</string>
14+
<string name="screen_media_details_redact_confirmation_message">"Järgnevaga eemaldame selle faili jututoast ja tema liikmed enam ei pääse failile ligi."</string>
15+
<string name="screen_media_details_redact_confirmation_title">"Kas kustutame faili?"</string>
1416
<string name="screen_media_details_uploaded_by">"Üleslaadija"</string>
1517
<string name="screen_media_details_uploaded_on">"Üleslaaditud"</string>
1618
</resources>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<string name="screen_media_browser_delete_confirmation_subtitle">"Ce fichier sera supprimé du salon et les membres n’y auront plus accès."</string>
44
<string name="screen_media_browser_delete_confirmation_title">"Supprimer le fichier ?"</string>
5-
<string name="screen_media_browser_empty_state_subtitle">"Les images et vidéos envoyées dans ce salon seront affichées ici."</string>
6-
<string name="screen_media_browser_empty_state_title">"Aucun média n’a encore été envoyé dans ce salon"</string>
75
<string name="screen_media_browser_list_loading_files">"Chargement des fichiers…"</string>
86
<string name="screen_media_browser_list_loading_media">"Chargement des médias…"</string>
97
<string name="screen_media_browser_list_mode_files">"Fichiers"</string>
108
<string name="screen_media_browser_list_mode_media">"Média"</string>
9+
<string name="screen_media_browser_media_empty_state_subtitle">"Les images et vidéos envoyées dans ce salon seront affichées ici."</string>
10+
<string name="screen_media_browser_media_empty_state_title">"Aucun média n’a encore été envoyé dans ce salon"</string>
1111
<string name="screen_media_browser_title">"Médias et fichiers"</string>
1212
<string name="screen_media_details_file_format">"Format du fichier"</string>
1313
<string name="screen_media_details_filename">"Nom du fichier"</string>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<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>
44
<string name="screen_media_browser_delete_confirmation_title">"Törli a fájlt?"</string>
5-
<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>
6-
<string name="screen_media_browser_empty_state_title">"Még nincs feltöltött média"</string>
75
<string name="screen_media_browser_list_loading_files">"Fájlok betöltése…"</string>
86
<string name="screen_media_browser_list_loading_media">"Média betöltése…"</string>
97
<string name="screen_media_browser_list_mode_files">"Fájlok"</string>
108
<string name="screen_media_browser_list_mode_media">"Média"</string>
9+
<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>
10+
<string name="screen_media_browser_media_empty_state_title">"Még nincs feltöltött média"</string>
1111
<string name="screen_media_browser_title">"Média és fájlok"</string>
1212
<string name="screen_media_details_file_format">"Fájlformátum"</string>
1313
<string name="screen_media_details_filename">"Fájlnév"</string>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3-
<string name="screen_media_browser_empty_state_subtitle">"Le immagini e i video caricati in questa stanza verranno mostrati qui."</string>
4-
<string name="screen_media_browser_empty_state_title">"Nessun file multimediale ancora caricato"</string>
53
<string name="screen_media_browser_list_mode_files">"File"</string>
64
<string name="screen_media_browser_list_mode_media">"Contenuti multimediali"</string>
5+
<string name="screen_media_browser_media_empty_state_subtitle">"Le immagini e i video caricati in questa stanza verranno mostrati qui."</string>
6+
<string name="screen_media_browser_media_empty_state_title">"Nessun file multimediale ancora caricato"</string>
77
<string name="screen_media_browser_title">"File e contenuti multimediali"</string>
88
</resources>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<string name="screen_media_browser_delete_confirmation_subtitle">"Этот файл будет удален из комнаты и участники не будут иметь к нему доступ."</string>
44
<string name="screen_media_browser_delete_confirmation_title">"Удалить файл?"</string>
5-
<string name="screen_media_browser_empty_state_subtitle">"Здесь будут показаны изображения и видео, загруженные в данную комнату."</string>
6-
<string name="screen_media_browser_empty_state_title">"Пока что нет загруженных медиафайлов"</string>
75
<string name="screen_media_browser_list_loading_files">"Загрузка файлов…"</string>
86
<string name="screen_media_browser_list_loading_media">"Загрузка медиа…"</string>
97
<string name="screen_media_browser_list_mode_files">"Файлы"</string>
108
<string name="screen_media_browser_list_mode_media">"Медиа"</string>
9+
<string name="screen_media_browser_media_empty_state_subtitle">"Здесь будут показаны изображения и видео, загруженные в данную комнату."</string>
10+
<string name="screen_media_browser_media_empty_state_title">"Пока что нет загруженных медиафайлов"</string>
1111
<string name="screen_media_browser_title">"Медиа и файлы"</string>
1212
<string name="screen_media_details_file_format">"Формат файла"</string>
1313
<string name="screen_media_details_filename">"Имя файла"</string>
14+
<string name="screen_media_details_redact_confirmation_message">"Этот файл будет удален из комнаты и у участников не будет к нему доступа."</string>
15+
<string name="screen_media_details_redact_confirmation_title">"Удалить файл?"</string>
1416
<string name="screen_media_details_uploaded_by">"Загружено"</string>
1517
<string name="screen_media_details_uploaded_on">"Загружено на"</string>
1618
</resources>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<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>
44
<string name="screen_media_browser_delete_confirmation_title">"Delete file?"</string>
5-
<string name="screen_media_browser_empty_state_subtitle">"Images and videos uploaded to this room will be shown here."</string>
6-
<string name="screen_media_browser_empty_state_title">"No media uploaded yet"</string>
5+
<string name="screen_media_browser_files_empty_state_subtitle">"Documents, audio files, and voice messages uploaded to this room will be shown here."</string>
6+
<string name="screen_media_browser_files_empty_state_title">"No files uploaded yet"</string>
77
<string name="screen_media_browser_list_loading_files">"Loading files…"</string>
88
<string name="screen_media_browser_list_loading_media">"Loading media…"</string>
99
<string name="screen_media_browser_list_mode_files">"Files"</string>
1010
<string name="screen_media_browser_list_mode_media">"Media"</string>
11+
<string name="screen_media_browser_media_empty_state_subtitle">"Images and videos uploaded to this room will be shown here."</string>
12+
<string name="screen_media_browser_media_empty_state_title">"No media uploaded yet"</string>
1113
<string name="screen_media_browser_title">"Media and files"</string>
1214
<string name="screen_media_details_file_format">"File format"</string>
1315
<string name="screen_media_details_filename">"File name"</string>

0 commit comments

Comments
 (0)