Somewhat working

app/build.gradle

@@ -113,10 +113,6 @@ dependencies {
 
     //noinspection GradleDependency
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
-    implementation "com.github.bumptech.glide:glide:4.11.0"
-    implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") {
-        transitive = false
-    }
 
     implementation "com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2"
 

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

@@ -26,28 +26,19 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
-import androidx.core.view.children
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
 import com.daimajia.swipe.SwipeLayout
 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.coroutines.CoroutineScope
+import kotlinx.android.synthetic.main.item_reader.view.*
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
-import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
@@ -57,11 +48,9 @@ import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.wordCapitalize
-import java.util.*
+import java.io.File
-import kotlin.collections.ArrayList
-import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -69,12 +58,11 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         PREV
     }
 
-    val timer = Timer()
+    var update = true
-
     var thin: Boolean = Preferences["thin"]
 
     inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        var timerTask: TimerTask? = null
+        var updateJob: Job? = null
 
         private fun updateProgress(context: Context, galleryID: Int) {
             val cache = Cache.getInstance(context, galleryID)
@@ -144,54 +132,41 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
-                if (thin)
+                galleryblock_thumbnail.apply {
-                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                    setOnClickListener {
-                        R.dimen.galleryblock_thumbnail_thin
+                        view.performClick()
-                    )
+                    }
-
+                    setOnLongClickListener {
-                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
+                        view.performLongClick()
-                    it.start()
+                    }
-                })
+                    setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
-
+                    setImageLoaderCallback(object: ImageLoader.Callback {
-                CoroutineScope(Dispatchers.IO).launch {
+                        override fun onFail(error: Exception?) {
-                    val thumbnail = cache.getThumbnail()
+                            Cache.getInstance(context, galleryID).let { cache ->
-
+                                cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                    glide
+                                cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
-                        .load(thumbnail)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .error(R.drawable.image_broken_variant)
-                        .listener(object: RequestListener<Drawable> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                Cache.getInstance(context, galleryID).let {
-                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
-                                }
-                                return false
                             }
+                        }
 
-                            override fun onResourceReady(
+                        override fun onCacheHit(imageType: Int, image: File?) {}
-                                resource: Drawable?,
+                        override fun onCacheMiss(imageType: Int, image: File?) {}
-                                model: Any?,
+                        override fun onFinish() {}
-                                target: Target<Drawable>?,
+                        override fun onProgress(progress: Int) {}
-                                dataSource: DataSource?,
+                        override fun onStart() {}
-                                isFirstResource: Boolean
+                        override fun onSuccess(image: File?) {}
-                            ): Boolean = false
+                    })
-                        })
+                    ssiv?.recycle()
-                        .apply {
+                    CoroutineScope(Dispatchers.IO).launch {
-                            if (BuildConfig.CENSOR)
+                        showImage(cache.getThumbnail())
-                                override(5, 8)
+                    }
-                        }.let { launch(Dispatchers.Main) { it.into(galleryblock_thumbnail) } }
                 }
 
-                if (timerTask == null)
+                if (updateJob == null)
-                    timerTask = timer.schedule(0, 1000) {
+                    updateJob = CoroutineScope(Dispatchers.Main).launch {
-                        updateProgress(context, galleryID)
+                        while (update) {
+                            updateProgress(context, galleryID)
+                            delay(1000)
+                        }
                     }
 
                 galleryblock_title.text = galleryBlock.title
@@ -386,8 +361,8 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         super.onViewDetachedFromWindow(holder)
 
         if (holder is GalleryViewHolder) {
-            holder.timerTask?.cancel()
+            holder.updateJob?.cancel()
-            holder.timerTask = null
+            holder.updateJob = null
         }
     }
 

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

@@ -18,33 +18,43 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.content.Context
+import android.graphics.DiscretePathEffect
+import android.graphics.drawable.Animatable
+import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.drawee.controller.BaseControllerListener
+import com.facebook.drawee.drawable.ScalingUtils
+import com.facebook.drawee.interfaces.DraweeController
 import com.facebook.drawee.view.SimpleDraweeView
-import com.github.piasy.biv.view.FrescoImageViewFactory
+import com.facebook.imagepipeline.image.ImageInfo
+import com.github.piasy.biv.view.BigImageView
 import com.github.piasy.biv.view.ImageShownCallback
