Merge pull request #83 from tom5079/Pupil-76

Pupil-76

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

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">
 
 				<TextView
 					android:id="@+id/galleryblock_id"
@@ -209,6 +210,16 @@
 					android:layout_height="1dp"
 					android:layout_weight="1"/>
 
+				<TextView
+					android:id="@+id/galleryblock_pagecount"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<View
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
 				<ImageView
 					android:id="@+id/galleryblock_favorite"
 					android:contentDescription="@string/app_name"

app/src/main/res/values/strings.xml

@@ -107,6 +107,7 @@
     <string name="galleryblock_series">Series: %1$s</string>
     <string name="galleryblock_type">Type: %1$s</string>
     <string name="galleryblock_language">Language: %1$s</string>
+    <string name="galleryblock_pagecount" translatable="false">%dP</string>
 
     <!-- READER -->