From c5561801e18f2740b2415afc9fe52db1eeda2f19 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Thu, 1 Oct 2020 21:32:42 +0900 Subject: [PATCH] Add group name to GalleryBlock --- .../pupil/adapters/GalleryBlockAdapter.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index f7035414..b4e7cd52 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -36,6 +36,7 @@ import com.daimajia.swipe.interfaces.SwipeAdapterInterface import com.github.piasy.biv.loader.ImageLoader import kotlinx.android.synthetic.main.item_galleryblock.view.* import kotlinx.coroutines.* +import xyz.quaver.hitomi.getGallery import xyz.quaver.hitomi.getReader import xyz.quaver.io.util.getChild import xyz.quaver.pupil.R @@ -171,11 +172,28 @@ class GalleryBlockAdapter(private val galleries: List) : RecyclerSwipeAdapt galleryblock_title.text = galleryBlock.title with(galleryblock_artist) { - text = artists.joinToString(", ") { it.wordCapitalize() } + text = artists.joinToString { it.wordCapitalize() } visibility = when { artists.isNotEmpty() -> View.VISIBLE else -> View.GONE } + + CoroutineScope(Dispatchers.IO).launch { + val gallery = runCatching { + getGallery(galleryID) + }.getOrNull() + + if (gallery?.groups?.isNotEmpty() != true) + return@launch + + launch(Dispatchers.Main) { + text = context.getString( + R.string.galleryblock_artist_with_group, + artists.joinToString { it.wordCapitalize() }, + gallery.groups.joinToString { it.wordCapitalize() } + ) + } + } } with(galleryblock_series) { text =