Merge pull request #70 from tom5079/dev

Version 4.9
Merge pull request #69 from tom5079/dev
2020-02-24 21:11:03 +09:00 · 2020-02-24 20:48:55 +09:00 · 2020-02-24 12:49:56 +09:00
24 changed files with 138 additions and 129 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="RIGHT_MARGIN" value="120" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
    <JetCodeStyleSettings>
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="modules">
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
        targetSdkVersion 29
-        versionCode 46
-        versionName "4.10"
+        versionCode 45
+        versionName "4.9"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
        vectorDrawables.useSupportLibrary = true
@@ -74,12 +74,14 @@ dependencies {
    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
    implementation 'com.github.arimorty:floatingsearchview:2.1.1'
    implementation 'com.github.clans:fab:1.6.4'
+
    implementation 'com.github.bumptech.glide:glide:4.11.0'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
    kapt 'com.github.bumptech.glide:compiler:4.11.0'
    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
        transitive = false
    }
+
    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":46,"versionName":"4.10","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":45,"versionName":"4.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -105,9 +105,9 @@ class ExampleInstrumentedTest {
        val galleryID = 1561552

        runBlocking {
-            Log.i("PUPILD", Cache(context).getReader(galleryID)?.galleryInfo?.title ?: "null")
+            Log.i("PUPILD", Cache(context).getReader(galleryID)?.title ?: "null")
        }

-        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.title ?: "null")
+        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.title ?: "null")
    }
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

-
    <application
        android:name=".Pupil"
        android:allowBackup="true"
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -49,12 +49,13 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.Histories
 import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
 import xyz.quaver.pupil.util.wordCapitalize
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.concurrent.schedule

-class GalleryBlockAdapter(private val context: Context, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {

    enum class ViewType {
        NEXT,
@@ -67,12 +68,11 @@ class GalleryBlockAdapter(private val context: Context, private val galleries: L

    val timer = Timer()

-    var isThin = false
-
    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
        var timerTask: TimerTask? = null

        private fun updateProgress(context: Context, galleryID: Int) {
+            val cache = Cache(context).getCachedGallery(galleryID)
            val reader = Cache(context).getReaderOrNull(galleryID)

            CoroutineScope(Dispatchers.Main).launch {
@@ -84,7 +84,9 @@ class GalleryBlockAdapter(private val context: Context, private val galleries: L

                with(view.galleryblock_progressbar) {

-                    progress = Cache(context).getImages(galleryID)?.size ?: 0
+                    progress = cache.listFiles()?.count { file ->
+                        Regex("^[0-9]+.+\$").matches(file.name)
+                    } ?: 0

                    if (visibility == View.GONE) {
                        visibility = View.VISIBLE
@@ -124,10 +126,6 @@ class GalleryBlockAdapter(private val context: Context, private val galleries: L
                val artists = galleryBlock.artists
                val series = galleryBlock.series

-                if (isThin)
-                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
-                        R.dimen.galleryblock_thumbnail_thin
-                    )
                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
                    it.start()
                })
@@ -140,18 +138,16 @@ class GalleryBlockAdapter(private val context: Context, private val galleries: L
                            null
                    }

-                    galleryblock_thumbnail.post {
-                        glide
-                            .load(thumbnail)
-                            .skipMemoryCache(true)
-                            .diskCacheStrategy(DiskCacheStrategy.NONE)
-                            .error(R.drawable.image_broken_variant)
-                            .apply {
-                                if (BuildConfig.CENSOR)
-                                    override(5, 8)
-                            }
-                            .into(galleryblock_thumbnail)
-                    }
+                    glide
+                        .load(thumbnail)
+                        .skipMemoryCache(true)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .error(R.drawable.image_broken_variant)
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                        }
+                        .into(galleryblock_thumbnail)
                }

                //Check cache
@@ -268,14 +264,6 @@ class GalleryBlockAdapter(private val context: Context, private val galleries: L
                        }
                    }
                }
-
-
-                // Make some views invisible to make it thinner
-                if (isThin) {
-                    galleryblock_language.visibility = View.GONE
-                    galleryblock_type.visibility = View.GONE
-                    galleryblock_tag_group.visibility = View.GONE
-                }
            }
        }
    }
