Update README.md

Fixes concurrentmodificationexception

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

.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_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

README.md

@@ -1,18 +1,12 @@
-# Pupil
-
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
 *Pupil, Hitomi.la viewer for Android*  
 
+![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/latest/Pupil-v5.1.4.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.4/Pupil-v5.1.4.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
 
-# Screenshot
+# Features
-![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
+![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)
-*Main Screen*
-
-![Reader Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/reader-screenshot.png?raw=true)
-*Reader Screen*
-
-Images are censored to be SFW
 
 # Installation
 
@@ -26,4 +20,7 @@ or Build app yourself
 
 # Contribution
 
-Any kind of contribution is appriciated. Feel free to leave PR! 
+Any kind of contribution is appriciated. Feel free to leave PR!
+
+## Tag Translation
+Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 61
+        versionCode 63
-        versionName "5.1.1"
+        versionName "5.1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -51,7 +51,6 @@ android {
             applicationIdSuffix ".debug"
             versionNameSuffix "-DEBUG"
 
-            buildConfigField("Boolean", "CENSOR", "false")
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
 
             ext.enableCrashlytics = false
@@ -61,7 +60,6 @@ android {
             minifyEnabled true
             shrinkResources true
 
-            buildConfigField("Boolean", "CENSOR", "false")
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
@@ -79,26 +77,26 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
     
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.activity:activity-ktx:1.2.0-alpha08"
+    implementation "androidx.activity:activity-ktx:1.2.0-beta01"
-    implementation "androidx.fragment:fragment-ktx:1.3.0-alpha08"
+    implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
     implementation "androidx.preference:preference:1.1.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.1"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.2"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.0.1"
+    implementation "androidx.work:work-runtime-ktx:2.4.0"
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.3.0-alpha02"
+    implementation "com.google.android.material:material:1.3.0-alpha03"
 
-    implementation "com.google.firebase:firebase-core:17.5.0"
+    implementation "com.google.firebase:firebase-core:17.5.1"
-    implementation "com.google.firebase:firebase-analytics:17.5.0"
+    implementation "com.google.firebase:firebase-analytics:17.6.0"
-    implementation "com.google.firebase:firebase-crashlytics:17.2.1"
+    implementation "com.google.firebase:firebase-crashlytics:17.2.2"
-    implementation "com.google.firebase:firebase-perf:19.0.8"
+    implementation "com.google.firebase:firebase-perf:19.0.9"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
     implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"
@@ -125,8 +123,8 @@ dependencies {
     implementation "ru.noties.markwon:core:3.1.0"
 
     implementation "xyz.quaver:libpupil:1.7.2"
-    implementation "xyz.quaver:documentfilex:0.2.15"
+    implementation "xyz.quaver:documentfilex:0.3.1"
-    implementation "xyz.quaver:floatingsearchview:1.0.5"
+    implementation "xyz.quaver:floatingsearchview:1.0.7"
 
     testImplementation "junit:junit:4.13"
     androidTestImplementation "androidx.test.ext:junit:1.1.2"

app/proguard-rules.pro

@@ -22,21 +22,6 @@
 
 -dontobfuscate
 
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep class * extends com.bumptech.glide.module.AppGlideModule {
- <init>(...);
-}
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
--keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
-  *** rewind();
-}
-
--keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
-
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.SerializationKt
 -keep,includedescriptorclasses class xyz.quaver.**$$serializer { *; } # <-- change package name to your app's
@@ -47,5 +32,4 @@
     kotlinx.serialization.KSerializer serializer(...);
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
--keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
+-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
--keep class xyz.quaver.pupil.util.Preferences

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 61,
+      "versionCode": 63,
-      "versionName": "5.1.1",
+      "versionName": "5.1.4",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -112,6 +112,11 @@ class Pupil : Application() {
             Preferences.remove("download_folder")
         }
 
+        if (!Preferences["reset_secure", false]) {
+            Preferences["security_mode"] = false
+            Preferences["reset_secure"] = true
+        }
+
         histories = SavedSet(File(ContextCompat.getDataDir(this), "histories.json"), 0)
         favorites = SavedSet(File(ContextCompat.getDataDir(this), "favorites.json"), 0)
         favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -35,15 +35,14 @@ import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.github.piasy.biv.loader.ImageLoader
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
-import kotlinx.android.synthetic.main.item_reader.view.*
 import kotlinx.coroutines.*
+import xyz.quaver.hitomi.getGallery
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.ui.view.TagChip
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
@@ -58,13 +57,22 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
         PREV
     }
 
-    var update = true
+    var updateAll = true
     var thin: Boolean = Preferences["thin"]
 
     inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        var updateJob: Job? = null
+        private var galleryID: Int = 0
 
-        private fun updateProgress(context: Context, galleryID: Int) {
+        init {
+            CoroutineScope(Dispatchers.Main).launch {
+                while (updateAll) {
+                    updateProgress(view.context)
+                    delay(1000)
+                }
+            }
+        }
+
+        private fun updateProgress(context: Context) {
             val cache = Cache.getInstance(context, galleryID)
 
             CoroutineScope(Dispatchers.Main).launch {
@@ -117,9 +125,14 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
         }
 
         fun bind(galleryID: Int) {
+            this.galleryID = galleryID
+            updateProgress(view.context)
+
             val cache = Cache.getInstance(view.context, galleryID)
 
-            val galleryBlock = cache.metadata.galleryBlock ?: return
+            val galleryBlock = runBlocking {
+                cache.getGalleryBlock()
+            } ?: return
 
             with(view) {
                 val resources = context.resources
@@ -157,25 +170,36 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                     })
                     ssiv?.recycle()
                     CoroutineScope(Dispatchers.IO).launch {
-                        showImage(cache.getThumbnail())
+                        cache.getThumbnail().let { launch(Dispatchers.Main) {
+                            showImage(it)
+                        } }
                     }
                 }
 
-                if (updateJob == null)
-                    updateJob = CoroutineScope(Dispatchers.Main).launch {
-                        while (update) {
-                            updateProgress(context, galleryID)
-                            delay(1000)
-                        }
-                    }
-
                 galleryblock_title.text = galleryBlock.title
                 with(galleryblock_artist) {
-                    text = artists.joinToString(", ") { it.wordCapitalize() }
+                    text = artists.joinToString { it.wordCapitalize() }
                     visibility = when {
                         artists.isNotEmpty() -> View.VISIBLE
                         else -> View.GONE
                     }
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        val gallery = runCatching {
+                            getGallery(galleryID)
+                        }.getOrNull()
+
+                        if (gallery?.groups?.isNotEmpty() != true)
+                            return@launch
+
+                        launch(Dispatchers.Main) {
+                            text = context.getString(
+                                R.string.galleryblock_artist_with_group,
+                                artists.joinToString { it.wordCapitalize() },
+                                gallery.groups.joinToString { it.wordCapitalize() }
+                            )
+                        }
+                    }
                 }
                 with(galleryblock_series) {
                     text =
@@ -197,27 +221,32 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                     }
                 }
 
-                galleryblock_tag_group.removeAllViews()
+                with(galleryblock_tag_group) {
-                CoroutineScope(Dispatchers.Default).launch {
+                    onClickListener = {
-                    galleryBlock.relatedTags.sortedBy {
+                        onChipClickedHandler.forEach { callback ->
-                        val tag = Tag.parse(it)
+                            callback.invoke(it)
-
-                        if (favoriteTags.contains(tag))
-                            -1
-                        else
-                            when(Tag.parse(it).area) {
-                                "female" -> 0
-                                "male" -> 1
-                                else -> 2
-                            }
-                    }.map {
-                        TagChip(context, Tag.parse(it)).apply {
-                            setOnClickListener { view ->
-                                for (callback in onChipClickedHandler)
-                                    callback.invoke((view as TagChip).tag)
-                            }
                         }
-                    }.let { launch(Dispatchers.Main) { it.forEach { galleryblock_tag_group.addView(it) } } }
+                    }
+
+                    tags.clear()
+                    tags.addAll(
+                        galleryBlock.relatedTags.sortedBy {
+                            val tag = Tag.parse(it)
+
+                            if (favoriteTags.contains(tag))
+                                -1
+                            else
+                                when(Tag.parse(it).area) {
+                                    "female" -> 0
+                                    "male" -> 1
+                                    else -> 2
+                                }
+                        }.map {
+                            Tag.parse(it)
+                        }
+                    )
+
+                    refresh()
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()
@@ -261,8 +290,6 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
 
                 // Make some views invisible to make it thinner
                 if (thin) {
-                    galleryblock_language.visibility = View.GONE
-                    galleryblock_type.visibility = View.GONE
                     galleryblock_tag_group.visibility = View.GONE
                 }
             }
@@ -357,15 +384,6 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
         }
     }
 
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        if (holder is GalleryViewHolder) {
-            holder.updateJob?.cancel()
-            holder.updateJob = null
-        }
-    }
-
     override fun getItemCount() =
         galleries.size +
         (if (showNext) 1 else 0) +

