Fixed typo & Built apk

# Conflicts:
#	app/build.gradle

.idea/copyright/profiles_settings.xml

@@ -1,7 +1,7 @@
 <component name="CopyrightManager">
   <settings>
     <module2copyright>
-      <element module="Pupil" copyright="GPL" />
+      <element module="Project Files" copyright="GPL" />
     </module2copyright>
   </settings>
 </component>

app/build.gradle

@@ -5,7 +5,7 @@ apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlinx-serialization"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"
 
-if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
+if (file("google-services.json").exists()) {
     logger.lifecycle("Firebase Enabled")
     apply plugin: "com.google.gms.google-services"
     apply plugin: "com.google.firebase.crashlytics"
@@ -37,8 +37,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 63
-        versionName "5.1.6-hotfix7"
+        versionCode 64
+        versionName "5.1.7-beta1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -77,27 +77,27 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0-M1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
     
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.activity:activity-ktx:1.2.0-beta01"
     implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.2"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.0.1"
     implementation "androidx.work:work-runtime-ktx:2.4.0"
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.3.0-alpha03"
+    implementation "com.google.android.material:material:1.3.0-alpha04"
 
-    implementation "com.google.firebase:firebase-core:17.5.1"
-    implementation "com.google.firebase:firebase-analytics:17.6.0"
-    implementation "com.google.firebase:firebase-crashlytics:17.2.2"
-    implementation "com.google.firebase:firebase-perf:19.0.9"
+    implementation "com.google.firebase:firebase-core:18.0.0"
+    implementation "com.google.firebase:firebase-analytics:18.0.0"
+    implementation "com.google.firebase:firebase-crashlytics:17.3.0"
+    implementation "com.google.firebase:firebase-perf:19.0.10"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
     implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"
@@ -127,7 +127,7 @@ dependencies {
     implementation "xyz.quaver:documentfilex:0.4-alpha02"
     implementation "xyz.quaver:floatingsearchview:1.0.7"
 
-    testImplementation "junit:junit:4.13"
+    testImplementation "junit:junit:4.13.1"
     androidTestImplementation "androidx.test.ext:junit:1.1.2"
     androidTestImplementation "androidx.test:rules:1.3.0"
     androidTestImplementation "androidx.test:runner:1.3.0"

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 63,
-      "versionName": "5.1.6-hotfix7",
+      "versionCode": 64,
+      "versionName": "5.1.7-beta1",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/AndroidManifest.xml

@@ -6,10 +6,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="21"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="21" />
+    <uses-permission-sdk-23 android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -22,14 +22,11 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.util.Log
-import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.Toast
-import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
@@ -39,6 +36,7 @@ import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.github.piasy.biv.loader.ImageLoader
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
+import kotlinx.android.synthetic.main.view_progress_card.view.*
 import kotlinx.coroutines.*
 import xyz.quaver.hitomi.getGallery
 import xyz.quaver.hitomi.getReader
@@ -47,6 +45,7 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
@@ -55,12 +54,6 @@ import java.io.File
 
 class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
-    enum class ViewType {
-        NEXT,
-        GALLERY,
-        PREV
-    }
-
     var updateAll = true
     var thin: Boolean = Preferences["thin"]
 
@@ -76,62 +69,34 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
             }
         }
 
-        private fun updateProgress(context: Context) {
-            val cache = Cache.getInstance(context, galleryID)
+        private fun updateProgress(context: Context) = CoroutineScope(Dispatchers.Main).launch {
+            with(view.galleryblock_card) {
+                val imageList = Cache.getInstance(context, galleryID).metadata.imageList
 
-            CoroutineScope(Dispatchers.Main).launch {
-                if (cache.metadata.reader == null) {
-                    view.galleryblock_progressbar_layout.visibility = View.GONE
-                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                    return@launch
+                if (imageList == null) {
+                    max = 0
+                    return@with
                 }
 
-                with(view.galleryblock_progressbar) {
-                    val imageList = cache.metadata.imageList!!
+                progress = imageList.count { it != null }
+                max = imageList.size
 
-                    progress = imageList.count { it != null }
-                    max = imageList.size
-
-                    with(view.galleryblock_progressbar_layout) {
-                        if (visibility == View.GONE)
-                            visibility = View.VISIBLE
-                    }
-
-                    view.galleryblock_id.setOnClickListener {
-                        (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-                            ClipData.newPlainText("gallery_id", galleryID.toString())
-                        )
-                        Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
-                    }
-
-                    if (!imageList.contains(null)) {
-                        val downloadManager = DownloadManager.getInstance(context)
-
-                        if (completeFlag.get(galleryID, false)) {
-                            with(view.galleryblock_progress_complete) {
-                                setImageResource(
-                                    if (downloadManager.getDownloadFolder(galleryID) != null)
-                                        R.drawable.ic_progressbar
-                                    else R.drawable.ic_progressbar_cache
-                                )
-                                visibility = View.VISIBLE
-                            }
-                        } else {
-                            with(view.galleryblock_progress_complete) {
-                                setImageDrawable(AnimatedVectorDrawableCompat.create(context,
-                                    if (downloadManager.getDownloadFolder(galleryID) != null)
-                                        R.drawable.ic_progressbar_complete
-                                    else R.drawable.ic_progressbar_complete_cache
-                                ).apply {
-                                    this?.start()
-                                })
-                                visibility = View.VISIBLE
-                            }
-                            completeFlag.put(galleryID, true)
-                        }
-                    } else
-                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
+                view.galleryblock_id.setOnClickListener {
+                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
+                        ClipData.newPlainText("gallery_id", galleryID.toString())
+                    )
+                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
                 }
+
+                type = if (!imageList.contains(null)) {
+                    val downloadManager = DownloadManager.getInstance(context)
+
+                    if (downloadManager.getDownloadFolder(galleryID) == null)
+                        ProgressCard.Type.CACHE
+                    else
+                        ProgressCard.Type.DOWNLOAD
+                } else
+                    ProgressCard.Type.LOADING
             }
         }
 
@@ -311,80 +276,38 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
             }
         }
     }
-    class NextViewHolder(view: LinearLayout) : RecyclerView.ViewHolder(view)
-    class PrevViewHolder(view: LinearLayout) : RecyclerView.ViewHolder(view)
-
-    class ViewHolderFactory {
-        companion object {
-            fun getLayoutID(type: Int): Int {
-                return when(ViewType.values()[type]) {
-                    ViewType.NEXT -> R.layout.item_next
-                    ViewType.PREV -> R.layout.item_prev
-                    ViewType.GALLERY -> R.layout.item_galleryblock
-                }
-            }
-        }
-    }
-
-    val completeFlag = SparseBooleanArray()
 
     val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
     var onDownloadClickedHandler: ((Int) -> Unit)? = null
     var onDeleteClickedHandler: ((Int) -> Unit)? = null
 
