hotfix

2020-02-10 12:17:05 +09:00
parent d93e7f8834
commit c1a71b0db3
18 changed files with 410 additions and 531 deletions
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -71,44 +71,46 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
        var timerTask: TimerTask? = null

-        fun updateProgress(context: Context, galleryID: Int) = CoroutineScope(Dispatchers.Main).launch {
+        private fun updateProgress(context: Context, galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
            val cache = Cache(context).getCachedGallery(galleryID)
            val reader = Cache(context).getReaderOrNull(galleryID)

-            if (reader == null) {
-                view.galleryblock_progressbar.visibility = View.GONE
-                view.galleryblock_progress_complete.visibility = View.GONE
-                return@launch
-            }
-
-            with(view.galleryblock_progressbar) {
-
-                progress = cache?.listFiles()?.count { file ->
-                    Regex("^[0-9]+.+\$").matches(file.name!!)
-                } ?: 0
-
-                if (visibility == View.GONE) {
-                    visibility = View.VISIBLE
-                    max = reader.galleryInfo.size
+            launch(Dispatchers.Main) main@{
+                if (reader == null) {
+                    view.galleryblock_progressbar.visibility = View.GONE
+                    view.galleryblock_progress_complete.visibility = View.GONE
+                    return@main
                }

-                if (progress == max) {
-                    if (completeFlag.get(galleryID, false)) {
-                        with(view.galleryblock_progress_complete) {
-                            setImageResource(R.drawable.ic_progressbar)
-                            visibility = View.VISIBLE
-                        }
-                    } else {
-                        with(view.galleryblock_progress_complete) {
-                            setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
-                                this?.start()
-                            })
-                            visibility = View.VISIBLE
-                        }
-                        completeFlag.put(galleryID, true)
+                with(view.galleryblock_progressbar) {
+
+                    progress = cache.listFiles()?.count { file ->
+                        Regex("^[0-9]+.+\$").matches(file.name)
+                    } ?: 0
+
+                    if (visibility == View.GONE) {
+                        visibility = View.VISIBLE
+                        max = reader.galleryInfo.size
                    }
-                } else
-                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
+
+                    if (progress == max) {
+                        if (completeFlag.get(galleryID, false)) {
+                            with(view.galleryblock_progress_complete) {
+                                setImageResource(R.drawable.ic_progressbar)
+                                visibility = View.VISIBLE
+                            }
+                        } else {
+                            with(view.galleryblock_progress_complete) {
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
+                                    this?.start()
+                                })
+                                visibility = View.VISIBLE
+                            }
+                            completeFlag.put(galleryID, true)
+                        }
+                    } else
+                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
+                }
            }
        }

@@ -152,10 +154,10 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                val cache = Cache(context).getCachedGallery(galleryBlock.id)
                val reader = Cache(context).getReaderOrNull(galleryBlock.id)

-                if (cache != null && reader != null) {
-                    val count = cache.listFiles().count {
-                        Regex("^[0-9]+.+\$").matches(it.name!!)
-                    }
+                if (reader != null) {
+                    val count = cache.listFiles()?.count {
+                        Regex("^[0-9]+.+\$").matches(it.name)
+                    } ?: 0

                    with(galleryblock_progressbar) {
                        max = reader.galleryInfo.size
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -25,6 +25,9 @@ import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.bumptech.glide.ListPreloader
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.crashlytics.android.Crashlytics
 import io.fabric.sdk.android.Fabric
@@ -37,6 +40,7 @@ import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.download.DownloadWorker
+import java.io.File
 import java.util.*
 import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
@@ -44,12 +48,48 @@ import kotlin.math.roundToInt
 class ReaderAdapter(private val context: Context,
                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {

-    var isFullScreen = false
+    //region Glide.RecyclerView
+    inner class SizeProvider : ListPreloader.PreloadSizeProvider<File> {
+
+        override fun getPreloadSize(item: File, adapterPosition: Int, itemPosition: Int): IntArray? {
+            return Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.getOrNull(itemPosition)?.let {
+                arrayOf(it.width, it.height).toIntArray()
+            }
+        }
+
+    }
+
+    inner class ModelProvider : ListPreloader.PreloadModelProvider<File> {
+
+        override fun getPreloadItems(position: Int): MutableList<File> {
+            return listOf(Cache(context).getImages(galleryID)?.get(position)).filterNotNullTo(mutableListOf())
+        }
+
+        override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
+            return glide
+                .load(item)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(true)
+                .error(R.drawable.image_broken_variant)
+                .apply {
+                    if (BuildConfig.CENSOR)
+                        override(5, 8)
+                }
+        }
+
+    }
+    //endregion

    var reader: Reader? = null
-    private val glide = Glide.with(context)
+    val glide = Glide.with(context)
    val timer = Timer()

+    val sizeProvider = SizeProvider()
+    val modelProvider = ModelProvider()
+    val preloader = RecyclerViewPreloader<File>(glide, modelProvider, sizeProvider, 10)
+
+    var isFullScreen = false
+
    var onItemClickListener : ((Int) -> (Unit))? = null

    init {
@@ -92,46 +132,47 @@ class ReaderAdapter(private val context: Context,

        holder.view.reader_index.text = (position+1).toString()

-        val images = Cache(context).getImages(galleryID)
+        CoroutineScope(Dispatchers.IO).launch {
+            val images = Cache(context).getImages(galleryID)

-        if (images?.get(position) != null) {
-            glide
-                .load(images[position]?.uri)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .error(R.drawable.image_broken_variant)
-                .apply {
-                    if (BuildConfig.CENSOR)
-                        override(5, 8)
-                }
-                .into(holder.view.image)
-        } else {
-            val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)
+            launch(Dispatchers.Main) {
+                if (images?.get(position) != null) {
+                    glide
+                        .load(images[position])
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .skipMemoryCache(true)
+                        .error(R.drawable.image_broken_variant)
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                        }
+                        .into(holder.view.image)
+                } else {
+                    val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)

-            if (progress?.isNaN() == true) {
+                    if (progress?.isNaN() == true) {

-                if (Fabric.isInitialized())
-                    Crashlytics.logException(DownloadWorker.getInstance(context).exception[galleryID]?.get(position))
+                        if (Fabric.isInitialized())
+                            Crashlytics.logException(DownloadWorker.getInstance(context).exception[galleryID]?.get(position))

-                glide
-                    .load(R.drawable.image_broken_variant)
-                    .into(holder.view.image)
+                        glide
+                            .load(R.drawable.image_broken_variant)
+                            .into(holder.view.image)
+                    } else {
+                        holder.view.reader_item_progressbar.progress =
+                            if (progress?.isInfinite() == true)
+                                100
+                            else
+                                progress?.roundToInt() ?: 0

-                return
-            }
+                        holder.view.image.setImageDrawable(null)
+                    }

-            holder.view.reader_item_progressbar.progress =
-                if (progress?.isInfinite() == true)
-                    100
-                else
-                    progress?.roundToInt() ?: 0
-
-            holder.view.image.setImageDrawable(null)
-
-
-            timer.schedule(1000) {
-                CoroutineScope(Dispatchers.Main).launch {
-                    notifyItemChanged(position)
+                    timer.schedule(1000) {
+                        CoroutineScope(Dispatchers.Main).launch {
+                            notifyItemChanged(position)
+                        }
+                    }
                }
            }
        }