app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt

@@ -62,7 +62,14 @@ class ReaderAdapter(
 
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         fun clear() {
-            view.image.ssiv?.recycle()
+            view.image.mainView.let {
+                when (it) {
+                    is SubsamplingScaleImageView ->
+                        it.recycle()
+                    is SimpleDraweeView ->
+                        it.controller = null
+                }
+            }
         }
     }
 

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -27,7 +27,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -37,17 +36,16 @@ import okhttp3.Callback
 import okhttp3.Response
 import okhttp3.ResponseBody
 import okio.*
-import xyz.quaver.pupil.PupilInterceptor
+import xyz.quaver.pupil.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.interceptors
 import xyz.quaver.pupil.ui.ReaderActivity
+import xyz.quaver.pupil.util.cleanCache
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.ellipsize
 import xyz.quaver.pupil.util.normalizeID
 import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
+import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
 import kotlin.math.log10
@@ -90,7 +88,7 @@ class DownloadService : Service() {
                     PendingIntent.FLAG_UPDATE_CURRENT),
             ).build()
 
-        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
+        notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
             setContentTitle(getString(R.string.reader_loading))
             setContentText(getString(R.string.reader_notification_text))
             setSmallIcon(R.drawable.ic_notification)
@@ -98,7 +96,7 @@ class DownloadService : Service() {
             addAction(action)
             setProgress(0, 0, true)
             setOngoing(true)
-        })
+        }
 
         notify(galleryID)
     }
@@ -123,7 +121,7 @@ class DownloadService : Service() {
                 .setProgress(max, progress, false)
                 .setContentText("$progress/$max")
 
-        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null)
+        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null || galleryID == priority)
             notification.let { notificationManager.notify(galleryID, it.build()) }
         else
             notificationManager.cancel(galleryID)