-    var showNext = false
-    var showPrev = false
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-
-        fun getViewHolder(type: Int, view: View): RecyclerView.ViewHolder {
-            return when(ViewType.values()[type]) {
-                ViewType.NEXT -> NextViewHolder(view as LinearLayout)
-                ViewType.PREV -> PrevViewHolder(view as LinearLayout)
-                ViewType.GALLERY -> GalleryViewHolder(view as CardView)
-            }
-        }
-
-        return getViewHolder(
-            viewType,
-            LayoutInflater.from(parent.context).inflate(
-                ViewHolderFactory.getLayoutID(viewType),
-                parent,
-                false
-            )
+        return GalleryViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.item_galleryblock, parent, false)
         )
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is GalleryViewHolder) {
-            val galleryID = galleries[position-(if (showPrev) 1 else 0)]
+            val galleryID = galleries[position]
 
             holder.bind(galleryID)
 
-            with(holder.view.galleryblock_primary) {
-                setOnClickListener {
-                    holder.view.performClick()
-                }
-                setOnLongClickListener {
-                    holder.view.performLongClick()
-                }
-            }
-
-            holder.view.galleryblock_download.setOnClickListener {
+            holder.view.galleryblock_card.download.setOnClickListener {
                 onDownloadClickedHandler?.invoke(position)
             }
 
-            holder.view.galleryblock_delete.setOnClickListener {
+            holder.view.galleryblock_card.delete.setOnClickListener {
                 onDeleteClickedHandler?.invoke(position)
             }
 
             mItemManger.bindView(holder.view, position)
 
-            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
+            holder.view.galleryblock_card.swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
                 override fun onStartOpen(layout: SwipeLayout?) {
                     mItemManger.closeAllExcept(layout)
 
-                    holder.view.galleryblock_download.text =
+                    holder.view.galleryblock_card.download.text =
                         if (DownloadManager.getInstance(holder.view.context).isDownloading(galleryID))
                             holder.view.context.getString(android.R.string.cancel)
                         else
@@ -400,18 +323,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
         }
     }
 
-    override fun getItemCount() =
-        galleries.size +
-        (if (showNext) 1 else 0) +
-        (if (showPrev) 1 else 0)
+    override fun getItemCount() = galleries.size
 
-    override fun getItemViewType(position: Int): Int {
-        return when {
-            showPrev && position == 0 -> ViewType.PREV
-            showNext && position == galleries.size+(if (showPrev) 1 else 0) -> ViewType.NEXT
-            else -> ViewType.GALLERY
-        }.ordinal
-    }
-
-    override fun getSwipeLayoutResourceId(position: Int) = R.id.galleryblock_swipe_layout
+    override fun getSwipeLayoutResourceId(position: Int) = R.id.swipe_layout
 }

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -45,7 +45,6 @@ import xyz.quaver.pupil.util.ellipsize
 import xyz.quaver.pupil.util.normalizeID
 import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
-import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
 import kotlin.math.log10
@@ -203,6 +202,8 @@ class DownloadService : Service() {
     private val callback = object: Callback {
 
         override fun onFailure(call: Call, e: IOException) {
+            e.printStackTrace()
+
             if (e.message?.contains("cancel", true) == false) {
                 val galleryID = (call.request().tag() as Tag).galleryID
 
@@ -235,6 +236,7 @@ class DownloadService : Service() {
                             startId?.let { stopSelf(it) }
                         }
                     }.onFailure {
+                        it.printStackTrace()
                         cancel(galleryID)
                         download(galleryID)
                     }

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -26,17 +26,16 @@ import android.text.InputType
 import android.text.util.Linkify
 import android.view.KeyEvent
 import android.view.MenuItem
-import android.view.MotionEvent
 import android.view.View
+import android.view.animation.DecelerateInterpolator
 import android.widget.EditText
-import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.cardview.widget.CardView
 import androidx.core.view.GravityCompat
-import com.google.android.material.appbar.AppBarLayout
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -56,6 +55,8 @@ import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.*
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
 import xyz.quaver.pupil.ui.dialog.GalleryDialog
+import xyz.quaver.pupil.ui.view.MainView
+import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.checkUpdate
@@ -63,10 +64,7 @@ import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.restore
 import java.util.regex.Pattern
-import kotlin.math.abs
-import kotlin.math.ceil
-import kotlin.math.min
-import kotlin.math.roundToInt
+import kotlin.math.*
 
 class MainActivity :
     BaseActivity(),
@@ -190,22 +188,22 @@ class MainActivity :
     }
 
     private fun initView() {
-        var prevP1 = 0
-        main_appbar_layout.addOnOffsetChangedListener(
-            AppBarLayout.OnOffsetChangedListener { _, p1 ->
-                main_searchview.translationY = p1.toFloat()
-                main_recyclerview.scrollBy(0, prevP1 - p1)
+        main_recyclerview.addOnScrollListener(object: RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                // -height of the search view < translationY < 0
+                main_searchview.translationY =
+                    min(
+                        max(
+                        main_searchview.translationY - dy,
+                        -main_searchview.findViewById<CardView>(R.id.search_query_section).height.toFloat()
+                    ), 0F)
 
-                with(main_fab) {
-                    if (prevP1 > p1)
-                        hideMenuButton(true)
-                    else if (prevP1 < p1)
-                        showMenuButton(true)
-                }
-
-                prevP1 = p1
+                if (dy > 0)
+                    main_fab.hideMenuButton(true)
+                else if (dy < 0)
+                    main_fab.showMenuButton(true)
             }
-        )
+        })
 
         Linkify.addLinks(main_noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
 
@@ -310,6 +308,44 @@ class MainActivity :
             }
         }
 
+        with(main_view) {
+            setOnPageTurnListener(object: MainView.OnPageTurnListener {
+                override fun onPrev(page: Int) {
+                    currentPage--
+
+                    // disable pageturn until the contents are loaded
+                    setCurrentPage(1, false)
+
+                    ViewCompat.animate(main_searchview)
+                        .setDuration(100)
+                        .setInterpolator(DecelerateInterpolator())
+                        .translationY(0F)
+
+                    cancelFetch()
+                    clearGalleries()
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+
+                override fun onNext(page: Int) {
+                    currentPage++
+
+                    // disable pageturn until the contents are loaded
+                    setCurrentPage(1, false)
+
+                    ViewCompat.animate(main_searchview)
+                        .setDuration(100)
+                        .setInterpolator(DecelerateInterpolator())
+                        .translationY(0F)
+
+                    cancelFetch()
+                    clearGalleries()
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+            })
+        }
+
         setupSearchBar()
         setupRecyclerView()
         fetchGalleries(query, sortMode)
@@ -359,14 +395,12 @@ class MainActivity :
                             loadBlocks()
                         }
 
-                    completeFlag.put(galleryID, false)
-
                     closeAllItems()
                 }
             }
             ItemClickSupport.addTo(this).apply {
                 onItemClickListener = listener@{ _, position, v ->
-                    if (v !is CardView)
+                    if (v !is ProgressCard)
                         return@listener
 
                     val intent = Intent(this@MainActivity, ReaderActivity::class.java)
@@ -377,7 +411,7 @@ class MainActivity :
                 }
 
                 onItemLongClickListener = listener@{ _, position, v ->
-                    if (v !is CardView)
+                    if (v !is ProgressCard)
                         return@listener false
 
                     val galleryID = galleries.getOrNull(position) ?: return@listener true
@@ -400,207 +434,6 @@ class MainActivity :
                     true
                 }
             }
-
-            var origin = 0f
-            var target = -1
-            val perPage = Preferences["per_page", "25"].toInt()
-            setOnTouchListener { _, event ->
-                when(event.action) {
-                    MotionEvent.ACTION_UP -> {
-                        origin = 0f
-
-                        with(main_recyclerview.adapter as GalleryBlockAdapter) {
-                            if(showPrev) {
-                                showPrev = false
-
-                                val prev = main_recyclerview.layoutManager?.getChildAt(0)
-
-                                if (prev is LinearLayout) {
-                                    val icon = prev.findViewById<ImageView>(R.id.icon_prev)
-                                    prev.layoutParams.height = 1
-                                    icon.layoutParams.height = 1
-                                    icon.rotation = 180f
-                                }
-
-                                prev?.requestLayout()
-
-                                notifyItemRemoved(0)
-                            }
-
-                            if(showNext) {
-                                showNext = false
-
-                                val next = main_recyclerview.layoutManager?.let {
-                                    getChildAt(childCount-1)
-                                }
-
-                                if (next is LinearLayout) {
-                                    val icon = next.findViewById<ImageView>(R.id.icon_next)
-                                    next.layoutParams.height = 1
-                                    icon.layoutParams.height = 1
-                                    icon.rotation = 0f
-                                }
-
-                                next?.requestLayout()
-
-                                notifyItemRemoved(itemCount)
-                            }
-                        }
-
-                        if (target != -1) {
-                            currentPage = target
-
-                            runOnUiThread {
-                                cancelFetch()
-                                clearGalleries()
-                                loadBlocks()
-                            }
-
-                            target = -1
-                        }
-                    }
-                    MotionEvent.ACTION_DOWN -> origin = event.y
-                    MotionEvent.ACTION_MOVE -> {
-                        if (origin == 0f)
-                            origin = event.y
-
-                        val dist = event.y - origin
-
-                        when {
-                            !canScrollVertically(-1) -> {
-                                //TOP
-
-                                //Scrolling UP
-                                if (dist > 0 && currentPage != 0) {
-                                    with(main_recyclerview.adapter as GalleryBlockAdapter) {
-                                        if(!showPrev) {
-                                            showPrev = true
-                                            notifyItemInserted(0)
-                                        }
-                                    }
-
-                                    val prev = main_recyclerview.layoutManager?.getChildAt(0)
-
-                                    if (prev is LinearLayout) {
-                                        val icon = prev.findViewById<ImageView>(R.id.icon_prev)
-                                        val text = prev.findViewById<TextView>(R.id.text_prev).apply {
-                                            text = getString(R.string.main_move, currentPage)
-                                        }
-                                        if (dist < 360) {
-                                            prev.layoutParams.height = (dist/2).roundToInt()
-                                            icon.layoutParams.height = (dist/2).roundToInt()
-                                            icon.rotation = dist+180
-                                            text.layoutParams.width = dist.roundToInt()
-
-                                            target = -1
-                                        }
-                                        else {
-                                            prev.layoutParams.height = 180
-                                            icon.layoutParams.height = 180
-                                            icon.rotation = 180f
-                                            text.layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT
-
-                                            target = currentPage-1
-                                        }
-                                    }
-
-                                    prev?.requestLayout()
-
-                                    return@setOnTouchListener true
-                                } else {
-                                    with(main_recyclerview.adapter as GalleryBlockAdapter) {
-                                        if(showPrev) {
-                                            showPrev = false
-
-                                            val prev = main_recyclerview.layoutManager?.getChildAt(0)
-
-                                            if (prev is LinearLayout) {
-                                                val icon = prev.findViewById<ImageView>(R.id.icon_prev)
-                                                prev.layoutParams.height = 1
-                                                icon.layoutParams.height = 1
-                                                icon.rotation = 180f
-                                            }
-
-                                            prev?.requestLayout()
-
-                                            notifyItemRemoved(0)
-                                        }
-                                    }
-                                }
-                            }
-                            !canScrollVertically(1) -> {
-                                //BOTTOM
-
-                                //Scrolling DOWN
-                                if (dist < 0 && currentPage != ceil(totalItems.toDouble()/perPage).roundToInt()-1) {
-                                    with(main_recyclerview.adapter as GalleryBlockAdapter) {
-                                        if(!showNext) {
-                                            showNext = true
-                                            notifyItemInserted(itemCount-1)
-                                        }
-                                    }
-
-                                    val next = main_recyclerview.layoutManager?.let {
-                                        getChildAt(childCount-1)
-                                    }
-
-                                    val absDist = abs(dist)
-
-                                    if (next is LinearLayout) {
-                                        val icon = next.findViewById<ImageView>(R.id.icon_next)
-                                        val text = next.findViewById<TextView>(R.id.text_next).apply {
-                                            text = getString(R.string.main_move, currentPage+2)
-                                        }
-
-                                        if (absDist < 360) {
-                                            next.layoutParams.height = (absDist/2).roundToInt()
-                                            icon.layoutParams.height = (absDist/2).roundToInt()
-                                            icon.rotation = -absDist
-                                            text.layoutParams.width = absDist.roundToInt()
-
-                                            target = -1
-                                        } else {
-                                            next.layoutParams.height = 180
-                                            icon.layoutParams.height = 180
-                                            icon.rotation = 0f
-                                            text.layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT
-
-                                            target = currentPage+1
-                                        }
-                                    }
-
-                                    next?.requestLayout()
-
-                                    return@setOnTouchListener true
-                                } else {
-                                    with(main_recyclerview.adapter as GalleryBlockAdapter) {
-                                        if(showNext) {
-                                            showNext = false
-
-                                            val next = main_recyclerview.layoutManager?.let {
-                                                getChildAt(childCount-1)
-                                            }
-
-                                            if (next is LinearLayout) {
-                                                val icon = next.findViewById<ImageView>(R.id.icon_next)
-                                                next.layoutParams.height = 1
-                                                icon.layoutParams.height = 1
-                                                icon.rotation = 180f
-                                            }
-
-                                            next?.requestLayout()
-
-                                            notifyItemRemoved(itemCount)
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                false
-            }
         }
     }
 
@@ -829,17 +662,15 @@ class MainActivity :
         loadingJob?.cancel()
     }
 
-    private fun clearGalleries() {
+    private fun clearGalleries() = CoroutineScope(Dispatchers.Main).launch {
         galleries.clear()
 
         with(main_recyclerview.adapter as GalleryBlockAdapter?) {
             this ?: return@with
 
-            this.completeFlag.clear()
             this.notifyDataSetChanged()
         }
 
-        main_appbar_layout.setExpanded(true)
         main_noresult.visibility = View.INVISIBLE
         main_progressbar.show()
     }
@@ -960,6 +791,10 @@ class MainActivity :
                 return@launch
             }
 
+            launch(Dispatchers.Main) {
+                main_view.setCurrentPage(currentPage + 1, galleryIDs.size > (currentPage+1)*perPage)
+            }
+
             galleryIDs.slice(currentPage*perPage until min(currentPage*perPage+perPage, galleryIDs.size)).chunked(5).let { chunks ->
                 for (chunk in chunks)
                     chunk.map { galleryID ->

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -46,7 +46,6 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
 import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.ui.view.TagChip

app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt

@@ -22,7 +22,6 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Animatable
-import android.os.Parcelable
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
@@ -38,8 +37,6 @@ import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import xyz.quaver.floatingsearchview.FloatingSearchView
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import xyz.quaver.floatingsearchview.util.MenuPopupHelper
-import xyz.quaver.floatingsearchview.util.view.MenuView
 import xyz.quaver.floatingsearchview.util.view.SearchInputView
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags

app/src/main/java/xyz/quaver/pupil/ui/view/MainView.java

@@ -0,0 +1,462 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.view;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.os.Vibrator;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.NestedScrollingChild;
+import androidx.core.view.NestedScrollingChildHelper;
+import androidx.core.view.NestedScrollingParent;
+import androidx.core.view.NestedScrollingParentHelper;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.TextViewCompat;
+
+import xyz.quaver.pupil.R;
+
+@SuppressWarnings("NullableProblems")
+public class MainView extends ViewGroup implements NestedScrollingChild, NestedScrollingParent {
+
+    private static final int PAGE_TURN_LAYOUT_SIZE = 48;
+    private static final int PAGE_TURN_ANIM_DURATION = 500;
+    private static final int PREV_OFFSET = 64;
+    private static final int RIPPLE_GIVE = 4;
+
+    private final float adjustedPageTurnLayoutSize;
+    private final float adjustedPrevOffset;
+    private final float adjustedRippleGive;
+    
+    final private NestedScrollingParentHelper mNestedScrollingParentHelper;
+    final private NestedScrollingChildHelper mNestedScrollingChildHelper;
+
+    final private Vibrator mVibrator;
+
+    private View mTarget;
+
+    private TextView mPrev;
+    private TextView mNext;
+
+    private final Paint mRipplePaint = new Paint();
+    private final Rect mRippleBound = new Rect();
+
+    private int mRippleSize = 0;
+    private final int mRippleTargetSize;
+    private final ValueAnimator mRippleAnimator = new ValueAnimator();
+
+    private int mCurrentOverScroll = 0;
+
+    private int mCurrentPage = 1;
+    private boolean mShowPrev;
+    private boolean mShowNext;
+
+    private OnPageTurnListener mOnPageTurnListener;
+
+    public MainView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public MainView(@NonNull Context context, AttributeSet attr) {
+        this(context, attr, 0);
+    }
+
+    public MainView(@NonNull Context context, AttributeSet attr, int defStyle) {
+        super(context, attr, defStyle);
+
+        setWillNotDraw(false);
+
+        DisplayMetrics metrics = getResources().getDisplayMetrics();
+
+        adjustedPageTurnLayoutSize = PAGE_TURN_LAYOUT_SIZE * metrics.density;
+        adjustedPrevOffset = PREV_OFFSET * metrics.density;
+        adjustedRippleGive = RIPPLE_GIVE * metrics.density;
+
+        mRippleTargetSize = metrics.widthPixels;
+
+        mNestedScrollingParentHelper = new NestedScrollingParentHelper(this);
+        mNestedScrollingChildHelper = new NestedScrollingChildHelper(this);
+
+        mVibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
+
+        mRippleAnimator.addUpdateListener(animation -> {
+            mRippleSize = (int) animation.getAnimatedValue();
+            invalidate();
+        });
+        mRippleAnimator.setDuration(PAGE_TURN_ANIM_DURATION);
+
+        initPageTurnView();
+    }
+
+    public void setCurrentPage(int currentPage, boolean showNext) {
+        mCurrentPage = currentPage;
+
+        mShowPrev = currentPage > 1;
+        mShowNext = showNext;
+
+        mPrev.setText(getContext().getString(R.string.main_move_to_page, mCurrentPage-1));
+        mNext.setText(getContext().getString(R.string.main_move_to_page, mCurrentPage+1));
+    }
+
+    public void setOnPageTurnListener(OnPageTurnListener listener) {
+        mOnPageTurnListener = listener;
+    }
+
+    private void initPageTurnView() {
+        TextView prev = new TextView(getContext());
+        TextView next = new TextView(getContext());
+
+        prev.setGravity(Gravity.CENTER_VERTICAL);
+        next.setGravity(Gravity.CENTER_VERTICAL);
+
+        prev.setCompoundDrawablesWithIntrinsicBounds(R.drawable.navigate_prev, 0, 0, 0);
+        next.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.navigate_next, 0);
+
+        TextViewCompat.setCompoundDrawableTintList(prev, AppCompatResources.getColorStateList(getContext(), R.color.colorAccent));
+        TextViewCompat.setCompoundDrawableTintList(next, AppCompatResources.getColorStateList(getContext(), R.color.colorAccent));
+
+        prev.setVisibility(View.INVISIBLE);
+        next.setVisibility(View.INVISIBLE);
+
+        mPrev = prev;
+        mNext = next;
+
+        addView(mPrev);
+        addView(mNext);
+
+        setCurrentPage(1, false);
+    }
+
+    private void ensureTarget() {
+        if (mTarget == null) {
+            for (int i = 0; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+
+                if (!child.equals(mNext) && !child.equals(mPrev)) {
+                    mTarget = child;
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        final int width = getMeasuredWidth();
+        final int height = getMeasuredHeight();
+
+        if (getChildCount() == 0)
+            return;
+        if (mTarget == null)
+            ensureTarget();
+        if (mTarget == null)
+            return;
+
+        mTarget.layout(
+            getPaddingLeft(),
+            getPaddingTop(),
+            width - getPaddingRight(),
+            height - getPaddingBottom()
+        );
+
+        final int prevWidth = mPrev.getMeasuredWidth();
+        mPrev.layout(
+            width / 2 - prevWidth / 2,
+            getPaddingTop() + (int) adjustedPrevOffset,
+            width / 2 + prevWidth / 2,
+            getPaddingTop() + (int) adjustedPrevOffset + mPrev.getMeasuredHeight()
+        );
+
+        final int nextWidth = mNext.getMeasuredWidth();
+        mNext.layout(
+            width / 2 - nextWidth / 2,
+            height - getPaddingBottom() - mNext.getMeasuredHeight(),
+            width / 2 + nextWidth / 2,
+            height - getPaddingBottom()
+        );
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        if (mTarget == null)
+            ensureTarget();
+        if (mTarget == null)
+            return;
+
+        mTarget.measure(
+            MeasureSpec.makeMeasureSpec(getMeasuredWidth() - getPaddingLeft() - getPaddingRight(), MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(getMeasuredHeight() - getPaddingTop() - getPaddingBottom(), MeasureSpec.EXACTLY)
+        );
+
+        mPrev.measure(
+            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST),
+            MeasureSpec.makeMeasureSpec((int) adjustedPageTurnLayoutSize, MeasureSpec.EXACTLY)
+        );
+
+        mNext.measure(
+            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST),
+            MeasureSpec.makeMeasureSpec((int) adjustedPageTurnLayoutSize, MeasureSpec.EXACTLY)
+        );
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (mCurrentOverScroll == 0)
+            return;
+
+        if (mCurrentOverScroll > 0) {
+            mRippleBound.set(
+                getPaddingLeft(),
+                (int) (getPaddingTop() - adjustedRippleGive),
+                getMeasuredWidth() - getPaddingRight(),
+                (int) (getPaddingTop() + adjustedPrevOffset + mPrev.getMeasuredHeight() + adjustedRippleGive)
+            );
+        }
+
+        if (mCurrentOverScroll < 0) {
+            final int height = getMeasuredHeight();
+            mRippleBound.set(
+                getPaddingLeft(),
+                (int) (height - getPaddingBottom() - mNext.getMeasuredHeight() - adjustedRippleGive),
+                getMeasuredWidth() - getPaddingRight(),
+                height - getPaddingBottom()
+            );
+        }
+
+        mRipplePaint.reset();
+        mRipplePaint.setStyle(Paint.Style.FILL);
+
+        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+        switch (currentNightMode) {
+            case Configuration.UI_MODE_NIGHT_YES:
+                mRipplePaint.setColor(ContextCompat.getColor(getContext(), R.color.material_light_blue_700));
+                break;
+            case Configuration.UI_MODE_NIGHT_NO:
+                mRipplePaint.setColor(ContextCompat.getColor(getContext(), R.color.material_light_blue_300));
+                break;
+        }
+
+        canvas.drawCircle(
+            (mRippleBound.left + mRippleBound.right) / 2F,
+            mCurrentOverScroll > 0 ? mRippleBound.bottom : mRippleBound.top,
+            mRippleSize,
+            mRipplePaint
+        );
+    }
+
+    private void onOverscroll(int overscroll) {
+        if (mTarget == null)
+            ensureTarget();
+        if (mTarget == null)
+            return;
+
+        mCurrentOverScroll = overscroll;
+
+        if (overscroll > 0) {
+            mPrev.setVisibility(View.VISIBLE);
+            mNext.setVisibility(View.INVISIBLE);
+        } else if (overscroll < 0) {
+            mPrev.setVisibility(View.INVISIBLE);
+            mNext.setVisibility(View.VISIBLE);
+        } else {
+            mPrev.setVisibility(View.INVISIBLE);
+            mNext.setVisibility(View.INVISIBLE);
+        }
+
+        if (Math.abs(overscroll) >= adjustedPageTurnLayoutSize) {
+            if (!mRippleAnimator.isStarted() && mRippleSize != mRippleTargetSize) {
+                mVibrator.vibrate(10);
+
+                mRippleAnimator.setIntValues(mRippleSize, mRippleTargetSize);
+                mRippleAnimator.start();
+            }
+        } else {
+            if (!mRippleAnimator.isStarted() && mRippleSize != 0) {
+                mRippleAnimator.setIntValues(mRippleSize, 0);
+                mRippleAnimator.start();
+            }
+        }
+
+        float clippedOverScrollTop = (overscroll > 0 ? 1 : -1) * Math.min(Math.abs(overscroll), adjustedPageTurnLayoutSize);
+        mTarget.setTranslationY(clippedOverScrollTop);
+    }
+
+    private void onOverscrollEnd(int overscroll) {
+        if (mTarget == null)
+            ensureTarget();
+        if (mTarget == null)
+            return;
+
+        mRippleAnimator.cancel();
+        mRippleAnimator.setIntValues(mRippleSize, 0);
+        mRippleAnimator.start();
+
+        mPrev.setVisibility(View.INVISIBLE);
+        mNext.setVisibility(View.INVISIBLE);
+
+        ViewCompat.animate(mTarget)
+            .setDuration(PAGE_TURN_ANIM_DURATION)
+            .setInterpolator(new DecelerateInterpolator())
+            .translationY(0);
+
+        if (Math.abs(overscroll) > adjustedPageTurnLayoutSize && mOnPageTurnListener != null) {
+            if (overscroll > 0)
+                mOnPageTurnListener.onPrev(mCurrentPage-1);
+            if (overscroll < 0)
+                mOnPageTurnListener.onNext(mCurrentPage+1);
+        }
+    }
+
+    // NestedScrollingParent
+
+    private int mTotalUnconsumed = 0;
+
+    @Override
+    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
+        return isEnabled() && (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
+    }
+
+    @Override
+    public void onNestedScrollAccepted(View child, View target, int axes) {
+        mNestedScrollingParentHelper.onNestedScrollAccepted(child, target, axes);
+        startNestedScroll(axes & ViewCompat.SCROLL_AXIS_VERTICAL);
+
+        mTotalUnconsumed = 0;
+    }
+
+    @Override
+    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
+        if (mTotalUnconsumed != 0 && dy > 0 == mTotalUnconsumed > 0) {
+            if (Math.abs(dy) > Math.abs(mTotalUnconsumed)) {
+                consumed[1] = dy - mTotalUnconsumed;
+                mTotalUnconsumed = 0;
+            } else {
+                mTotalUnconsumed -= dy;
+                consumed[1] = dy;
+            }
+
+            onOverscroll(mTotalUnconsumed);
+        }
+
+        final int[] parentConsumed = new int[2];
+        if (dispatchNestedPreScroll(dx - consumed[0], dy - consumed[1], parentConsumed, null)) {
+            consumed[0] += parentConsumed[0];
+            consumed[1] += parentConsumed[1];
+        }
+    }
+
+    @Override
+    public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
+        final int[] mParentOffsetInWindow = new int[2];
+        dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, mParentOffsetInWindow);
+
+        final int dy = dyUnconsumed + mParentOffsetInWindow[1];
+
+        if (mTotalUnconsumed == 0 && ((dy < 0 && !mShowPrev) || (dy > 0 && !mShowNext)))
+            return;
+
+        if (dy != 0) {
+            mTotalUnconsumed -= dy;
+            onOverscroll(mTotalUnconsumed);
+        }
+    }
+
+    @Override
+    public void onStopNestedScroll(View child) {
+        mNestedScrollingParentHelper.onStopNestedScroll(child);
+
+        if (Math.abs(mTotalUnconsumed) > 0) {
+            onOverscrollEnd(mTotalUnconsumed);
+            mTotalUnconsumed = 0;
+        }
+
+        stopNestedScroll();
+    }
+
+    // NestedScrollingChild
+
+    @Override
+    public void setNestedScrollingEnabled(boolean enabled) {
+        mNestedScrollingChildHelper.setNestedScrollingEnabled(enabled);
+    }
+
+    @Override
+    public boolean isNestedScrollingEnabled() {
+        return mNestedScrollingChildHelper.isNestedScrollingEnabled();
+    }
+
+    @Override
+    public boolean startNestedScroll(int axes) {
+        return mNestedScrollingChildHelper.startNestedScroll(axes);
+    }
+
+    @Override
+    public void stopNestedScroll() {
+        mNestedScrollingChildHelper.stopNestedScroll();
+    }
+
+    @Override
+    public boolean hasNestedScrollingParent() {
+        return mNestedScrollingChildHelper.hasNestedScrollingParent();
+    }
+
+    @Override
+    public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, @Nullable int[] offsetInWindow) {
+        return mNestedScrollingChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow);
+    }
+
+    @Override
+    public boolean dispatchNestedPreScroll(int dx, int dy, @Nullable int[] consumed, @Nullable int[] offsetInWindow) {
+        return mNestedScrollingChildHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow);
+    }
+
+    @Override
+    public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
+        return mNestedScrollingChildHelper.dispatchNestedFling(velocityX, velocityY, consumed);
+    }
+
+    @Override
+    public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
+        return mNestedScrollingChildHelper.dispatchNestedPreFling(velocityX, velocityY);
+    }
+
+    public interface OnPageTurnListener {
+        void onPrev(int page);
+        void onNext(int page);
+    }
+}

