From 49924957d2c9deb15dcc805234983d1357b15cc6 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 3 Dec 2022 19:22:36 -0500 Subject: [PATCH] Improve migration error display --- .../browse/MigrationListScreen.kt | 6 ++-- .../browse/components/MigrationItemResult.kt | 33 ++++++++++++++----- i18n/src/main/res/values-fr/strings_sy.xml | 1 + i18n/src/main/res/values-in/strings_sy.xml | 1 + .../src/main/res/values-pt-rBR/strings_sy.xml | 1 + i18n/src/main/res/values-ru/strings_sy.xml | 1 + .../src/main/res/values-zh-rCN/strings_sy.xml | 1 + i18n/src/main/res/values/strings_sy.xml | 1 + 8 files changed, 35 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt index fa6b08a6c..12599d3f3 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt @@ -99,7 +99,8 @@ fun MigrationListScreen( MigrationItem( modifier = Modifier .padding(top = 8.dp) - .weight(1f), + .weight(1f) + .align(Alignment.Top), manga = migrationItem.manga, sourcesString = migrationItem.sourcesString, chapterInfo = migrationItem.chapterInfo, @@ -115,7 +116,8 @@ fun MigrationListScreen( MigrationItemResult( modifier = Modifier .padding(top = 8.dp) - .weight(1f), + .weight(1f) + .align(Alignment.Top), migrationItem = migrationItem, result = result, getManga = getManga, diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt index 668d71a35..3d7e902c0 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt @@ -2,11 +2,15 @@ package eu.kanade.presentation.browse.components import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.produceState @@ -14,6 +18,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import eu.kanade.domain.manga.model.Manga import eu.kanade.presentation.components.MangaCover @@ -43,14 +48,26 @@ fun MigrationItemResult( ) { CircularProgressIndicator() } - MigratingManga.SearchResult.NotFound -> Image( - painter = rememberResourceBitmapPainter(id = R.drawable.cover_error), - contentDescription = null, - modifier = Modifier - .matchParentSize() - .clip(RoundedCornerShape(4.dp)), - contentScale = ContentScale.Crop, - ) + MigratingManga.SearchResult.NotFound -> Column( + Modifier.widthIn(max = 150.dp) + .fillMaxWidth() + .padding(4.dp), + ) { + Image( + painter = rememberResourceBitmapPainter(id = R.drawable.cover_error), + contentDescription = null, + modifier = Modifier + .fillMaxWidth() + .aspectRatio(MangaCover.Book.ratio) + .clip(RoundedCornerShape(4.dp)), + contentScale = ContentScale.Crop, + ) + Text( + text = stringResource(R.string.no_alternatives_found), + modifier = Modifier.padding(top = 4.dp, bottom = 1.dp, start = 8.dp), + style = MaterialTheme.typography.titleSmall, + ) + } is MigratingManga.SearchResult.Result -> { val item by produceState?>( initialValue = null, diff --git a/i18n/src/main/res/values-fr/strings_sy.xml b/i18n/src/main/res/values-fr/strings_sy.xml index 326944ad6..eaa446401 100644 --- a/i18n/src/main/res/values-fr/strings_sy.xml +++ b/i18n/src/main/res/values-fr/strings_sy.xml @@ -280,6 +280,7 @@ Faire correspondre les sources épinglées Faire correspondre les sources activées Aucun chapitre trouvé, ce manga ne peut pas être utilisé pour la migration + Aucune alternative trouvée Arrêter la migration? Migrer %1$d%2$s manga? diff --git a/i18n/src/main/res/values-in/strings_sy.xml b/i18n/src/main/res/values-in/strings_sy.xml index 8b7077a40..d0d019d01 100644 --- a/i18n/src/main/res/values-in/strings_sy.xml +++ b/i18n/src/main/res/values-in/strings_sy.xml @@ -385,6 +385,7 @@ Gunakan sumber yang disematkan Gunakan sumber yang diaktifkan Bab tak ditemukan, manga ini tak bisa dipindahkan ke sini + Tidak Ditemukan Hentikan migrasi? Pindahkan %1$d%2$s manga? diff --git a/i18n/src/main/res/values-pt-rBR/strings_sy.xml b/i18n/src/main/res/values-pt-rBR/strings_sy.xml index e2caebb6a..48ebd6163 100644 --- a/i18n/src/main/res/values-pt-rBR/strings_sy.xml +++ b/i18n/src/main/res/values-pt-rBR/strings_sy.xml @@ -355,6 +355,7 @@ Combinar com fontes fixadas Combinar com fontes ativadas Sem capítulos encontrados, este mangá não pode ser usado para migração + Sem alternativas encontradas Parar migração? Migrar %1$d%2$s mangá? diff --git a/i18n/src/main/res/values-ru/strings_sy.xml b/i18n/src/main/res/values-ru/strings_sy.xml index 3af563ef7..dbbcc30d2 100644 --- a/i18n/src/main/res/values-ru/strings_sy.xml +++ b/i18n/src/main/res/values-ru/strings_sy.xml @@ -419,6 +419,7 @@ Соответствие закреплённых источников Соответствие включённых источников Глав не найдено. Эта запись не может быть использована для переноса + Альтернатив не найдено Остановить перенос? Перенести %1$d%2$s запись? diff --git a/i18n/src/main/res/values-zh-rCN/strings_sy.xml b/i18n/src/main/res/values-zh-rCN/strings_sy.xml index 1f1f40368..175c7a3ae 100644 --- a/i18n/src/main/res/values-zh-rCN/strings_sy.xml +++ b/i18n/src/main/res/values-zh-rCN/strings_sy.xml @@ -400,6 +400,7 @@ 匹配置顶的来源 匹配启用的来源 未找到章节,该漫画无法用于迁移 + 未找到替代方案 停止迁移? 迁移 %1$d%2$s 漫画? diff --git a/i18n/src/main/res/values/strings_sy.xml b/i18n/src/main/res/values/strings_sy.xml index 42cd1bd57..c27ee04ad 100644 --- a/i18n/src/main/res/values/strings_sy.xml +++ b/i18n/src/main/res/values/strings_sy.xml @@ -421,6 +421,7 @@ Match pinned sources Match enabled sources No chapters found, this entry cannot be used for migration + No Alternatives Found Stop migrating? Migrate %1$d%2$s entry?