@@ -198,6 +196,7 @@ class DownloadService : Service() {
     *  Float.POSITIVE_INFINITY -> Download completed
     */
     val progress = ConcurrentHashMap<Int, MutableList<Float>>()
+    var priority = 0
 
     fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true
 
@@ -289,14 +288,16 @@ class DownloadService : Service() {
     fun delete(galleryID: Int, startId: Int? = null) = CoroutineScope(Dispatchers.IO).launch {
         cancel(galleryID)
         DownloadManager.getInstance(this@DownloadService).deleteDownloadFolder(galleryID)
-        Cache.delete(galleryID)
+        Cache.delete(this@DownloadService, galleryID)
 
         startId?.let { stopSelf(it) }
     }
 
     fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        if (progress.containsKey(galleryID))
+        if (DownloadManager.getInstance(this@DownloadService).isDownloading(galleryID))
-            cancel(galleryID)
+            return@launch
+
+        cleanCache(this@DownloadService)
 
         val cache = Cache.getInstance(this@DownloadService, galleryID)
 
@@ -311,6 +312,8 @@ class DownloadService : Service() {
             return@launch
         }
 
+        histories.add(galleryID)
+
         progress[galleryID] = MutableList(reader.galleryInfo.files.size) { 0F }
 
         cache.metadata.imageList?.let {

app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt

@@ -22,13 +22,18 @@ import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.hitomi.Suggestion
+import xyz.quaver.pupil.util.translations
 
 @Parcelize
 data class TagSuggestion(val s: String, val t: Int, val u: String, val n: String) : SearchSuggestion {
     constructor(s: Suggestion) : this(s.s, s.t, s.u, s.n)
 
     @IgnoredOnParcel
-    override val body = s
+    override val body =
+        if (translations[s] != null)
+            "${translations[s]} ($s)"
+        else
+            s
 }
 
 @Parcelize

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -23,11 +23,15 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.InputType
+import android.text.util.Linkify
 import android.view.KeyEvent
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
-import android.widget.*
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.cardview.widget.CardView
@@ -58,6 +62,7 @@ import xyz.quaver.pupil.util.checkUpdate
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.restore
+import java.util.regex.Pattern
 import kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.min
@@ -144,7 +149,7 @@ class MainActivity :
     override fun onDestroy() {
         super.onDestroy()
 
-        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.update = false
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.updateAll = false
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -202,6 +207,8 @@ class MainActivity :
             }
         )
 
+        Linkify.addLinks(main_noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
+
         //NavigationView
         main_nav_view.setNavigationItemSelectedListener(this)
 
@@ -282,12 +289,22 @@ class MainActivity :
                     setTitle(R.string.main_open_gallery_by_id)
 
                     setPositiveButton(android.R.string.ok) { _, _ ->
-                            val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
+                        val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
-                            val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
-                                putExtra("galleryID", galleryID)
-                            }
 
-                            startActivity(intent)
+                        GalleryDialog(this@MainActivity, galleryID).apply {
+                            onChipClickedHandler.add {
+                                runOnUiThread {
+                                    query = it.toQuery()
+                                    currentPage = 0
+
+                                    cancelFetch()
+                                    clearGalleries()
+                                    fetchGalleries(query, sortMode)
+                                    loadBlocks()
+                                }
+                                dismiss()
+                            }
+                        }.show()
                     }
                 }.show()
             }
@@ -363,7 +380,7 @@ class MainActivity :
                     if (v !is CardView)
                         return@listener false
 
-                    val galleryID = galleries[position]
+                    val galleryID = galleries.getOrNull(position) ?: return@listener true
 
                     GalleryDialog(this@MainActivity, galleryID).apply {
                         onChipClickedHandler.add {

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -33,11 +33,9 @@ import android.view.animation.Animation
 import android.view.animation.AnticipateInterpolator
 import android.view.animation.OvershootInterpolator
 import android.view.animation.TranslateAnimation
-import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
@@ -59,7 +57,6 @@ import xyz.quaver.Code
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
 import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.camera
@@ -67,8 +64,6 @@ import xyz.quaver.pupil.util.closeCamera
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.startCamera
-import java.util.*
-import kotlin.concurrent.schedule
 
 class ReaderActivity : BaseActivity() {
 
@@ -88,6 +83,8 @@ class ReaderActivity : BaseActivity() {
     private val conn = object: ServiceConnection {
         override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
             downloader = (service as DownloadService.Binder).service.also {
+                it.priority = 0
+
                 if (!it.progress.containsKey(galleryID))
                     DownloadService.download(this@ReaderActivity, galleryID, true)
             }
@@ -230,14 +227,16 @@ class ReaderActivity : BaseActivity() {
         if (downloader != null)
             unbindService(conn)
 
-        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
+        downloader?.priority = galleryID
-            DownloadService.cancel(this, galleryID)
     }
 
     override fun onDestroy() {
         super.onDestroy()
 
         update = false
+
+        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
+            DownloadService.cancel(this, galleryID)
     }
 
     override fun onBackPressed() {
@@ -292,8 +291,6 @@ class ReaderActivity : BaseActivity() {
                     return@launch
                 }
 
-                histories.add(galleryID)
-
                 reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
                 reader_download_progressbar.progress =
                     downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -42,7 +42,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.Gallery
 import xyz.quaver.hitomi.getGallery
-import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
@@ -54,6 +53,8 @@ import xyz.quaver.pupil.ui.view.TagChip
 import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.wordCapitalize
+import java.util.*
+import kotlin.collections.ArrayList
 
 class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(context) {
 
@@ -76,7 +77,6 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                 context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                     putExtra("galleryID", galleryID)
                 })
-                histories.add(galleryID)
             }
         }
 
@@ -113,7 +113,12 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                     addRelated(gallery)
                 }
             } catch (e: Exception) {
-                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).show()
+                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
+                    if (Locale.getDefault().language == "ko")
+                        setAction(context.getText(R.string.https_text)) {
+                            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.https))))
+                        }
+                }.show()
             }
         }
     }