app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt

@@ -0,0 +1,72 @@
+package xyz.quaver.pupil.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import androidx.cardview.widget.CardView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import kotlinx.android.synthetic.main.view_progress_card.view.*
+import xyz.quaver.pupil.R
+
+class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, defStyle: Int = R.attr.cardViewStyle) : CardView(context, attr, defStyle) {
+
+    enum class Type {
+        LOADING,
+        CACHE,
+        DOWNLOAD
+    }
+
+    var type: Type = Type.LOADING
+        set(value) {
+            field = value
+
+            when (field) {
+                Type.LOADING -> R.color.colorAccent
+                Type.CACHE -> R.color.material_blue_700
+                Type.DOWNLOAD -> R.color.material_green_a700
+            }.let {
+                val color = ContextCompat.getColor(context, it)
+                DrawableCompat.setTint(progressbar.progressDrawable, color)
+            }
+        }
+
+    var progress: Int
+        get() = progressbar?.progress ?: 0
+        set(value) {
+            progressbar?.progress = value
+        }
+    var max: Int
+        get() = progressbar?.max ?: 0
+        set(value) {
+            progressbar?.max = value
+
+            progressbar.visibility =
+                if (value == 0)
+                    GONE
+                else
+                    VISIBLE
+        }
+
+    init {
+        inflate(context, R.layout.view_progress_card, this)
+
+        content.setOnClickListener {
+            performClick()
+        }
+
+        content.setOnLongClickListener {
+            performLongClick()
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
+        if (childCount == 0)
+            super.addView(child, index, params)
+        else
+            content.addView(child, index, params)
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt

@@ -32,7 +32,7 @@ import xyz.quaver.pupil.types.Tags
 class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, attrStyle: Int = R.attr.chipGroupStyle, val tags: Tags = Tags()) : ChipGroup(context, attr, attrStyle), MutableSet<Tag> by tags {
 
     object Defaults {
-        val maxChipSize = 10
+        const val maxChipSize = 10
     }
 
     var maxChipSize: Int = Defaults.maxChipSize
@@ -86,7 +86,7 @@ class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSe
                 addView(it.await())
             }
 
-            if (maxChipSize > 0 && tags.size > maxChipSize && parent == null)
+            if (maxChipSize > 0 && tags.size > maxChipSize)
                 addView(moreView)
         }
     }

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -23,9 +23,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.content.ContextCompat
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.Code
@@ -137,4 +135,7 @@ operator fun JsonElement.get(index: Int) =
     this.jsonArray[index]
 
 operator fun JsonElement.get(tag: String) =
