From 51a9bf2570f8908f68ca57a78d8ce089d12ad116 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Sat, 20 Jun 2020 14:30:20 +0900 Subject: [PATCH] Pupil-76 Add Page count --- .../quaver/pupil/adapters/GalleryBlockAdapter.kt | 11 +++++++++++ app/src/main/res/layout/item_galleryblock.xml | 13 ++++++++++++- app/src/main/res/values/strings.xml | 1 + 3 files changed, 24 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 618bbe72..1cdf9301 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -42,7 +42,9 @@ import kotlinx.android.synthetic.main.item_galleryblock.view.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import xyz.quaver.hitomi.GalleryBlock +import xyz.quaver.hitomi.getReader import xyz.quaver.pupil.BuildConfig import xyz.quaver.pupil.Pupil import xyz.quaver.pupil.R @@ -237,6 +239,15 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri } galleryblock_id.text = galleryBlock.id.toString() + galleryblock_pagecount.text = "-" + CoroutineScope(Dispatchers.IO).launch { + val pageCount = kotlin.runCatching { + getReader(galleryBlock.id).galleryInfo.files.size + }.getOrNull() ?: return@launch + withContext(Dispatchers.Main) { + galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount) + } + } if (!::favorites.isInitialized) favorites = (context.applicationContext as Pupil).favorites diff --git a/app/src/main/res/layout/item_galleryblock.xml b/app/src/main/res/layout/item_galleryblock.xml index bef8a183..5ba0e685 100644 --- a/app/src/main/res/layout/item_galleryblock.xml +++ b/app/src/main/res/layout/item_galleryblock.xml @@ -197,7 +197,8 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" - android:orientation="horizontal"> + android:orientation="horizontal" + android:gravity="center_vertical"> + + + + Series: %1$s Type: %1$s Language: %1$s + %dP