@@ -232,7 +237,6 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                         context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                             putExtra("galleryID", galleries[position])
                         })
-                        histories.add(galleries[position])
                     }
                     onItemLongClickListener = { _, position, _ ->
                         GalleryDialog(context, galleries[position]).apply {

app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt

@@ -44,8 +44,7 @@ import java.net.Proxy
 class ProxyDialog(context: Context) : AlertDialog(context) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setContentView(build())
+        setView(build())
-        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
 
         super.onCreate(savedInstanceState)
     }

app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt

@@ -31,6 +31,7 @@ import xyz.quaver.io.util.deleteRecursively
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.util.byteToString
+import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.io.File
 
@@ -61,6 +62,8 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                             if (dir.exists())
                                 dir.deleteRecursively()
 
+                            Cache.instances.clear()
+
                             summary = context.getString(R.string.settings_storage_usage, byteToString(0))
                             CoroutineScope(Dispatchers.IO).launch {
                                 var size = 0L

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -21,14 +21,16 @@ package xyz.quaver.pupil.ui.fragment
 import android.app.Activity
 import android.content.*
 import android.os.Bundle
+import android.os.LocaleList
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
+import androidx.core.os.LocaleListCompat
-import androidx.preference.PreferenceCategory
+import androidx.preference.*
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
@@ -37,6 +39,7 @@ import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.dialog.*
 import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import java.util.*
 
 class SettingsFragment :
     PreferenceFragmentCompat(),
@@ -123,6 +126,9 @@ class SettingsFragment :
             this ?: return false
 
             when (key) {
+                "tag_language" -> {
+                    updateTranslations()
+                }
                 "nomedia" -> {
                     val create = (newValue as? Boolean) ?: return false
 
@@ -243,6 +249,25 @@ class SettingsFragment :
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
+                        "tag_language" -> {
+                            this as ListPreference
+
+                            isEnabled = false
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                val languages = getAvailableLanguages().distinct().toTypedArray()
+
+                                entries = languages.map { Locale(it).let { loc -> loc.getDisplayLanguage(loc) } }.toTypedArray()
+                                entryValues = languages
+
+                                launch(Dispatchers.Main) {
+                                    isEnabled = true
+                                }
+                            }
+
+                            onPreferenceChangeListener = this@SettingsFragment
+
+                        }
                         "mirrors" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }

app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt

@@ -164,9 +164,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
                     }
                 }
 