-    this.jsonObject[tag]
+    this.jsonObject[tag]
+
+val JsonElement.content
+    get() = this.jsonPrimitive.contentOrNull

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -32,6 +32,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -256,6 +257,13 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
 
     job?.cancel()
     job = CoroutineScope(Dispatchers.IO).launch {
+        val images = listOf(
+            "jpg",
+            "png",
+            "gif",
+            "webp"
+        )
+
         val downloadFolders = downloadFolder.listFiles { folder ->
             folder.isDirectory && !downloadFolderMap.values.contains(folder.name)
         }?.map {
@@ -273,52 +281,56 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
                 .setProgress(index, downloadFolders.size, false)
             notificationManager.notify(R.id.notification_id_import, notification.build())
 
-            kotlin.runCatching {
-                val metadata = kotlin.runCatching {
-                    folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it).jsonObject }
-                }.getOrNull()
+            val metadata = kotlin.runCatching {
+                folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it) }
+            }.getOrNull()
 
-                val galleryID = folder.name.toIntOrNull() ?: return@runCatching
+            val galleryID = metadata?.get("reader")?.get("galleryInfo")?.get("id")?.content?.toIntOrNull()
+                ?: folder.name.toIntOrNull() ?: return@forEachIndexed
 
-                val galleryBlock: GalleryBlock? = kotlin.runCatching {
-                    metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
-                }.getOrNull() ?: getGalleryBlock(galleryID)
-                val reader: Reader? = kotlin.runCatching {
-                    metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
-                }.getOrNull() ?: getReader(galleryID)
+            val galleryBlock: GalleryBlock? = kotlin.runCatching {
+                metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
+            }.getOrNull() ?: kotlin.runCatching {
+                getGalleryBlock(galleryID)
+            }.getOrNull() ?: kotlin.runCatching {
+                xyz.quaver.hiyobi.getGalleryBlock(galleryID)
+            }.getOrNull()
 
