Fixed bug for older devices

Hoping that the viewer crashing bug is fixed Version 2.11
2019-06-23 23:09:01 +09:00
parent a990f5d663
commit ad6c061b6b
27 changed files with 203 additions and 98 deletions
--- a/app/src/main/java/xyz/quaver/pupil/ui/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/Pupil.kt
@@ -1,14 +1,17 @@
-package xyz.quaver.pupil.ui
+package xyz.quaver.pupil

 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
-import xyz.quaver.pupil.R
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException
+import com.google.android.gms.common.GooglePlayServicesRepairableException
+import com.google.android.gms.security.ProviderInstaller
 import xyz.quaver.pupil.util.Histories
 import java.io.File

@@ -18,6 +21,10 @@ class Pupil : MultiDexApplication() {
    lateinit var downloads: Histories
    lateinit var favorites: Histories

+    init {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+    }
+
    override fun onCreate() {
        val preference = PreferenceManager.getDefaultSharedPreferences(this)

@@ -25,7 +32,13 @@ class Pupil : MultiDexApplication() {
        downloads = Histories(File(ContextCompat.getDataDir(this), "downloads.json"))
        favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))

-        super.onCreate()
+        try {
+            ProviderInstaller.installIfNeeded(this)
+        } catch (e: GooglePlayServicesRepairableException) {
+            e.printStackTrace()
+        } catch (e: GooglePlayServicesNotAvailableException) {
+            e.printStackTrace()
+        }

        if (!preference.getBoolean("channel_created", false)) {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -41,6 +54,8 @@ class Pupil : MultiDexApplication() {

            preference.edit().putBoolean("channel_created", true).apply()
        }
+
+        super.onCreate()
    }

 }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -2,7 +2,8 @@ package xyz.quaver.pupil.adapters

 import android.app.AlertDialog
 import android.graphics.BitmapFactory
-import android.graphics.drawable.Animatable
+import android.graphics.drawable.Drawable
+import android.util.Log
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
@@ -12,6 +13,7 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
@@ -24,7 +26,7 @@ import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.ReaderItem
-import xyz.quaver.pupil.ui.Pupil
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.Histories
@@ -68,7 +70,7 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre

                    val bitmap = BitmapFactory.decodeFile(thumbnail.await())

-                    post {
+                    launch(Dispatchers.Main) {
                        galleryblock_thumbnail.setImageBitmap(bitmap)
                    }
                }
@@ -118,12 +120,12 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                                                visibility = View.VISIBLE
                                            }
                                        } else {
-                                            val drawable = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete)
                                            with(view.galleryblock_progress_complete) {
-                                                setImageDrawable(drawable)
+                                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
+                                                    this?.start()
+                                                })
                                                visibility = View.VISIBLE
                                            }
-                                            drawable?.start()
                                            completeFlag.put(galleryBlock.id, true)
                                        }
                                    } else
@@ -250,19 +252,28 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                    favorites = (context.applicationContext as Pupil).favorites

                with(galleryblock_favorite) {
-                    post {
-                        isChecked = favorites.contains(galleryBlock.id)
-                    }
+                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
                    setOnClickListener {
                        when {
-                            isChecked -> favorites.add(galleryBlock.id)
-                            else -> favorites.remove(galleryBlock.id)
-                        }
-                    }
-                    setOnCheckedChangeListener { _, isChecked ->
-                        when {
-                            isChecked -> (background as Animatable).start()
-                            else -> background = AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star)
+                            favorites.contains(galleryBlock.id) -> {
+                                favorites.remove(galleryBlock.id)
+
+                                setImageResource(R.drawable.ic_star_empty)
+                            }
+                            else -> {
+                                favorites.add(galleryBlock.id)
+
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
+                                    this ?: return@apply
+
+                                    registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                                        override fun onAnimationEnd(drawable: Drawable?) {
+                                            setImageResource(R.drawable.ic_star_filled)
+                                        }
+                                    })
+                                    start()
+                                })
+                            }
                        }
                    }
                }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -1,6 +1,8 @@
 package xyz.quaver.pupil.adapters

