From ba8d57f2112f2f2fdca32c049b66f223c0beace9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 13 Dec 2024 18:14:19 +0100 Subject: [PATCH 1/3] Improve title and subtitle for empty states in the gallery. --- .../impl/gallery/MediaGalleryView.kt | 25 ++++++++++++++----- .../src/main/res/values-cs/translations.xml | 4 +-- .../src/main/res/values-de/translations.xml | 4 +-- .../src/main/res/values-et/translations.xml | 6 +++-- .../src/main/res/values-fr/translations.xml | 4 +-- .../src/main/res/values-hu/translations.xml | 4 +-- .../src/main/res/values-it/translations.xml | 4 +-- .../src/main/res/values-ru/translations.xml | 6 +++-- .../impl/src/main/res/values/localazy.xml | 6 +++-- 9 files changed, 41 insertions(+), 22 deletions(-) diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt index a178887fdd..a24560d9d0 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt +++ b/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() { +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), ) } } diff --git a/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml index 79f3b646ee..9fc10afbad 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml @@ -1,10 +1,10 @@ - "Obrázky a videa nahraná do této místnosti budou zobrazeny zde." - "Zatím nebyla nahrána žádná média" "Načítání souborů…" "Načítání médií…" "Soubory" "Média" + "Obrázky a videa nahraná do této místnosti budou zobrazeny zde." + "Zatím nebyla nahrána žádná média" "Média a soubory" diff --git a/libraries/mediaviewer/impl/src/main/res/values-de/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-de/translations.xml index 07438166f6..813d358ec0 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-de/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-de/translations.xml @@ -1,11 +1,11 @@ - "In diesen Chatroom hochgeladene Bilder und Videos werden hier angezeigt." - "Noch keine Medien hochgeladen" "Dateien werden geladen…" "Medien werden geladen…" "Dateien" "Medien" + "In diesen Chatroom hochgeladene Bilder und Videos werden hier angezeigt." + "Noch keine Medien hochgeladen" "Medien und Dateien" "Dateiformat" "Dateiname" diff --git a/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml index 396138c100..85285375e1 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml @@ -2,15 +2,17 @@ "Järgnevaga eemaldame selle faili jututoast ka tema liikmed enam ei pääse failile ligi." "Kas kustutame faili?" - "Antud jututuppa üleslaaditud pildid ja videod kuvatakse siin." - "Mitte keegi pole veel meediat üles laadinud" "Laadime faile…" "Laadime meediat…" "Failid" "Meedia" + "Antud jututuppa üleslaaditud pildid ja videod kuvatakse siin." + "Mitte keegi pole veel meediat üles laadinud" "Meedia ja failid" "Failivorming" "Failinimi" + "Järgnevaga eemaldame selle faili jututoast ja tema liikmed enam ei pääse failile ligi." + "Kas kustutame faili?" "Üleslaadija" "Üleslaaditud" diff --git a/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml index bd961fb941..d12293ad43 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml @@ -2,12 +2,12 @@ "Ce fichier sera supprimé du salon et les membres n’y auront plus accès." "Supprimer le fichier ?" - "Les images et vidéos envoyées dans ce salon seront affichées ici." - "Aucun média n’a encore été envoyé dans ce salon" "Chargement des fichiers…" "Chargement des médias…" "Fichiers" "Média" + "Les images et vidéos envoyées dans ce salon seront affichées ici." + "Aucun média n’a encore été envoyé dans ce salon" "Médias et fichiers" "Format du fichier" "Nom du fichier" diff --git a/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml index 1fcc528dc5..8336caec01 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml @@ -2,12 +2,12 @@ "Ez a fájl el lesz távolítva a szobából, és a tagok nem férhetnek hozzá." "Törli a fájlt?" - "Az ebbe a szobába feltöltött képek és videók itt jelennek meg." - "Még nincs feltöltött média" "Fájlok betöltése…" "Média betöltése…" "Fájlok" "Média" + "Az ebbe a szobába feltöltött képek és videók itt jelennek meg." + "Még nincs feltöltött média" "Média és fájlok" "Fájlformátum" "Fájlnév" diff --git a/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml index 45d160f3d2..237209e0d7 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml @@ -1,8 +1,8 @@ - "Le immagini e i video caricati in questa stanza verranno mostrati qui." - "Nessun file multimediale ancora caricato" "File" "Contenuti multimediali" + "Le immagini e i video caricati in questa stanza verranno mostrati qui." + "Nessun file multimediale ancora caricato" "File e contenuti multimediali" diff --git a/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml index 713b748617..cc0f2e573f 100644 --- a/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml +++ b/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml @@ -2,15 +2,17 @@ "Этот файл будет удален из комнаты и участники не будут иметь к нему доступ." "Удалить файл?" - "Здесь будут показаны изображения и видео, загруженные в данную комнату." - "Пока что нет загруженных медиафайлов" "Загрузка файлов…" "Загрузка медиа…" "Файлы" "Медиа" + "Здесь будут показаны изображения и видео, загруженные в данную комнату." + "Пока что нет загруженных медиафайлов" "Медиа и файлы" "Формат файла" "Имя файла" + "Этот файл будет удален из комнаты и у участников не будет к нему доступа." + "Удалить файл?" "Загружено" "Загружено на" diff --git a/libraries/mediaviewer/impl/src/main/res/values/localazy.xml b/libraries/mediaviewer/impl/src/main/res/values/localazy.xml index b35a4819f1..6072c56db8 100644 --- a/libraries/mediaviewer/impl/src/main/res/values/localazy.xml +++ b/libraries/mediaviewer/impl/src/main/res/values/localazy.xml @@ -2,12 +2,14 @@ "This file will be removed from the room and members won’t have access to it." "Delete file?" - "Images and videos uploaded to this room will be shown here." - "No media uploaded yet" + "Documents, audio files, and voice messages uploaded to this room will be shown here." + "No files uploaded yet" "Loading files…" "Loading media…" "Files" "Media" + "Images and videos uploaded to this room will be shown here." + "No media uploaded yet" "Media and files" "File format" "File name" From 8d04e6e0ac9d0fee43c3791a05ffa8209ef2f73c Mon Sep 17 00:00:00 2001 From: ElementBot Date: Fri, 13 Dec 2024 17:43:00 +0000 Subject: [PATCH 2/3] Update screenshots --- ...ies.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png | 4 ++-- ...s.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png index 18144ddccb..38be3c256b 100644 --- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png +++ b/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 diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png index aca9e44958..b9a56226c4 100644 --- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png +++ b/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 From 93e86b0fe1328b45a2ea013660db593f61f4b655 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 13 Dec 2024 18:32:31 +0100 Subject: [PATCH 3/3] Private fun --- .../libraries/mediaviewer/impl/gallery/MediaGalleryView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt index a24560d9d0..eaf6e534ac 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt @@ -403,7 +403,7 @@ private fun ErrorContent(error: Throwable) { } @Composable -fun EmptyContent( +private fun EmptyContent( titleRes: Int, subtitleRes: Int, icon: ImageVector,