-                metadata?.get("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
-                    val file = folder.getChild(".thumbnail").also {
-                        if (it.exists())
-                            it.delete()
-                        it.createNewFile()
-                    }
+            val reader: Reader? = kotlin.runCatching {
+                metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
+            }.getOrNull() ?: kotlin.runCatching {
+                getReader(galleryID)
+            }.getOrNull() ?: kotlin.runCatching {
+                xyz.quaver.hiyobi.getReader(galleryID)
+            }.getOrNull()
 
-                    file.writeBytes(Base64.decode(thumbnail, Base64.DEFAULT))
+            metadata?.get("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
+                val file = folder.getChild(".thumbnail").also {
+                    if (it.exists())
+                        it.delete()
+                    it.createNewFile()
                 }
 
-                val list: MutableList<String?> =
-                    MutableList(reader!!.galleryInfo.files.size) { null }
-
-                folder.listFiles { file ->
-                    file?.nameWithoutExtension?.let {
-                        Regex("""\d{5}""").matches(it) && it.toIntOrNull() != null
-                    } == true
-                }?.forEach {
-                    list[it.nameWithoutExtension.toInt()] = it.name
-                }
-
-                folder.getChild(".metadata").also { if (it.exists()) it.delete(); it.createNewFile() }.writeText(
-                    Json.encodeToString(Metadata(galleryBlock, reader, list))
-                )
-
-                synchronized(Cache) {
-                    Cache.delete(this@migrate, galleryID)
-                }
-                downloadFolderMap[galleryID] = folder.name
-
-                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile(); it.writeText(Json.encodeToString(downloadFolderMap)) }
+                file.writeBytes(Base64.decode(thumbnail, Base64.DEFAULT))
             }