+import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +12,8 @@ import xyz.quaver.pupil.R

 class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {

+    var isFullScreen = false
+
    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -21,19 +25,49 @@ class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<Rea
    }

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+
+        fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
+            // Raw height and width of image
+            val (height: Int, width: Int) = options.run { outHeight to outWidth }
+            var inSampleSize = 1
+
+            if (height > reqHeight || width > reqWidth) {
+
+                val halfHeight: Int = height / 2
+                val halfWidth: Int = width / 2
+
+                // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+                // height and width larger than the requested height and width.
+                while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
+                    inSampleSize *= 2
+                }
+            }
+
+            return inSampleSize
+        }
+
        with(holder.view as ImageView) {
            val options = BitmapFactory.Options()

            options.inJustDecodeBounds = true
            BitmapFactory.decodeFile(images[position], options)

-            options.inSampleSize = options.outWidth /
-                    context.resources.displayMetrics.widthPixels
+            val (reqWidth, reqHeight) = context.resources.displayMetrics.let {
+                Pair(it.widthPixels, it.heightPixels)
+            }
+
+            options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight)
+
+            options.inPreferredConfig = Bitmap.Config.RGB_565

            options.inJustDecodeBounds = false

            val image = BitmapFactory.decodeFile(images[position], options)

+            Log.d("Pupil", image.byteCount.toString())
+            Log.d("Pupil", "${image.width}x${image.height}")
+            Log.d("Pupil", "deviceWidth ${context.resources.displayMetrics.widthPixels}")
+
            setImageBitmap(image)
        }
    }
--- a/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
@@ -1,14 +1,12 @@
 package xyz.quaver.pupil.ui

 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.andrognito.patternlockview.PatternLockView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_lock.*
 import kotlinx.android.synthetic.main.fragment_pattern_lock.*
-import kotlinx.android.synthetic.main.settings_activity.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -42,6 +42,7 @@ import kotlinx.serialization.stringify
 import ru.noties.markwon.Markwon
 import xyz.quaver.hitomi.*
 import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.types.Tag
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -28,6 +28,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
 import xyz.quaver.pupil.util.GalleryDownloader
@@ -46,6 +47,8 @@ class ReaderActivity : AppCompatActivity() {
    set(value) {
        field = value

+        (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
+
        reader_progressbar.visibility = when {
            value -> View.VISIBLE
            else -> View.GONE
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -17,10 +17,12 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.dialog_default_query.view.*
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tags
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.getDownloadDirectory
 import java.io.File

 class SettingsActivity : AppCompatActivity() {
@@ -133,7 +135,7 @@ class SettingsActivity : AppCompatActivity() {
            with(findPreference<Preference>("delete_downloads")) {
                this!!

-                val dir = context.getExternalFilesDir("Pupil") ?: return@with
+                val dir = getDownloadDirectory(context)!!

                summary = getDirSize(dir)

--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -4,7 +4,6 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
-import android.util.Log
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -18,8 +17,8 @@ import kotlinx.serialization.list
 import xyz.quaver.hitomi.*
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.ui.Pupil
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.ui.ReaderActivity
 import java.io.File
 import java.io.FileOutputStream
@@ -218,7 +217,7 @@ class GalleryDownloader(
                if (download) {
                    File(cacheDir, "imageCache/${galleryBlock.id}").let {
                        if (it.exists()) {
-                            val target = File(getExternalFilesDir("Pupil"), galleryBlock.id.toString())
+                            val target = File(getDownloadDirectory(this@GalleryDownloader), galleryBlock.id.toString())

                            if (!target.exists())
                                target.mkdirs()
@@ -230,10 +229,10 @@ class GalleryDownloader(

                    notificationManager.notify(galleryBlock.id, notificationBuilder.build())

-                    onCompleteHandler?.invoke()
-
                    download = false
                }
+
+                onCompleteHandler?.invoke()
            }

            remove(galleryBlock.id)
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -1,15 +1,24 @@
 package xyz.quaver.pupil.util

 import android.content.Context
+import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
+import androidx.core.content.ContextCompat
 import java.io.File

 fun getCachedGallery(context: Context, galleryID: Int): File {
-    return File(context.getExternalFilesDir("Pupil"), galleryID.toString()).let {
+    return File(getDownloadDirectory(context), galleryID.toString()).let {
        when {
            it.exists() -> it
            else -> File(context.cacheDir, "imageCache/$galleryID")
        }
    }
+}
+
+fun getDownloadDirectory(context: Context): File? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        context.getExternalFilesDir("Pupil")
+    else
+        File(Environment.getExternalStorageDirectory(), "Pupil")
 }