From 63744d5fc4851437eec847ae6d1c4989a361b75e Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 5 Jul 2020 22:22:59 -0400 Subject: [PATCH] Bugfixes for the combined author/atrist field --- .../kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt | 12 +++++++++++- .../main/res/layout-land/manga_all_in_one_header.xml | 1 + app/src/main/res/layout/manga_all_in_one_header.xml | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt index d8246453e..68a6f08de 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt @@ -188,7 +188,17 @@ class MangaAllInOneHolder( } // Update author/artist TextView. - val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct() + + val authors: MutableSet = mutableSetOf() + val author = manga.author + val artist = manga.artist + val splitRegex = "([,\\-])".toRegex() + if (author != null) { + authors += author.split(splitRegex).map { it.trim() }.filter { !it.isBlank() }.toMutableSet() + } + if (artist != null) { + authors += artist.split(splitRegex).map { it.trim() }.filter { !it.isBlank() }.toMutableSet() + } binding.mangaAuthor.text = if (authors.isEmpty()) { itemView.context.getString(R.string.unknown) } else { diff --git a/app/src/main/res/layout-land/manga_all_in_one_header.xml b/app/src/main/res/layout-land/manga_all_in_one_header.xml index b31bacbb5..0dfc9df0f 100644 --- a/app/src/main/res/layout-land/manga_all_in_one_header.xml +++ b/app/src/main/res/layout-land/manga_all_in_one_header.xml @@ -75,6 +75,7 @@ style="@style/TextAppearance.Regular.Body1.Secondary" android:layout_width="0dp" android:layout_height="wrap_content" + android:maxLines="2" android:textIsSelectable="false" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/manga_full_title" diff --git a/app/src/main/res/layout/manga_all_in_one_header.xml b/app/src/main/res/layout/manga_all_in_one_header.xml index fa0d9246b..039df69b5 100644 --- a/app/src/main/res/layout/manga_all_in_one_header.xml +++ b/app/src/main/res/layout/manga_all_in_one_header.xml @@ -75,6 +75,7 @@ style="@style/TextAppearance.Regular.Body1.Secondary" android:layout_width="0dp" android:layout_height="wrap_content" + android:maxLines="2" android:textIsSelectable="false" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/manga_full_title"