+
+            val list: MutableList<String?> =
+                MutableList(reader!!.galleryInfo.files.size) { null }
+
+            folder.list { _, name ->
+                name?.substringAfterLast('.') in images
+            }?.sorted()?.take(list.size)?.forEachIndexed { i, name ->
+                list[i] = name
+            }
+
+            folder.getChild(".metadata").also { if (it.exists()) it.delete(); it.createNewFile() }.writeText(
+                Json.encodeToString(Metadata(galleryBlock, reader, list))
+            )
+
+            Cache.delete(this@migrate, galleryID)
+            downloadFolderMap[galleryID] = folder.name
+
+            downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile(); it.writeText(Json.encodeToString(downloadFolderMap)) }
         }
 
         notification

app/src/main/res/drawable/navigate_next.xml

@@ -1,3 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="48dp" android:height="48dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
     <path android:fillColor="#FF000000" android:pathData="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
 </vector>

app/src/main/res/drawable/navigate_prev.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="48dp" android:height="48dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <group android:pivotX="12" android:scaleX="-1">
+        <path android:fillColor="#FF000000" android:pathData="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
+    </group>
+</vector>

app/src/main/res/layout/activity_main_content.xml

@@ -17,36 +17,18 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.MainActivity">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <xyz.quaver.pupil.ui.view.MainView
+        android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/main_appbar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:visibility="invisible"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="64dp"
-                android:visibility="invisible"
-                android:background="@android:color/transparent"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
         <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -70,63 +52,62 @@
 
         </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
-        <androidx.core.widget.ContentLoadingProgressBar
-            style="?android:attr/progressBarStyle"
-            android:id="@+id/main_progressbar"
+    </xyz.quaver.pupil.ui.view.MainView>
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        style="?android:attr/progressBarStyle"
+        android:id="@+id/main_progressbar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"/>
+
+    <TextView
+        android:id="@+id/main_noresult"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/main_no_result"
+        android:linksClickable="true"
+        android:visibility="invisible"/>
+
+    <com.github.clans.fab.FloatingActionMenu
+        android:id="@+id/main_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        app:menu_colorNormal="@color/colorAccent">
+
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/main_fab_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
+            app:fab_label="@string/main_fab_cancel"
+            app:fab_size="mini"/>
 
-        <TextView
-            android:id="@+id/main_noresult"
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/main_fab_jump"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="@string/main_no_result"
-            android:linksClickable="true"
-            android:visibility="invisible"/>
+            app:fab_label="@string/main_jump_title"
+            app:fab_size="mini"/>
 
-        <com.github.clans.fab.FloatingActionMenu
-                android:id="@+id/main_fab"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|end"
-                android:layout_margin="16dp"
-                app:menu_colorNormal="@color/colorAccent">
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/main_fab_random"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:fab_label="@string/main_fab_random"
+            app:fab_size="mini"/>
 
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_fab_cancel"
-                app:fab_size="mini"/>
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/main_fab_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:fab_label="@string/main_open_gallery_by_id"
+            app:fab_size="mini"/>
 
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_jump"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_jump_title"
-                app:fab_size="mini"/>
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_random"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_fab_random"
-                app:fab_size="mini"/>
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_id"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_open_gallery_by_id"
-                app:fab_size="mini"/>
-
-        </com.github.clans.fab.FloatingActionMenu>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    </com.github.clans.fab.FloatingActionMenu>
 
     <xyz.quaver.pupil.ui.view.FloatingSearchView
         android:id="@+id/main_searchview"