@@ -353,10 +341,10 @@ class GalleryBlockAdapter(private val context: Context, private val galleries: L
                    mItemManger.closeAllExcept(layout)

                    holder.view.galleryblock_download.text =
-                        if (Cache(context).isDownloading(gallery.id))
-                            holder.view.context.getString(android.R.string.cancel)
-                        else
+                        if (DownloadWorker.getInstance(holder.view.context).progress.indexOfKey(gallery.id) < 0)
                            holder.view.context.getString(R.string.main_download)
+                        else
+                            holder.view.context.getString(android.R.string.cancel)
                }

                override fun onClose(layout: SwipeLayout?) {}
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -100,9 +100,6 @@ class ReaderAdapter(private val context: Context,
        } else {
            holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
            holder.view.container.layoutParams.height = 0
-
-            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
        }

        holder.view.image.setOnPhotoTapListener { _, _, _ ->
@@ -113,6 +110,10 @@ class ReaderAdapter(private val context: Context,
            onItemClickListener?.invoke(position)
        }

+        if (!isFullScreen)
+            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+
        holder.view.reader_index.text = (position+1).toString()

        val images = Cache(context).getImage(galleryID, position)
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -330,13 +330,6 @@ class MainActivity : AppCompatActivity() {
            true
        }

-        with(main_fab_cancel) {
-            setImageResource(R.drawable.cancel)
-            setOnClickListener {
-                DownloadWorker.getInstance(context).stop()
-            }
-        }
-
        with(main_fab_jump) {
            setImageResource(R.drawable.ic_jump)
            setOnClickListener {
@@ -415,7 +408,7 @@ class MainActivity : AppCompatActivity() {
                    if (!completeFlag.get(galleryID, false)) {
                        val worker = DownloadWorker.getInstance(context)

-                        if (Cache(context).isDownloading(galleryID))     //download in progress
+                        if (worker.progress.indexOfKey(galleryID) >= 0)     //download in progress
                            worker.cancel(galleryID)
                        else {
                            Cache(context).setDownloading(galleryID, true)
@@ -731,15 +724,6 @@ class MainActivity : AppCompatActivity() {
            setOnMenuItemClickListener {
                when(it.itemId) {
                    R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), REQUEST_SETTINGS)
-                    R.id.main_menu_thin -> {
-                        main_recyclerview.apply {
-                            (adapter as GalleryBlockAdapter).apply {
-                                isThin = !isThin
-                            }
-
-                            adapter = adapter       // Force to redraw
-                        }
-                    }
                    R.id.main_menu_sort_newest -> {
                        sortMode = SortMode.NEWEST
                        it.isChecked = true
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -361,8 +361,6 @@ class ReaderActivity : AppCompatActivity() {

            window.attributes = this
        }
-
-        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
    }

    private fun scrollMode(isScroll: Boolean) {
@@ -388,7 +386,7 @@ class ReaderActivity : AppCompatActivity() {
                        if (worker.progress[galleryID]?.all { !it.isFinite() } == true) // If download is finished, stop animating
                            post {
                                setImageResource(R.drawable.ic_download)
-                                labelText = getString(R.string.reader_fab_download_cancel)
+                                labelText = getString(R.string.reader_fab_download)
                            }
                        else                                                            // Or continue animate
                            post {
--- a/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
@@ -21,19 +21,21 @@ package xyz.quaver.pupil.util.download
 import android.content.Context
 import android.content.ContextWrapper
 import android.util.Base64
-import android.util.Log
 import android.util.SparseArray
 import androidx.preference.PreferenceManager
 import com.crashlytics.android.Crashlytics
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
 import kotlinx.io.InputStream
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.proxy
+import xyz.quaver.pupil.util.copyRecursively
 import xyz.quaver.pupil.util.getCachedGallery
 import xyz.quaver.pupil.util.getDownloadDirectory
-import xyz.quaver.pupil.util.isParentOf
 import xyz.quaver.pupil.util.json
 import java.io.File
 import java.io.FileOutputStream
@@ -245,27 +247,15 @@ class Cache(context: Context) : ContextWrapper(context) {
        }
    }

-    fun moveToDownload(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
+    fun moveToDownload(galleryID: Int) {
        val cache = getCachedGallery(galleryID).also {
            if (!it.exists())
-                return@launch
+                return
        }
-        val download = File(getDownloadDirectory(this@Cache), galleryID.toString())
+        val download = File(getDownloadDirectory(this), galleryID.toString())

-        if (download.isParentOf(cache))
-            return@launch
-
-        Log.i("PUPILD", "MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
-
-        cache.copyRecursively(download, true) { file, err ->
-            Log.i("PUPILD", "MOVING ERROR ${file.canonicalPath} ${err.message}")
-            OnErrorAction.SKIP
-        }
-        Log.i("PUPILD", "MOVED ${cache.canonicalPath}")
-
-        Log.i("PUPILD", "DELETING ${cache.canonicalPath}")
+        cache.copyRecursively(download, true) { _, _ -> OnErrorAction.SKIP }
        cache.deleteRecursively()
-        Log.i("PUPILD", "DELETED ${cache.canonicalPath}")
    }

    fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true
--- a/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
@@ -149,6 +149,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont

    private val loop = loop()
    private val worker = SparseArray<Job?>()
+    val clients = SparseArray<OkHttpClient>()

    val interceptor = Interceptor { chain ->
        val request = chain.request()
@@ -158,7 +159,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
            .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
            .build()
    }
-    val client =
+    fun buildClient() =
        OkHttpClient.Builder()
            .addInterceptor(interceptor)
            .connectTimeout(0, TimeUnit.SECONDS)
@@ -171,14 +172,17 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
        queue.clear()

        loop.cancel()
-        for (i in 0 until worker.size()) {
+        for (i in 0..worker.size()) {
            val galleryID = worker.keyAt(i)

            Cache(this@DownloadWorker).setDownloading(galleryID, false)
            worker[galleryID]?.cancel()
        }

-        client.dispatcher().cancelAll()
+        for (i in 0 until clients.size()) {
+            clients.valueAt(i).dispatcher().cancelAll()
+        }
+        clients.clear()

        progress.clear()
        exception.clear()
@@ -190,19 +194,17 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
        queue.remove(galleryID)
        worker[galleryID]?.cancel()

-        client.dispatcher().queuedCalls().filter {
-            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
-        }.forEach {
-            it.cancel()
-        }
+        clients[galleryID]?.dispatcher()?.cancelAll()
+        clients.remove(galleryID)

        progress.remove(galleryID)
        exception.remove(galleryID)
        notification.remove(galleryID)
        notificationManager.cancel(galleryID)

-        if (progress.indexOfKey(galleryID) >= 0)
+        if (progress.indexOfKey(galleryID) >= 0) {
            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+        }
    }

    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { !it.isFinite() } == true
@@ -234,7 +236,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
            tag(galleryID to index)
        }.build()

-        client.newCall(request).enqueue(callback)
+        if (clients.get(galleryID) == null)
+            clients.put(galleryID, buildClient())
+
+        clients[galleryID]?.newCall(request)?.enqueue(callback)
    }

    private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
@@ -289,7 +294,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                    notify(galleryID)

                    CoroutineScope(Dispatchers.IO).launch {
-                        if (isCompleted(galleryID)) {
+                        if (isCompleted(galleryID) && clients.indexOfKey(galleryID) >= 0) {
+                            clients.remove(galleryID)
                            with(Cache(this@DownloadWorker)) {
                                if (isDownloading(galleryID)) {
                                    moveToDownload(galleryID)
@@ -314,7 +320,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                        notify(galleryID)

                        CoroutineScope(Dispatchers.IO).launch {
-                            if (isCompleted(galleryID)) {
+                            if (isCompleted(galleryID) && clients.indexOfKey(galleryID) >= 0) {
+                                clients.remove(galleryID)
                                with(Cache(this@DownloadWorker)) {
                                    if (isDownloading(galleryID)) {
                                        moveToDownload(galleryID)
@@ -333,7 +340,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                        notify(galleryID)

                        CoroutineScope(Dispatchers.IO).launch {
-                            if (isCompleted(galleryID)) {
+                            if (isCompleted(galleryID) && clients.indexOfKey(galleryID) >= 0) {
+                                clients.remove(galleryID)
                                with(Cache(this@DownloadWorker)) {
                                    if (isDownloading(galleryID)) {
                                        moveToDownload(galleryID)
@@ -410,7 +418,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont

            val galleryID = queue.peek() ?: continue

-            if (progress.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
+            if (clients.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
                continue

            if (notification[galleryID] == null)
@@ -419,7 +427,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
            if (Cache(this@DownloadWorker).isDownloading(galleryID))
                notificationManager.notify(galleryID, notification[galleryID].build())

-            Log.i("PUPILD", "QUEUED $galleryID")
+            if (clients.size() >= preferences.getInt("max_download", 4))
+                continue
+
+            Log.i("PUPILD", "QUEUED $galleryID #${clients.size()+1}")

            worker.put(galleryID, download(galleryID))
            queue.poll()
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -26,6 +26,7 @@ import android.os.storage.StorageManager
 import android.provider.DocumentsContract
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
+import kotlinx.io.IOException
 import java.io.File
 import java.io.FileOutputStream
 import java.lang.reflect.Array
@@ -213,5 +214,64 @@ fun Uri.toFile(context: Context): File? {
    return File(context.getExternalFilesDir(null)?.canonicalPath?.substringBeforeLast("/Android/data") ?: return null, folderName)
 }

-fun File.isParentOf(another: File) =
-    another.absolutePath.startsWith(this.absolutePath)
+fun File.copyRecursively(
+    target: File,
+    overwrite: Boolean = false,
+    onError: (File, IOException) -> OnErrorAction = { _, exception -> throw exception }
+): Boolean {
+    if (!exists()) {
+        return onError(this, NoSuchFileException(file = this, reason = "The source file doesn't exist.")) !=
+                OnErrorAction.TERMINATE
+    }
+    try {
+        // We cannot break for loop from inside a lambda, so we have to use an exception here
+        for (src in walkTopDown().onFail { f, e -> if (onError(f, e) == OnErrorAction.TERMINATE) throw IOException("Walk failed") }) {
+            if (!src.exists()) {
+                if (onError(src, NoSuchFileException(file = src, reason = "The source file doesn't exist.")) ==
+                    OnErrorAction.TERMINATE)
+                    return false
+            } else {
+                val relPath = src.toRelativeString(this)
+                val dstFile = File(target, relPath)
+                if (dstFile.exists() && !(src.isDirectory && dstFile.isDirectory)) {
+                    val stillExists = if (!overwrite) true else {
+                        if (dstFile.isDirectory)
+                            !dstFile.deleteRecursively()
+                        else
+                            !dstFile.delete()
+                    }
+
+                    if (stillExists) {
+                        if (onError(dstFile, FileAlreadyExistsException(file = src,
+                                other = dstFile,
+                                reason = "The destination file already exists.")) == OnErrorAction.TERMINATE)
+                            return false
+
+                        continue
+                    }
+                }
+
+                if (src.isDirectory) {
+                    dstFile.mkdirs()
+                } else {
+                    val length = try {
+                        src.copyTo(dstFile, overwrite).length()
+                    } catch (e: IOException) {
+                        if (onError(src, e) == OnErrorAction.TERMINATE)
+                            return false
+                        else
+                            -1
+                    }
+
+                    if (length != src.length()) {
+                        if (onError(src, IOException("Source file wasn't copied completely, length of destination file differs.")) == OnErrorAction.TERMINATE)
+                            return false
+                    }
+                }
+            }
+        }
+        return true
+    } catch (e: IOException) {
+        return false
+    }
+}
--- a/app/src/main/res/drawable/cancel.xml
+++ b/app/src/main/res/drawable/cancel.xml
@@ -1,8 +0,0 @@
-<!-- drawable/cancel.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12C4,13.85 4.63,15.55 5.68,16.91L16.91,5.68C15.55,4.63 13.85,4 12,4M12,20A8,8 0 0,0 20,12C20,10.15 19.37,8.45 18.32,7.09L7.09,18.32C8.45,19.37 10.15,20 12,20Z" />
-</vector>
--- a/app/src/main/res/drawable/img_thumbnail.jpg
+++ b/app/src/main/res/drawable/img_thumbnail.jpg
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -82,13 +82,6 @@
                android:layout_margin="16dp"
                app:menu_colorNormal="@color/colorAccent">

-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/main_fab_cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_label="@string/main_fab_cancel"
-                app:fab_size="mini"/>
-
            <com.github.clans.fab.FloatingActionButton
                android:id="@+id/main_fab_jump"
                android:layout_width="wrap_content"
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -20,9 +20,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">

-	<item android:id="@+id/main_menu_thin"
-		android:title="@string/main_menu_thin"/>
-
 	<item
 		android:id="@+id/main_menu_sort"
 		android:title="@string/main_menu_sort">
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -130,6 +130,4 @@
    <string name="proxy_dialog_error">エラー</string>
    <string name="proxy_dialog_addr_hint">サーバーアドレス</string>
    <string name="proxy_dialog_server">サーバー</string>
-    <string name="main_menu_thin">簡単モード</string>
-    <string name="main_fab_cancel">すべてのダウンロードキャンセル</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -130,6 +130,4 @@
    <string name="proxy_dialog_error">잘못된 값</string>
    <string name="proxy_dialog_addr_hint">서버 주소</string>
    <string name="proxy_dialog_server">서버</string>
-    <string name="main_menu_thin">간단히 보기 모드</string>
-    <string name="main_fab_cancel">다운로드 모두 취소</string>
 </resources>
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -11,6 +11,6 @@

 	<dimen name="thumbnail_margin">8dp</dimen>

-	<dimen name="galleryblock_thumbnail_thin">100dp</dimen>
+	<dimen name="galleryblock_thumbnail_thin">50dp</dimen>
 	<dimen name="galleryblock_thumbnail_normal">150dp</dimen>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,8 +53,6 @@
    <string name="main_drawer_group_contact_email">Email me!</string>
    <string name="main_drawer_grouop_contact_discord">Discord</string>

-    <string name="main_menu_thin">Toggle Thin Mode</string>
-
    <string name="main_menu_sort">Sort</string>
    <string name="main_menu_sort_newest">Newest</string>
    <string name="main_menu_sort_popular">Popular</string>
@@ -63,7 +61,6 @@
    <string name="main_jump_message">Current page: %1$d\nMaximum page: %2$d</string>
    <string name="main_open_gallery_by_id">Open Gallery by ID</string>
    <string name="reader_failed_to_find_gallery">Failed to open gallery</string>
-    <string name="main_fab_cancel">Cancel all downloads</string>

    <string name="main_move">Move to page %1$d</string>

--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
        maven { url 'https://maven.fabric.io/public' }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
        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/gradle.properties
+++ b/gradle.properties
@@ -14,4 +14,5 @@
 kotlin.code.style=official
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M"
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableR8.fullMode=true
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 25 09:55:23 KST 2020
+#Fri Aug 23 08:21:15 KST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
Author	SHA1	Message	Date
Pupil	dfe435c4f3	Merge pull request #70 from tom5079/dev Version 4.9	2020-02-24 21:11:03 +09:00
Pupil	c9bde3c487	Merge pull request #69 from tom5079/dev Version 4.8	2020-02-24 20:48:55 +09:00
Pupil	4f249c07e7	Merge pull request #68 from tom5079/dev Version 4.7	2020-02-24 12:49:56 +09:00