Image loading optimized

Adds gallery to history when opened directly by gallery ID Fixed blurred image
2019-07-11 21:24:25 +09:00
parent efc50df243
commit 480d4b1e9a
12 changed files with 33 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@

 #Github pages
 /gh-pages
+
+#Private files
+/app/google-services.json
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
        targetSdkVersion 29
-        versionCode 23
-        versionName "3.0.2"
+        versionCode 25
+        versionName "3.1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
        vectorDrawables.useSupportLibrary = true
@@ -44,7 +44,7 @@ dependencies {
    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0"
    implementation 'androidx.appcompat:appcompat:1.0.2'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.0-beta01'
+    implementation 'androidx.preference:preference:1.1.0-rc01'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "844152206517",
-    "firebase_url": "https://pupil-88795.firebaseio.com",
-    "project_id": "pupil-88795",
-    "storage_bucket": "pupil-88795.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:844152206517:android:ed7bdde2b57d6448",
-        "android_client_info": {
-          "package_name": "xyz.quaver.pupil"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "844152206517-5t8c3marg1hio8fotsip4s6qvs9bhrj0.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyC47pCfQRw9D6bkdQzMSuCJ0xY52vK7Q8w"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "844152206517-5t8c3marg1hio8fotsip4s6qvs9bhrj0.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":23,"versionName":"3.0.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":25,"versionName":"3.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -32,6 +32,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
@@ -54,7 +55,7 @@ import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.concurrent.schedule

-class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {

    enum class ViewType {
        NEXT,
@@ -65,7 +66,7 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
    private lateinit var favorites: Histories

    inner class GalleryViewHolder(val view: CardView) : RecyclerView.ViewHolder(view) {
-        fun bind(holder: GalleryViewHolder, item: Pair<GalleryBlock, Deferred<String>>) {
+        fun bind(item: Pair<GalleryBlock, Deferred<String>>) {
            with(view) {
                val resources = context.resources
                val languages = resources.getStringArray(R.array.languages).map {
@@ -82,7 +83,7 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
                CoroutineScope(Dispatchers.Main).launch {
                    val cache = thumbnail.await()

-                    Glide.with(holder.view)
+                    glide
                        .load(cache)
                        .skipMemoryCache(true)
                        .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -354,7 +355,7 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre

    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        if (holder is GalleryViewHolder)
-            holder.bind(holder, galleries[position-(if (showPrev) 1 else 0)])
+            holder.bind(galleries[position-(if (showPrev) 1 else 0)])
    }

    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -23,12 +23,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
-import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import xyz.quaver.pupil.R

-class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+class ReaderAdapter(private val glide: RequestManager, private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {

    var isFullScreen = false

@@ -43,18 +42,12 @@ class ReaderAdapter(private val images: List<String>) : RecyclerView.Adapter<Rea
    }

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val progressDrawable = CircularProgressDrawable(holder.view.context).apply {
-            strokeWidth = 10f
-            centerRadius = 100f
-            start()
-        }
-
-        Glide.with(holder.view)
+        glide
            .load(images[position])
            .diskCacheStrategy(DiskCacheStrategy.NONE)
            .skipMemoryCache(true)
-            .placeholder(progressDrawable)
            .error(R.drawable.image_broken_variant)
+            .dontTransform()
            .into(holder.view as ImageView)
    }

--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -42,7 +42,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
 import androidx.preference.PreferenceManager
@@ -50,6 +49,7 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
+import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.*
@@ -435,7 +435,6 @@ class MainActivity : AppCompatActivity() {
                        runOnUiThread {
                            cancelFetch()
                            clearGalleries()
-                            fetchGalleries(query, sortMode)
                            loadBlocks()
                        }
                    }
@@ -461,6 +460,8 @@ class MainActivity : AppCompatActivity() {
                                intent.putExtra("galleryID", gallery.id)

                                startActivity(intent)
+
+                                histories.add(gallery.id)
                            } catch (e: Exception) {
                                Snackbar.make(main_layout,
                                    R.string.main_open_gallery_by_id_error, Snackbar.LENGTH_LONG).show()
@@ -479,7 +480,7 @@ class MainActivity : AppCompatActivity() {

    private fun setupRecyclerView() {
        with(main_recyclerview) {
-            adapter = GalleryBlockAdapter(galleries).apply {
+            adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
                onChipClickedHandler.add {
                    runOnUiThread {
                        query = it.toQuery()
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -31,6 +31,7 @@ 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.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_reader.*
@@ -307,7 +308,7 @@ class ReaderActivity : AppCompatActivity() {

    private fun initView() {
        with(reader_recyclerview) {
-            adapter = ReaderAdapter(images)
+            adapter = ReaderAdapter(Glide.with(this@ReaderActivity), images)

            addOnScrollListener(object: RecyclerView.OnScrollListener() {
                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -27,6 +27,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.preference.PreferenceManager
+import com.crashlytics.android.Crashlytics
 import kotlinx.coroutines.*
 import kotlinx.io.IOException
 import kotlinx.serialization.json.Json
@@ -134,14 +135,11 @@ class GalleryDownloader(
                //Cache doesn't exist. Load from internet
                val reader = when {
                    useHiyobi -> {
-                        xyz.quaver.hiyobi.getReader(galleryID).let {
-                            when {
-                                it.readerItems.isEmpty() -> {
-                                    useHiyobi = false
-                                    getReader(galleryID)
-                                }
-                                else -> it
-                            }
+                        try {
+                            xyz.quaver.hiyobi.getReader(galleryID)
+                        } catch(e: Exception) {
+                            useHiyobi = false
+                            getReader(galleryID)
                        }
                    }
                    else -> {
@@ -159,6 +157,7 @@ class GalleryDownloader(

                reader
            } catch (e: Exception) {
+                Crashlytics.logException(e)
                Reader("", listOf())
            }
        }
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
        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"
--- a/libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt
+++ b/libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt
@@ -70,7 +70,7 @@ class UnitTest {

    @Test
    fun test_getReader() {
-        val reader = getReader(1404693)
+        val reader = getReader(1442740)

        print(reader)
    }