@@ -141,7 +122,6 @@
         app:leftActionMode="showHamburger"
         app:menu="@menu/main"
         app:dismissOnOutsideTouch="true"
-        app:close_search_on_keyboard_dismiss="false"
-        tools:ignore="NewApi" />
+        app:close_search_on_keyboard_dismiss="false" />
 
-</RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/item_galleryblock.xml

@@ -17,217 +17,144 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<androidx.cardview.widget.CardView
+<xyz.quaver.pupil.ui.view.ProgressCard
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/galleryblock_card"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_margin="8dp"
-	app:cardCornerRadius="8dp"
 	android:clipChildren="true"
+	app:cardCornerRadius="4dp"
+	android:layout_marginLeft="8dp"
+	android:layout_marginRight="8dp"
+	app:cardUseCompatPadding="true"
 	tools:ignore="RtlHardcoded">
 
-	<com.daimajia.swipe.SwipeLayout
-		android:id="@+id/galleryblock_swipe_layout"
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:drag_edge="right"
-		app:show_mode="pull_out">
+		android:layout_height="wrap_content">
 
-		<LinearLayout
-            android:layout_width="wrap_content"
-			android:layout_height="match_parent">
+		<com.github.piasy.biv.view.BigImageView
+			android:id="@+id/galleryblock_thumbnail"
+			android:layout_width="150dp"
+			android:layout_height="0dp"
+			android:contentDescription="@string/galleryblock_thumbnail_description"
+			android:adjustViewBounds="true"
+			android:clickable="false"
+			app:layout_constraintHeight_default="spread"
+			app:layout_constraintHeight_min="200dp"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintBottom_toTopOf="@id/barrier"/>
 
-			<TextView
-				android:id="@+id/galleryblock_download"
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:minWidth="70dp"
-				android:padding="8dp"
-				android:gravity="center"
-				android:background="@android:color/holo_blue_dark"
-				android:textColor="@android:color/white"
-				android:text="@string/main_download"
-				android:foreground="?android:attr/selectableItemBackground"
-				android:focusable="true"
-				android:clickable="true"
-				tools:ignore="UnusedAttribute" />
-
-			<TextView
-				android:id="@+id/galleryblock_delete"
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:minWidth="70dp"
-				android:padding="8dp"
-				android:gravity="center"
-				android:background="@android:color/holo_red_dark"
-				android:textColor="@android:color/white"
-				android:text="@string/main_delete"
-				android:foreground="?android:attr/selectableItemBackground"
-				android:focusable="true"
-				android:clickable="true"
-				tools:ignore="UnusedAttribute" />
-
-		</LinearLayout>
-
-		<androidx.constraintlayout.widget.ConstraintLayout
-			android:id="@+id/galleryblock_primary"
-			android:layout_width="match_parent"
+		<TextView
+			style="@style/TextAppearance.AppCompat.Headline"
+			android:id="@+id/galleryblock_title"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:background="?android:attr/selectableItemBackground"
-			android:focusable="true"
-			android:clickable="true">
+			android:layout_marginTop="8dp"
+			android:layout_marginLeft="8dp"
+			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
 
-			<FrameLayout
-				android:id="@+id/galleryblock_progressbar_layout"
-				android:layout_width="match_parent"
-				android:layout_height="4dp"
-				android:visibility="gone"
-				app:layout_constraintTop_toTopOf="parent">
+		<TextView
+			style="@style/TextAppearance.AppCompat.Medium"
+			android:id="@+id/galleryblock_artist"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/galleryblock_title" />
 
-				<androidx.core.widget.ContentLoadingProgressBar
-					style="?android:attr/progressBarStyleHorizontal"
-					android:id="@+id/galleryblock_progressbar"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="-4dp"
-					android:layout_marginTop="-4dp"
-					android:progress="50"
-					android:layout_gravity="center_vertical"/>
+		<TextView
+			android:id="@+id/galleryblock_series"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
+			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+			app:layout_constraintRight_toRightOf="parent"/>
 
-				<ImageView
-					android:id="@+id/galleryblock_progress_complete"
-					android:layout_width="match_parent"
-					android:layout_height="4dp"
-					android:visibility="invisible"
-					android:scaleType="fitXY"
-					android:contentDescription="@string/reader_imageview_description"
-					app:layout_constraintTop_toTopOf="parent"/>
+		<TextView
+			android:id="@+id/galleryblock_type"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
+			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
 
-			</FrameLayout>
+		<TextView
+			android:id="@+id/galleryblock_language"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			android:layout_marginBottom="8dp"
+			app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
+			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
 
-			<com.github.piasy.biv.view.BigImageView
-				android:id="@+id/galleryblock_thumbnail"
-				android:layout_width="150dp"
-				android:layout_height="0dp"
-				android:contentDescription="@string/galleryblock_thumbnail_description"
-				android:adjustViewBounds="true"
-				app:layout_constraintHeight_default="spread"
-				app:layout_constraintHeight_min="200dp"
-				app:layout_constraintLeft_toLeftOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar_layout"
-				app:layout_constraintBottom_toTopOf="@id/barrier"/>
+		<xyz.quaver.pupil.ui.view.TagChipGroup
+			android:id="@+id/galleryblock_tag_group"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginBottom="16dp"
+			app:chipSpacing="4dp"
+			app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
+			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+			app:layout_constraintRight_toRightOf="parent"/>
 
-			<TextView
-				style="@style/TextAppearance.AppCompat.Headline"
-				android:id="@+id/galleryblock_title"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
-				android:layout_marginLeft="8dp"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar_layout"/>
+		<androidx.constraintlayout.widget.Barrier
+			android:id="@+id/barrier"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:barrierDirection="bottom"
+			app:constraint_referenced_ids="galleryblock_thumbnail, galleryblock_tag_group"/>
 
-			<TextView
-				style="@style/TextAppearance.AppCompat.Medium"
-				android:id="@+id/galleryblock_artist"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_title"/>
+		<View
+			android:id="@+id/divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="?android:attr/listDivider"
+			app:layout_constraintTop_toBottomOf="@id/barrier"
+			android:layout_margin="8dp"/>
 
-			<TextView
-				android:id="@+id/galleryblock_series"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"/>
+		<TextView
+			android:id="@+id/galleryblock_id"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="8dp"
+			app:layout_constraintTop_toBottomOf="@id/divider"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintLeft_toLeftOf="parent"/>
 
-			<TextView
-				android:id="@+id/galleryblock_type"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
+		<TextView
+			android:id="@+id/galleryblock_pagecount"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:layout_marginBottom="8dp"
+			app:layout_constraintTop_toBottomOf="@id/divider"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent" />
 
-			<TextView
-				android:id="@+id/galleryblock_language"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
-				android:layout_marginBottom="8dp"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
+		<ImageView
+			android:id="@+id/galleryblock_favorite"
+			android:contentDescription="@string/app_name"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:layout_marginRight="8dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginBottom="8dp"
+			app:srcCompat="@drawable/ic_star_empty"
+			app:layout_constraintTop_toBottomOf="@id/divider"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintRight_toRightOf="parent" />
 