+import com.github.piasy.biv.view.ImageViewFactory
 import kotlinx.android.synthetic.main.item_reader.view.*
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.downloader.Cache
-import java.util.*
+import java.io.File
-import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
 
-class ReaderAdapter(private val activity: ReaderActivity,
+class ReaderAdapter(
-                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+    private val activity: ReaderActivity,
+    private val galleryID: Int
+) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
 
     var reader: Reader? = null
-    val timer = Timer()
 
     var isFullScreen = false
 
@@ -52,14 +62,7 @@ class ReaderAdapter(private val activity: ReaderActivity,
 
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         fun clear() {
-            view.image.mainView.let {
+            view.image.ssiv?.recycle()
-                when (it) {
-                    is SubsamplingScaleImageView ->
-                        it.recycle()
-                    is SimpleDraweeView ->
-                        it.controller = null
-                }
-            }
         }
     }
 
@@ -67,18 +70,29 @@ class ReaderAdapter(private val activity: ReaderActivity,
         return LayoutInflater.from(parent.context).inflate(
             R.layout.item_reader, parent, false
         ).let {
-            with (it) {
+            with(it) {
-                image.setImageViewFactory(FrescoImageViewFactory())
+                image.setImageViewFactory(FrescoImageViewFactory().apply {
-                image.setImageShownCallback(object: ImageShownCallback {
+                    updateView = { imageInfo ->
-                    override fun onThumbnailShown() {}
+                        it.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    override fun onMainImageShown() {
+                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
-                        placeholder.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                            dimensionRatio = null
                         }
                     }
                 })
+                image.setImageShownCallback(object : ImageShownCallback {
+                    override fun onMainImageShown() {
+                        it.image.mainView.let { v ->
+                            when (v) {
+                                is SubsamplingScaleImageView ->
+                                    if (!isFullScreen) it.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                            }
+                        }
+                    }
+
+                    override fun onThumbnailShown() {}
+                })
+                image.setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
                 image.setOnClickListener {
-                    onItemClickListener?.invoke()
+                    this.performClick()
                 }
                 setOnClickListener {
                     onItemClickListener?.invoke()
@@ -96,20 +110,20 @@ class ReaderAdapter(private val activity: ReaderActivity,
         if (cache == null)
             cache = Cache.getInstance(holder.view.context, galleryID)
 
-        holder.view.layoutParams.height =
+        if (!isFullScreen) {
-            if (isFullScreen)
+            holder.view.setBackgroundResource(R.drawable.reader_item_boundary)
-                ConstraintLayout.LayoutParams.MATCH_PARENT
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-            else
+                height = 0
-                ConstraintLayout.LayoutParams.WRAP_CONTENT
+                dimensionRatio =
-
+                    "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
-        holder.view.image.layoutParams.height =
+            }
-            if (isFullScreen)
+        } else {
-                ConstraintLayout.LayoutParams.MATCH_PARENT
+            holder.view.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            else
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                ConstraintLayout.LayoutParams.WRAP_CONTENT
+                height = ConstraintLayout.LayoutParams.MATCH_PARENT
-
+                dimensionRatio = null
-        holder.view.placeholder.updateLayoutParams<ConstraintLayout.LayoutParams> {
+            }
-            dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            holder.view.background = null
         }
 
         holder.view.reader_index.text = (position+1).toString()
@@ -130,10 +144,9 @@ class ReaderAdapter(private val activity: ReaderActivity,
 
             holder.clear()
 
-            timer.schedule(1000) {
+            CoroutineScope(Dispatchers.Main).launch {
-                CoroutineScope(Dispatchers.Main).launch {
+                delay(1000)
-                    notifyItemChanged(position)
+                notifyItemChanged(position)
-                }
             }
         }
     }
@@ -144,4 +157,87 @@ class ReaderAdapter(private val activity: ReaderActivity,
         holder.clear()
     }
 
+}
+
+class FrescoImageViewFactory : ImageViewFactory() {
+    var updateView: ((ImageInfo) -> Unit)? = null
+
+    override fun createAnimatedImageView(
+        context: Context, imageType: Int,
+        initScaleType: Int
+    ): View {
+        val view = SimpleDraweeView(context)
+        view.hierarchy.actualImageScaleType = scaleType(initScaleType)
+        return view
+    }
+
+    override fun loadAnimatedContent(
+        view: View, imageType: Int,
+        imageFile: File
+    ) {
+        if (view is SimpleDraweeView) {
+            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
+                .setUri(Uri.parse("file://" + imageFile.absolutePath))
+                .setAutoPlayAnimations(true)
+                .setControllerListener(object: BaseControllerListener<ImageInfo>() {
+                    override fun onIntermediateImageSet(id: String?, imageInfo: ImageInfo?) {
+                        imageInfo?.let { updateView?.invoke(it) }
+                    }
+
+                    override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
+                        imageInfo?.let { updateView?.invoke(it) }
+                    }
+                })
+                .build()
+            view.controller = controller
+        }
+    }
+
+    override fun createThumbnailView(
+        context: Context,
+        scaleType: ImageView.ScaleType, willLoadFromNetwork: Boolean
+    ): View {
+        return if (willLoadFromNetwork) {
+            val thumbnailView = SimpleDraweeView(context)
+            thumbnailView.hierarchy.actualImageScaleType = scaleType(scaleType)
+            thumbnailView
+        } else {
+            super.createThumbnailView(context, scaleType, false)
+        }
+    }
+
+    override fun loadThumbnailContent(view: View, thumbnail: Uri) {
+        if (view is SimpleDraweeView) {
+            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
+                .setUri(thumbnail)
+                .build()
+            view.controller = controller
+        }
+    }
+
+    private fun scaleType(value: Int): ScalingUtils.ScaleType {
+        return when (value) {
+            BigImageView.INIT_SCALE_TYPE_CENTER -> ScalingUtils.ScaleType.CENTER
+            BigImageView.INIT_SCALE_TYPE_CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
+            BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
+            BigImageView.INIT_SCALE_TYPE_FIT_END -> ScalingUtils.ScaleType.FIT_END
+            BigImageView.INIT_SCALE_TYPE_FIT_START -> ScalingUtils.ScaleType.FIT_START
+            BigImageView.INIT_SCALE_TYPE_FIT_XY -> ScalingUtils.ScaleType.FIT_XY
+            BigImageView.INIT_SCALE_TYPE_FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
+            else -> ScalingUtils.ScaleType.FIT_CENTER
+        }
+    }
+
+    private fun scaleType(scaleType: ImageView.ScaleType): ScalingUtils.ScaleType {
+        return when (scaleType) {
+            ImageView.ScaleType.CENTER -> ScalingUtils.ScaleType.CENTER
+            ImageView.ScaleType.CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
+            ImageView.ScaleType.CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
+            ImageView.ScaleType.FIT_END -> ScalingUtils.ScaleType.FIT_END
+            ImageView.ScaleType.FIT_START -> ScalingUtils.ScaleType.FIT_START
+            ImageView.ScaleType.FIT_XY -> ScalingUtils.ScaleType.FIT_XY
+            ImageView.ScaleType.FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
+            else -> ScalingUtils.ScaleType.FIT_CENTER
+        }
+    }
 }

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

@@ -18,32 +18,35 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.net.Uri
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
+import com.github.piasy.biv.view.BigImageView
-import com.bumptech.glide.load.engine.DiskCacheStrategy
+import xyz.quaver.pupil.R
-import xyz.quaver.pupil.BuildConfig
 
-class ThumbnailAdapter(private val glide: RequestManager, var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
+class ThumbnailAdapter(var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
 
-    class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
+    class ViewHolder(val view: BigImageView) : RecyclerView.ViewHolder(view) {
+        fun clear() {
+            view.ssiv?.recycle()
+        }
+    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ImageView(parent.context))
+        return ViewHolder(BigImageView(parent.context).apply {
+            setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+        })
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        glide
+        holder.view.showImage(Uri.parse(thumbnails[position]))
-            .load(thumbnails[position])
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .apply {
-                if (BuildConfig.CENSOR)
-                    override(5, 8)
-            }
-            .into(holder.view)
     }
 
     override fun getItemCount() = thumbnails.size
 
+    override fun onViewRecycled(holder: ViewHolder) {
+        holder.clear()
+    }
+
 }

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

@@ -21,17 +21,19 @@ package xyz.quaver.pupil.adapters
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
 import kotlin.math.min
 
-class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
+class ThumbnailPageAdapter(private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
 
     class ViewHolder(val view: RecyclerView) : RecyclerView.ViewHolder(view)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return ViewHolder(RecyclerView(parent.context).apply {
-            layoutManager = GridLayoutManager(parent.context, 3)
+            val layoutManager = GridLayoutManager(parent.context, 3)
-            adapter = ThumbnailAdapter(glide, listOf())
+            val adapter = ThumbnailAdapter(listOf())
+
+            this.layoutManager = layoutManager
+            this.adapter = adapter
             layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
         })
     }
@@ -41,7 +43,7 @@ class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbn
             thumbnails = this@ThumbnailPageAdapter.thumbnails.slice(9*position until min(9*position+9, this@ThumbnailPageAdapter.thumbnails.size))
             notifyDataSetChanged()
 
-            holder.view.layoutManager?.scrollToPosition(itemCount-1)
+            (holder.view.layoutManager as GridLayoutManager).scrollToPosition(8)
         }
     }
 

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

@@ -32,7 +32,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.cardview.widget.CardView
 import androidx.core.view.GravityCompat
-import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
@@ -156,7 +155,7 @@ class MainActivity :
     override fun onDestroy() {
         super.onDestroy()
 
-        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.update = false
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -263,11 +262,7 @@ class MainActivity :
                     if (it?.isEmpty() == false) {
                         val galleryID = it.random()
 
-                        GalleryDialog(
+                        GalleryDialog(this@MainActivity, galleryID).apply {
-                            this@MainActivity,
-                            Glide.with(this@MainActivity),
-                            galleryID
-                        ).apply {
                             onChipClickedHandler.add {
                                 runOnUiThread {
                                     query = it.toQuery()
@@ -318,7 +313,7 @@ class MainActivity :
     @SuppressLint("ClickableViewAccessibility")
     private fun setupRecyclerView() {
         with(main_recyclerview) {
-            adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
+            adapter = GalleryBlockAdapter(galleries).apply {
                 onChipClickedHandler.add {
                     runOnUiThread {
                         query = it.toQuery()
@@ -381,11 +376,7 @@ class MainActivity :
 
                     val galleryID = galleries[position]
 
-                    GalleryDialog(
+                    GalleryDialog(this@MainActivity, galleryID).apply {
-                        this@MainActivity,
-                        Glide.with(this@MainActivity),
-                        galleryID
-                    ).apply {
                         onChipClickedHandler.add {
                             runOnUiThread {
                                 query = it.toQuery()
@@ -984,14 +975,4 @@ class MainActivity :
             }
         }
     }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        Glide.get(this).onLowMemory()
-    }
-
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        Glide.get(this).onTrimMemory(level)
-    }
 }

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

@@ -43,7 +43,6 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.Glide
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.mlkit.vision.face.Face
@@ -99,7 +98,6 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    private val timer = Timer()
     private val snapHelper = PagerSnapHelper()
     private var menu: Menu? = null
 
@@ -239,8 +237,7 @@ class ReaderActivity : BaseActivity() {
     override fun onDestroy() {
         super.onDestroy()
 
-        timer.cancel()
+        update = false
-        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
     }
 
     override fun onBackPressed() {
@@ -275,44 +272,53 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
+    private var update = true
     private fun initDownloadListener() {
-        timer.schedule(1000, 1000) {
+        CoroutineScope(Dispatchers.Main).launch {
-            val downloader = downloader ?: return@schedule
+            while (update) {
+                delay(1000)
 
-            if (!downloader.progress.containsKey(galleryID))  //loading
+                val downloader = downloader ?: continue
-                return@schedule
 
-            if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
+                if (!downloader.progress.containsKey(galleryID))  //loading
-                timer.cancel()
+                    continue
-                Snackbar
-                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                    .show()
-            }
 
-            histories.add(galleryID)
+                if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
+                    update = false
+                    Snackbar
+                        .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                        .show()
+
+                    return@launch
+                }
+
+                histories.add(galleryID)
 
-            runOnUiThread {
                 reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
+                reader_download_progressbar.progress =
+                    downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
 
                 if (title == getString(R.string.reader_loading)) {
                     val reader = cache.metadata.reader
 
                     if (reader != null) {
-                        with (reader_recyclerview.adapter as ReaderAdapter) {
+                        with(reader_recyclerview.adapter as ReaderAdapter) {
                             this.reader = reader
                             notifyDataSetChanged()
                         }
 
                         title = reader.galleryInfo.title
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
+                        menu?.findItem(R.id.reader_menu_page_indicator)?.title =
+                            "$currentPage/${reader.galleryInfo.files.size}"
 
-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
+                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(
+                            this@ReaderActivity,
                             when (reader.code) {
                                 Code.HITOMI -> R.drawable.hitomi
                                 Code.HIYOBI -> R.drawable.ic_hiyobi
                                 else -> android.R.color.transparent
-                            })
+                            }
+                        )
                     }
                 }
 
@@ -602,14 +608,4 @@ class ReaderActivity : BaseActivity() {
             }
         }
     }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        Glide.get(this).onLowMemory()
-    }
-
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        Glide.get(this).onTrimMemory(level)
-    }
 }

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

@@ -20,16 +20,17 @@ package xyz.quaver.pupil.ui.dialog
 
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.LinearLayout.LayoutParams
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
-import com.bumptech.glide.RequestManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_gallery.*
 import kotlinx.android.synthetic.main.dialog_gallery_details.view.*
@@ -54,7 +55,7 @@ import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 
-class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : AlertDialog(context) {
+class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(context) {
 
     val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
 
@@ -105,12 +106,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                         }
                     }
 
-                    glide
+                    gallery_cover.showImage(Uri.parse(gallery.cover))
-                        .load(gallery.cover)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }.into(gallery_cover)
 
                     addDetails(gallery)
                     addThumbnails(gallery)
@@ -195,7 +191,8 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
             gallery_details.setText(R.string.gallery_thumbnails)
 
             val pager = ViewPager2(context).apply {
-                adapter = ThumbnailPageAdapter(glide, gallery.thumbnails)
+                adapter = ThumbnailPageAdapter(gallery.thumbnails)
+                layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
             }
 
             gallery_details_contents.addView(
@@ -215,7 +212,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
         val inflater = LayoutInflater.from(context)
         val galleries = ArrayList<Int>()
 
-        val adapter = GalleryBlockAdapter(glide, galleries).apply {
+        val adapter = GalleryBlockAdapter(galleries).apply {
             onChipClickedHandler.add { tag ->
                 this@GalleryDialog.onChipClickedHandler.forEach { handler ->
                     handler.invoke(tag)
@@ -238,11 +235,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                         histories.add(galleries[position])
                     }
                     onItemLongClickListener = { _, position, _ ->
-                        GalleryDialog(
+                        GalleryDialog(context, galleries[position]).apply {
-                            context,
-                            glide,
-                            galleries[position]
-                        ).apply {
                             onChipClickedHandler.add { tag ->
                                 this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
                             }

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -20,6 +20,7 @@ package xyz.quaver.pupil.util.downloader
 
 import android.content.Context
 import android.content.ContextWrapper
+import android.net.Uri
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -131,8 +132,8 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
     }
 
     @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): ByteArray? =
+    suspend fun getThumbnail(): Uri? =
-        findFile(".thumbnail")?.readBytes()
+        findFile(".thumbnail")?.uri
             ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
                 kotlin.runCatching {
                     val request = Request.Builder()
@@ -140,9 +141,9 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                         .build()
 
                     client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
-                }.getOrNull()?.also { kotlin.run {
+                }.getOrNull()?.let { thumbnail -> kotlin.runCatching {
-                    cacheFolder.getChild(".thumbnail").writeBytes(it)
+                    cacheFolder.getChild(".thumbnail").also { it.writeBytes(thumbnail) }
-                } }
+                }.getOrNull()?.uri }
             } }
 
     suspend fun getReader(): Reader? {

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

@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:padding="8dp">
 
-                <ImageView
+                <com.github.piasy.biv.view.BigImageView
                     android:id="@+id/gallery_cover"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"

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

@@ -107,7 +107,7 @@
 
 			</FrameLayout>
 
-			<ImageView
+			<com.github.piasy.biv.view.BigImageView
 				android:id="@+id/galleryblock_thumbnail"
 				android:layout_width="150dp"
 				android:layout_height="0dp"

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

@@ -60,20 +60,11 @@
         android:visibility="visible"
         app:constraint_referenced_ids="reader_item_progressbar, reader_index"/>
 
-    <androidx.constraintlayout.widget.Placeholder
-        android:id="@+id/placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
     <com.github.piasy.biv.view.BigImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
-        android:adjustViewBounds="true"
         app:initScaleType="fitCenter"
-        app:failureImage="@drawable/image_broken_variant"
         app:optimizeDisplay="true"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>

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

@@ -10,4 +10,6 @@
 
 	<dimen name="thumb_width">24dp</dimen>
 	<dimen name="thumb_height">72dp</dimen>
+
+	<dimen name="thumbnail_page_height">300dp</dimen>
 </resources>