Somewhat working

2020-09-27 14:29:02 +09:00
parent 1490035893
commit 7a9507be01
14 changed files with 255 additions and 8281 deletions
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/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.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 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 kotlin.concurrent.schedule
+import java.io.File
 import kotlin.math.roundToInt

-class ReaderAdapter(private val activity: ReaderActivity,
-                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+class ReaderAdapter(
+    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 {
-                when (it) {
-                    is SubsamplingScaleImageView ->
-                        it.recycle()
-                    is SimpleDraweeView ->
-                        it.controller = null
-                }
-            }
+            view.image.ssiv?.recycle()
        }
    }

@@ -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) {
-                image.setImageViewFactory(FrescoImageViewFactory())
-                image.setImageShownCallback(object: ImageShownCallback {
-                    override fun onThumbnailShown() {}
-                    override fun onMainImageShown() {
-                        placeholder.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                            dimensionRatio = null
+            with(it) {
+                image.setImageViewFactory(FrescoImageViewFactory().apply {
+                    updateView = { imageInfo ->
+                        it.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
                        }
                    }
                })
+                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)
-                ConstraintLayout.LayoutParams.MATCH_PARENT
-            else
-                ConstraintLayout.LayoutParams.WRAP_CONTENT
-
-        holder.view.image.layoutParams.height =
-            if (isFullScreen)
-                ConstraintLayout.LayoutParams.MATCH_PARENT
-            else
-                ConstraintLayout.LayoutParams.WRAP_CONTENT
-
-        holder.view.placeholder.updateLayoutParams<ConstraintLayout.LayoutParams> {
-            dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+        if (!isFullScreen) {
+            holder.view.setBackgroundResource(R.drawable.reader_item_boundary)
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = 0
+                dimensionRatio =
+                    "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            }
+        } else {
+            holder.view.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = ConstraintLayout.LayoutParams.MATCH_PARENT
+                dimensionRatio = null
+            }
+            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 {
-                    notifyItemChanged(position)
-                }
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(1000)
+                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
+        }
+    }
 }