-			<xyz.quaver.pupil.ui.view.TagChipGroup
-				android:id="@+id/galleryblock_tag_group"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
-				android:layout_marginTop="16dp"
-				android:layout_marginBottom="16dp"
-				app:chipSpacing="4dp"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
-				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-				app:layout_constraintRight_toRightOf="parent"/>
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
-			<androidx.constraintlayout.widget.Barrier
-				android:id="@+id/barrier"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				app:barrierDirection="bottom"
-				app:constraint_referenced_ids="galleryblock_thumbnail, galleryblock_tag_group"/>
-
-			<View
-				android:id="@+id/divider"
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="?android:attr/listDivider"
-				app:layout_constraintTop_toBottomOf="@id/barrier"
-				android:layout_margin="8dp"/>
-
-			<TextView
-				android:id="@+id/galleryblock_id"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_margin="8dp"
-				app:layout_constraintTop_toBottomOf="@id/divider"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintLeft_toLeftOf="parent"/>
-
-			<TextView
-				android:id="@+id/galleryblock_pagecount"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
-				app:layout_constraintTop_toBottomOf="@id/divider"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintLeft_toLeftOf="parent"
-				app:layout_constraintRight_toRightOf="parent" />
-
-			<ImageView
-				android:id="@+id/galleryblock_favorite"
-				android:contentDescription="@string/app_name"
-				android:layout_width="32dp"
-				android:layout_height="32dp"
-				android:layout_marginRight="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
-				app:srcCompat="@drawable/ic_star_empty"
-				app:layout_constraintTop_toBottomOf="@id/divider"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintRight_toRightOf="parent" />
-
-		</androidx.constraintlayout.widget.ConstraintLayout>
-
-	</com.daimajia.swipe.SwipeLayout>
-
-</androidx.cardview.widget.CardView>
+</xyz.quaver.pupil.ui.view.ProgressCard>

app/src/main/res/layout/item_next.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2019  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
-
-    <ImageView
-        android:id="@+id/icon_next"
-        android:contentDescription="@string/page_indicator_placeholder"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        app:srcCompat="@drawable/ic_navigate_next_black_24dp"
-        app:tint="@color/colorAccent"
-        android:rotation="180"/>
-
-    <TextView
-        android:id="@+id/text_next"
-        android:layout_width="1dp"
-        android:layout_height="wrap_content"
-        android:maxLines="1"
-        android:ellipsize="end" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
-
-</LinearLayout>

app/src/main/res/layout/item_prev.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2019  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
-
-    <ImageView
-        android:id="@+id/icon_prev"
-        android:contentDescription="@string/page_indicator_placeholder"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        app:srcCompat="@drawable/ic_navigate_next_black_24dp"
-        app:tint="@color/colorAccent"
-        android:rotation="180"/>
-
-    <TextView
-        android:id="@+id/text_prev"
-        android:layout_width="1dp"
-        android:layout_height="wrap_content"
-        android:maxLines="1"
-        android:ellipsize="end" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
-
-</LinearLayout>

app/src/main/res/layout/view_progress_card.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="androidx.cardview.widget.CardView">
+
+    <com.daimajia.swipe.SwipeLayout
+        android:id="@+id/swipe_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:drag_edge="right"
+        app:show_mode="pull_out">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/download"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:minWidth="70dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:background="@android:color/holo_blue_dark"
+                android:textColor="@android:color/white"
+                android:text="@string/main_download"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:focusable="true"
+                android:clickable="true"
+                tools:ignore="UnusedAttribute" />
+
+            <TextView
+                android:id="@+id/delete"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:minWidth="70dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:background="@android:color/holo_red_dark"
+                android:textColor="@android:color/white"
+                android:text="@string/main_delete"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:focusable="true"
+                android:clickable="true"
+                tools:ignore="UnusedAttribute" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?android:attr/selectableItemBackground"
+            android:orientation="vertical">
+
+            <androidx.core.widget.ContentLoadingProgressBar
+                style="?android:attr/progressBarStyleHorizontal"
+                android:id="@+id/progressbar"
+                android:layout_width="match_parent"
+                android:layout_height="4dp"
+                android:progress="50"
+                app:layout_constraintTop_toTopOf="parent"/>
+
+        </LinearLayout>
+
+    </com.daimajia.swipe.SwipeLayout>
+
+</merge>

app/src/main/res/layout/view_swipe_pageturn.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="android.widget.FrameLayout">
+
+    <TextView
+        android:id="@+id/prev"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:maxLines="1"
+        android:ellipsize="end"
+        app:drawableStartCompat="@drawable/navigate_prev"
+        app:drawableLeftCompat="@drawable/navigate_prev"
+        app:drawableTint="@color/colorAccent" />
+
+    <TextView
+        android:id="@+id/next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:maxLines="1"
+        android:ellipsize="end"
+        app:drawableEndCompat="@drawable/navigate_next"
+        app:drawableRightCompat="@drawable/navigate_next"
+        app:drawableTint="@color/colorAccent" />
+
+</merge>

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

@@ -48,7 +48,7 @@
     <string name="main_jump_title">ページ移動</string>
     <string name="main_jump_message">現ページ番号: %1$d\nページ数: %2$d</string>
     <string name="unable_to_connect">hitomi.laに接続できません</string>
-    <string name="main_move">%1$dページへ移動</string>
+    <string name="main_move_to_page">%1$dページへ移動</string>
     <string name="settings_clear_downloads">ダウンロード削除</string>
     <string name="settings_clear_downloads_alert_message">ダウンロードしたギャラリーを全て削除します。\n実行しますか？</string>
     <string name="settings_mirror_summary">ミラーサーバからイメージをロード</string>

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

@@ -47,7 +47,7 @@
     <string name="main_jump_title">페이지 이동</string>
     <string name="main_jump_message">현재 페이지: %1$d\n페이지 수: %2$d</string>
     <string name="unable_to_connect">hitomi.la에 연결할 수 없습니다</string>
-    <string name="main_move">%1$d 페이지로 이동</string>
+    <string name="main_move_to_page">%1$d 페이지로 이동</string>
     <string name="settings_clear_downloads">다운로드 삭제</string>
     <string name="settings_clear_downloads_alert_message">다운로드 된 만화를 모두 삭제합니다.\n계속하시겠습니까?</string>
     <string name="main_drawer_favorite">즐겨찾기</string>

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

@@ -21,4 +21,11 @@
     <declare-styleable name="TagChipGroup">
         <attr name="maxTag" format="integer"/>
     </declare-styleable>
+
+    <declare-styleable name="RippleCircleStatus">
+        <attr name="half" format="enum">
+            <enum name="top" value="1"/>
+            <enum name="bottom" value="-1"/>
+        </attr>
+    </declare-styleable>
 </resources>

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

@@ -4,6 +4,8 @@
     <color name="colorPrimaryDark">#0093c4</color>
     <color name="colorAccent">#D81B60</color>
 
+    <color name="material_light_blue_300">#4fc3f7</color>
+    <color name="material_light_blue_700">#0288d1</color>
     <color name="material_pink_600">#d81b60</color>
     <color name="material_blue_700">#1976d2</color>
     <color name="material_green_a700">#00c853</color>

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

@@ -71,7 +71,7 @@
     <string name="main_fab_random">Open a random gallery</string>
     <string name="main_fab_cancel">Cancel all downloads</string>
 
-    <string name="main_move">Move to page %1$d</string>
+    <string name="main_move_to_page">Move to page %1$d</string>
 
     <string name="main_download">DOWNLOAD</string>
     <string name="main_delete">DELETE</string>

build.gradle

@@ -6,15 +6,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.google.gms:google-services:4.3.3"
+        classpath "com.google.gms:google-services:4.3.4"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.3.0"
-        classpath "com.google.firebase:perf-plugin:1.3.2"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.4.1"
+        classpath "com.google.firebase:perf-plugin:1.3.4"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.2"
     }
 }

gradle.properties

@@ -20,4 +20,4 @@ kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true
 
-kotlin_version=1.4.10
+kotlin_version=1.4.20