-                if (item.t == -1) {
+                if (item.t > 0) {
-                    textView?.text = item.s
-                } else {
                     (suggestionView as? LinearLayout)?.let {
                         val count = it.findViewById<TextView>(R.id.count)
                         if (count == null)

app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt

@@ -25,6 +25,7 @@ import com.google.android.material.chip.Chip
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.util.translations
 import xyz.quaver.pupil.util.wordCapitalize
 
 @SuppressLint("ViewConstructor")
@@ -90,7 +91,7 @@ class TagChip(context: Context, _tag: Tag) : Chip(context) {
 
         text = when (tag.area) {
             "language" -> languages[tag.tag]
-            else -> tag.tag.wordCapitalize()
+            else -> (translations[tag.tag] ?: tag.tag).wordCapitalize()
         }
 
         setEnsureMinTouchTargetSize(false)

app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt

@@ -0,0 +1,90 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.view
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.types.Tags
+
+class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, attrStyle: Int = R.attr.chipGroupStyle, val tags: Tags = Tags()) : ChipGroup(context, attr, attrStyle), MutableSet<Tag> by tags {
+
+    object Defaults {
+        val maxChipSize = 10
+    }
+
+    var maxChipSize: Int = Defaults.maxChipSize
+        set(value) {
+            field = value
+
+            refresh()
+        }
+
+    private val moreView = Chip(context).apply {
+        text = "…"
+
+        setEnsureMinTouchTargetSize(false)
+
+        setOnClickListener {
+            removeView(this)
+
+            for (i in maxChipSize until tags.size) {
+                val tag = tags.elementAt(i)
+
+                addView(TagChip(context, tag).apply {
+                    setOnClickListener {
+                        onClickListener?.invoke(tag)
+                    }
+                })
+            }
+        }
+    }
+
+    var onClickListener: ((Tag) -> Unit)? = null
+
+    private fun applyAttributes(attr: TypedArray) {
+        maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
+    }
+
+    fun refresh() {
+        this.removeAllViews()
+
+        tags.take(maxChipSize).forEach {
+            this.addView(TagChip(context, it).apply {
+                setOnClickListener {
+                    onClickListener?.invoke(this.tag)
+                }
+            })
+        }
+
+        if (maxChipSize > 0 && this.size > maxChipSize)
+            addView(moreView)
+    }
+
+    init {
+        applyAttributes(context.obtainStyledAttributes(attr, R.styleable.TagChipGroup))
+
+        refresh()
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt

@@ -22,8 +22,9 @@ import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import java.io.File
+import java.util.*
 
-class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
+class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = Collections.synchronizedSet(mutableSetOf())) : MutableSet<T> by set {
 
     @Suppress("UNCHECKED_CAST")
     @OptIn(ExperimentalSerializationApi::class)

app/src/main/java/xyz/quaver/pupil/util/SetLineOverlap.kt

@@ -1,37 +0,0 @@
-package xyz.quaver.pupil.util
-
-import android.graphics.Paint
-import android.text.style.LineHeightSpan
-
-class SetLineOverlap(private val overlap: Boolean) : LineHeightSpan {
-    companion object {
-        private var originalBottom = 15
-        private var originalDescent = 13
-        private var overlapSaved = false
-    }
-
-    override fun chooseHeight(
-        text: CharSequence?,
-        start: Int,
-        end: Int,
-        spanstartv: Int,
-        lineHeight: Int,
-        fm: Paint.FontMetricsInt?
-    ) {
-        fm ?: return
-
-        if (overlap) {
-            if (overlapSaved) {
-                originalBottom = fm.bottom
-                originalDescent = fm.descent
-                overlapSaved = true
-            }
-            fm.bottom += fm.top
-            fm.descent += fm.top
-        } else {
-            fm.bottom = originalBottom
-            fm.descent = originalDescent
-            overlapSaved = false
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -24,6 +24,8 @@ import android.net.Uri
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -37,6 +39,7 @@ import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.util.Preferences
+import java.io.File
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 
@@ -60,8 +63,8 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
             }
 
         @Synchronized
-        fun delete(galleryID: Int) {
+        fun delete(context: Context, galleryID: Int) {
-            instances[galleryID]?.cacheFolder?.deleteRecursively()
+            File(context.cacheDir, "imageCache/$galleryID").deleteRecursively()
             instances.remove(galleryID)
         }
     }
@@ -132,7 +135,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
     }
 
     @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): Uri? =
+    suspend fun getThumbnail(): Uri =
         findFile(".thumbnail")?.uri
             ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
                 kotlin.runCatching {
@@ -142,9 +145,14 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
 
                     client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
                 }.getOrNull()?.let { thumbnail -> kotlin.runCatching {
-                    cacheFolder.getChild(".thumbnail").also { it.writeBytes(thumbnail) }
+                    cacheFolder.getChild(".thumbnail").also {
+                        if (!it.exists())
+                            it.createNewFile()
+
+                        it.writeBytes(thumbnail)
+                    }
                 }.getOrNull()?.uri }
-            } }
+            } } ?: Uri.EMPTY
 
     suspend fun getReader(): Reader? {
         val mirrors = Preferences.get<String>("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') }
@@ -186,67 +194,76 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
     }
 
     fun getImage(index: Int): FileX? =
-        metadata.imageList?.get(index)?.let { findFile(it) }
+        metadata.imageList?.getOrNull(index)?.let { findFile(it) }
 
     @Suppress("BlockingMethodInNonBlockingContext")
     fun putImage(index: Int, fileName: String, data: ByteArray) {
         val file = cacheFolder.getChild(fileName)
 
-        file.createNewFile()
+        if (!file.exists())
+            file.createNewFile()
         file.writeBytes(data)
         setMetadata { metadata -> metadata.imageList!![index] = fileName }
     }
 
+    private val lock = ConcurrentHashMap<Int, Mutex>()
     @Suppress("BlockingMethodInNonBlockingContext")
     fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
         val downloadFolder = downloadFolder ?: return@launch
 
-        val cacheMetadata = cacheFolder.getChild(".metadata")
+        if (lock[galleryID]?.isLocked == true)
-        val downloadMetadata = downloadFolder.getChild(".metadata")
-
-        if (downloadMetadata.exists() || !cacheMetadata.exists())
             return@launch
 
-        if (cacheMetadata.exists()) {
+        (lock[galleryID] ?: Mutex().also { lock[galleryID] = it }).withLock {
-            kotlin.runCatching {
+            val cacheMetadata = cacheFolder.getChild(".metadata")
-                downloadMetadata.createNewFile()
+            val downloadMetadata = downloadFolder.getChild(".metadata")
-                downloadMetadata.writeText(Json.encodeToString(metadata))
 
-                cacheMetadata.delete()
+            if (!cacheMetadata.exists())
+                return@launch
+
+            if (cacheMetadata.exists()) {
+                kotlin.runCatching {
+                    if (!downloadMetadata.exists())
+                        downloadMetadata.createNewFile()
+
+                    downloadMetadata.writeText(Json.encodeToString(metadata))
+                }
             }
-        }
 
-        val cacheThumbnail = cacheFolder.getChild(".thumbnail")
+            val cacheThumbnail = cacheFolder.getChild(".thumbnail")
-        val downloadThumbnail = downloadFolder.getChild(".thumbnail")
+            val downloadThumbnail = downloadFolder.getChild(".thumbnail")
 
-        if (cacheThumbnail.exists() && !downloadThumbnail.exists()) {
+            if (cacheThumbnail.exists()) {
-            kotlin.runCatching {
+                kotlin.runCatching {
-                if (!downloadThumbnail.exists())
+                    if (!downloadThumbnail.exists())
-                    downloadThumbnail.createNewFile()
+                        downloadThumbnail.createNewFile()
 
-                downloadThumbnail.outputStream()?.use { target -> cacheThumbnail.inputStream()?.use { source ->
+                    downloadThumbnail.outputStream()?.use { target -> target.channel.truncate(0L); cacheThumbnail.inputStream()?.use { source ->
-                    source.copyTo(target)
+                        source.copyTo(target)
-                } }
+                    } }
-                cacheThumbnail.delete()
+                    cacheThumbnail.delete()
+                }
             }
-        }
 
-        metadata.imageList?.forEach { imageName ->
+            metadata.imageList?.forEach { imageName ->
-            imageName ?: return@forEach
+                imageName ?: return@forEach
-            val target = downloadFolder.getChild(imageName)
+                val target = downloadFolder.getChild(imageName)
-            val source = cacheFolder.getChild(imageName)
+                val source = cacheFolder.getChild(imageName)
 
-            if (!source.exists() || target.exists())
+                if (!source.exists())
-                return@forEach
+                    return@forEach
 
-            kotlin.runCatching {
+                kotlin.runCatching {
-                if (!target.exists())
+                    if (!target.exists())
-                    target.createNewFile()
+                        target.createNewFile()
 
-                target.outputStream()?.use { target -> source.inputStream()?.use { source ->
+                    target.outputStream()?.use { target -> target.channel.truncate(0L); source.inputStream()?.use { source ->
-                    source.copyTo(target)
+                        source.copyTo(target)
-                } }
+                    } }
+                }
             }
+
+            cacheFolder.deleteRecursively()
         }
     }
 }

app/src/main/java/xyz/quaver/pupil/util/file.kt

@@ -19,35 +19,47 @@
 package xyz.quaver.pupil.util
 
 import android.content.Context
-import android.os.storage.StorageManager
+import kotlinx.coroutines.CoroutineScope
-import androidx.core.content.ContextCompat
+import kotlinx.coroutines.Dispatchers
-import androidx.core.net.toUri
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import xyz.quaver.pupil.histories
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.io.File
-import java.io.FileOutputStream
-import java.lang.reflect.Array
-import java.net.URL
 
-@Suppress("DEPRECATION")
+val mutex = Mutex()
-@Deprecated("Use downloader.Cache instead")
+fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
-fun getCachedGallery(context: Context, galleryID: Int) =
+    if (mutex.isLocked) return@launch
-    File(getDownloadDirectory(context), galleryID.toString()).let {
+
-        if (it.exists())
+    mutex.withLock {
-            it
+        val cacheFolder = File(context.cacheDir, "imageCache")
-        else
+        val downloadManager = DownloadManager.getInstance(context)
-            File(context.cacheDir, "imageCache/$galleryID")
+
+        val limit = (Preferences.get<String>("cache_limit").toLongOrNull() ?: 0L)*1024*1024*1024
+
+        if (limit == 0L) return@withLock
+
+        val cacheSize = {
+            var size = 0L
+
+            cacheFolder.walk().forEach {
+                size += it.length()
+            }
+
+            size
+        }
+
+        if (cacheSize.invoke() > limit)
+            while (cacheSize.invoke() > limit/2) {
+                val caches = cacheFolder.list() ?: return@withLock
+
+                (histories.toList().firstOrNull {
+                    caches.contains(it.toString()) && !downloadManager.isDownloading(it)
+                } ?: return@withLock).let {
+                    Cache.delete(context, it)
+                }
+            }
     }
-
+}
-@Suppress("DEPRECATION")
-@Deprecated("Use downloader.Cache instead")
-fun getDownloadDirectory(context: Context) =
-    Preferences.get<String>("dl_location").let {
-        if (it.isNotEmpty() && !it.startsWith("content"))
-            File(it)
-        else
-            context.getExternalFilesDir(null)!!
-    }
-
-@Suppress("DEPRECATION")
-@Deprecated("Use FileX instead")
-fun File.isParentOf(another: File) =
-    another.absolutePath.startsWith(this.absolutePath)

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -23,6 +23,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.content.ContextCompat
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.Code
@@ -93,14 +96,14 @@ fun GalleryBlock.formatDownloadFolder(): String =
         formatMap.entries.fold(it) { str, (k, v) ->
             str.replace(k, v.invoke(this), true)
         }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 
 fun GalleryBlock.formatDownloadFolderTest(format: String): String =
     format.let {
         formatMap.entries.fold(it) { str, (k, v) ->
             str.replace(k, v.invoke(this), true)
         }
-    }.replace(Regex("""[*\\|"?><:/]"""), "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 
 val Reader.requestBuilders: List<Request.Builder>
     get() {
@@ -128,4 +131,10 @@ fun String.ellipsize(n: Int): String =
     if (this.length > n)
         this.slice(0 until n) + "…"
     else
-        this
+        this
+
+operator fun JsonElement.get(index: Int) =
+    this.jsonArray[index]
+
+operator fun JsonElement.get(tag: String) =
+    this.jsonObject[tag]

app/src/main/java/xyz/quaver/pupil/util/translation.kt

@@ -0,0 +1,66 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.Request
+import xyz.quaver.pupil.client
+import java.io.IOException
+import java.util.*
+
+private val filesURL = "https://api.github.com/repos/tom5079/Pupil/git/trees/tags"
+private val contentURL = "https://raw.githubusercontent.com/tom5079/Pupil/tags/"
+
+var translations: Map<String, String> = run {
+    updateTranslations()
+    emptyMap()
+}
+    private set
+
+@Suppress("BlockingMethodInNonBlockingContext")
+fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
+    translations = emptyMap()
+    translations = Json.decodeFromString<Map<String, String>>(client.newCall(
+        Request.Builder()
+            .url(contentURL + "${Preferences["tag_language", ""]}.json")
+            .build()
+    ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
+}
+
+fun getAvailableLanguages(): List<String> {
+    val languages = Locale.getISOLanguages()
+
+    val json = Json.parseToJsonElement(client.newCall(
+        Request.Builder()
+            .url(filesURL)
+            .build()
+    ).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: return emptyList())
+
+    return listOf("en") + (json["tree"]?.jsonArray?.mapNotNull {
+        val name = it["path"]?.jsonPrimitive?.content?.takeWhile { c -> c != '.' }
+
+        languages.firstOrNull { code -> code.equals(name, ignoreCase = true) }
+    } ?: emptyList())
+}

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -313,7 +313,7 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
                 )
 
                 synchronized(Cache) {
-                    Cache.delete(galleryID)
+                    Cache.delete(this@migrate, galleryID)
                 }
                 downloadFolderMap[galleryID] = folder.name
 

app/src/main/res/layout/activity_main_content.xml

@@ -47,22 +47,6 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.core.widget.ContentLoadingProgressBar
-            style="?android:attr/progressBarStyle"
-            android:id="@+id/main_progressbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
-
-        <TextView
-            android:id="@+id/main_noresult"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/main_no_result"
-            android:visibility="invisible"/>
-
         <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -86,6 +70,24 @@
 
         </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
+        <androidx.core.widget.ContentLoadingProgressBar
+            style="?android:attr/progressBarStyle"
+            android:id="@+id/main_progressbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true"/>
+
+        <TextView
+            android:id="@+id/main_noresult"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text="@string/main_no_result"
+            android:linksClickable="true"
+            android:visibility="invisible"/>
+
         <com.github.clans.fab.FloatingActionMenu
                 android:id="@+id/main_fab"
                 android:layout_width="wrap_content"

app/src/main/res/layout/item_galleryblock.xml

@@ -113,9 +113,11 @@
 				android:layout_height="0dp"
 				android:contentDescription="@string/galleryblock_thumbnail_description"
 				android:adjustViewBounds="true"
+				app:layout_constraintHeight_default="spread"
+				app:layout_constraintHeight_min="200dp"
 				app:layout_constraintLeft_toLeftOf="parent"
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar_layout"
-				app:layout_constraintBottom_toBottomOf="@id/barrier"/>
+				app:layout_constraintBottom_toTopOf="@id/barrier"/>
 
 			<TextView
 				style="@style/TextAppearance.AppCompat.Headline"
@@ -164,14 +166,7 @@
 				app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" />
 
-			<androidx.constraintlayout.widget.Barrier
+			<xyz.quaver.pupil.ui.view.TagChipGroup
-				android:id="@+id/padding"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				app:barrierDirection="bottom"
-				app:constraint_referenced_ids="galleryblock_language"/>
-
-			<com.google.android.material.chip.ChipGroup
 				android:id="@+id/galleryblock_tag_group"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
@@ -179,7 +174,7 @@
 				android:layout_marginTop="16dp"
 				android:layout_marginBottom="16dp"
 				app:chipSpacing="4dp"
-				app:layout_constraintTop_toBottomOf="@id/padding"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
 				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
 				app:layout_constraintRight_toRightOf="parent"/>
 
@@ -188,7 +183,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				app:barrierDirection="bottom"
-				app:constraint_referenced_ids="galleryblock_tag_group"/>
+				app:constraint_referenced_ids="galleryblock_thumbnail, galleryblock_tag_group"/>
 
 			<View
 				android:id="@+id/divider"

app/src/main/res/values-ja/strings.xml

@@ -150,4 +150,8 @@
     <string name="camera_denied">カメラ権限が拒否されているため、まばたき検知使用できません</string>
     <string name="no_camera">この機器には前面カメラが装着されていません</string>
     <string name="error">エラー</string>
+    <string name="settings_cache_limit">キャッシュサイズ制限</string>
+    <string name="settings_cache_unlimited">制限なし</string>
+    <string name="settings_tag_language">タグ言語</string>
+    <string name="settings_tag_language_message">Githubにて翻訳に参加できます</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -12,10 +12,10 @@
     <string name="settings_galleries_per_page">한 번에 로드할 갤러리 수</string>
     <string name="settings_search_title">검색 설정</string>
     <string name="settings_title">설정</string>
-    <string name="update_notification_description">apk 다운로드중&#8230;</string>
+    <string name="update_notification_description">업데이트 다운로드중&#8230;</string>
     <string name="update_title">업데이트가 있습니다!</string>
     <string name="warning">경고</string>
-    <string name="main_no_result">결과 없음</string>
+    <string name="main_no_result">결과 없음\n해결법</string>
     <string name="settings_miscellaneous_title">기타</string>
     <string name="settings_clear_history">기록 삭제</string>
     <string name="settings_clear_history_alert_message">기록을 삭제하시겠습니까?</string>
@@ -150,4 +150,8 @@
     <string name="camera_denied">카메라 권한이 거부되었기 때문에 눈 깜빡임 감지가 불가능합니다</string>
     <string name="no_camera">이 장치에는 전면 카메라가 없습니다</string>
     <string name="error">오류</string>
+    <string name="settings_cache_limit">캐시 크기 제한</string>
+    <string name="settings_cache_unlimited">무제한</string>
+    <string name="settings_tag_language">태그 언어</string>
+    <string name="settings_tag_language_message">Github에서 번역에 참여하세요</string>
 </resources>

app/src/main/res/values/arrays.xml

@@ -2,6 +2,7 @@
 <resources>
 
     <string-array name="settings_galleries_per_page">
+        <item>5</item>
         <item>10</item>
         <item>25</item>
         <item>50</item>
@@ -58,4 +59,24 @@
         <item>SOCKS</item>
     </string-array>
 
+    <string-array name="cache_size">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>4</item>
+        <item>8</item>
+        <item>16</item>
+        <item>32</item>
+    </string-array>
+
+    <string-array name="cache_size_text">
+        <item>@string/settings_cache_unlimited</item>
+        <item>1G</item>
+        <item>2G</item>
+        <item>4G</item>
+        <item>8G</item>
+        <item>16G</item>
+        <item>32G</item>
+    </string-array>
+
 </resources>

app/src/main/res/values/attr.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <declare-styleable name="TagChipGroup">
+        <attr name="maxTag" format="integer"/>
+    </declare-styleable>
+</resources>

app/src/main/res/values/strings.xml

@@ -9,6 +9,10 @@
     <string name="email" translatable="false">mailto:pupil.hentai@gmail.com</string>
     <string name="discord" translatable="false">https://discord.gg/Stj4b5v</string>
 
+    <!-- Korean only -->
+    <string name="https_text" translatable="false">해결법</string>
+    <string name="https" translatable="false">https://bit.ly/34dUBwy</string>
+
     <string name="backup_url" translatable="false">http://ix.io/</string>
 
     <string name="main_settings" translatable="false">Settings</string>
@@ -17,6 +21,8 @@
     <string name="reader_imageview_description" translatable="false">Content ImageView</string>
     <string name="page_indicator_placeholder" translatable="false">-/-</string>
 
+    <string name="galleryblock_artist_with_group" translatable="false">%s (%s)</string>
+
     <!-- Translate needed down here -->
 
     <string name="warning">Warning</string>
@@ -155,6 +161,9 @@
     <string name="settings_download_folder_available">%s available</string>
     <string name="settings_download_folder_custom">Custom Location</string>
     <string name="settings_download_folder_not_writable">This folder is not writable. Please select another folder.</string>
+    <string name="settings_cache_limit">Cache Limit</string>
+    <string name="settings_cache_unlimited">Unlimited</string>
+    <string name="settings_nomedia_title">Hide image from gallery</string>
     <string name="settings_low_quality">Low quality images</string>
     <string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>
 
@@ -166,6 +175,8 @@
     <!-- SETTINGS/MISCELLANEOUS -->
 
     <string name="settings_miscellaneous_title">Miscellaneous</string>
+    <string name="settings_tag_language">Tag Language</string>
+    <string name="settings_tag_language_message">Participate in translation on Github</string>
     <string name="settings_mirror_summary">Load images from mirrors</string>
     <string name="settings_proxy_title">Proxy</string>
     <string name="settings_rtl">Turn pages Right-to-Left</string>
@@ -173,7 +184,6 @@
     <string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
     <string name="settings_dark_mode_title">Dark mode</string>
     <string name="settings_dark_mode_summary">Protect yourself against light attacks!</string>
-    <string name="settings_nomedia_title">Hide image from gallery</string>
     <string name="settings_import_old_galleries">Import old galleries</string>
     <string name="settings_user_id">User ID</string>
     <string name="settings_user_id_toast">User ID is copied to clipboard</string>

app/src/main/res/xml/root_preferences.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
         app:key="app_version"
@@ -44,6 +43,14 @@
             app:key="download_folder"
             app:title="@string/settings_download_folder"/>
 
+        <ListPreference
+            app:key="cache_limit"
+            app:title="@string/settings_cache_limit"
+            app:entries="@array/cache_size_text"
+            app:entryValues="@array/cache_size"
+            app:defaultValue="8"
+            app:useSimpleSummaryProvider="true"/>
+
         <SwitchPreferenceCompat
             app:key="nomedia"
             app:title="@string/settings_nomedia_title"/>
@@ -68,6 +75,12 @@
     <PreferenceCategory
         app:title="@string/settings_miscellaneous_title">
 
+        <ListPreference
+            app:key="tag_language"
+            app:title="@string/settings_tag_language"
+            app:defaultValue="en"
+            app:useSimpleSummaryProvider="true"/>
+
         <Preference
             app:key="mirrors"
             app:title="@string/settings_mirror_title"

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath 'com.android.tools.build:gradle:4.0.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"
@@ -14,7 +14,7 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath "com.google.firebase:firebase-crashlytics-gradle:2.3.0"
-        classpath "com.google.firebase:perf-plugin:1.3.1"
+        classpath "com.google.firebase:perf-plugin:1.3.2"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.2"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Jun 18 15:48:09 KST 2020
+#Thu Oct 01 20:54:37 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome