search bug fix

Resolves #109

.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/gradle.xml

@@ -14,6 +14,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.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

@@ -2,7 +2,7 @@
 *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.2-hotfix3.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.2-hotfix3/Pupil-v5.1.2-hotfix3.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.6-hotfix6/Pupil-v5.1.6-hotfix6.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.6-hotfix6/Pupil-v5.1.6-hotfix6.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
 
 # Features
@@ -21,3 +21,6 @@ or Build app yourself
 # Contribution
 
 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 62
+        versionCode 63
-        versionName "5.1.3"
+        versionName "5.1.6-hotfix6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -77,14 +77,15 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0-M1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
     
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.activity:activity-ktx:1.2.0-beta01"
     implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
-    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.1"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    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"
@@ -93,8 +94,8 @@ dependencies {
 
     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.2"
     implementation "com.google.firebase:firebase-perf:19.0.9"
 
@@ -122,8 +123,8 @@ dependencies {
 
     implementation "ru.noties.markwon:core:3.1.0"
 
-    implementation "xyz.quaver:libpupil:1.7.2"
+    implementation "xyz.quaver:libpupil:1.8.15"
-    implementation "xyz.quaver:documentfilex:0.3.1"
+    implementation "xyz.quaver:documentfilex:0.4-alpha02"
     implementation "xyz.quaver:floatingsearchview:1.0.7"
 
     testImplementation "junit:junit:4.13"

app/release/output-metadata.json

@@ -1,19 +1,17 @@
 {
-  "version": 1,
+  "version": 2,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
   },
   "applicationId": "xyz.quaver.pupil",
-  "variantName": "release",
+  "variantName": "processReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "properties": [],
+      "versionCode": 63,
-      "versionCode": 62,
+      "versionName": "5.1.6-hotfix6",
-      "versionName": "5.1.3",
-      "enabled": true,
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/AndroidManifest.xml

@@ -25,7 +25,8 @@
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:theme"
-        tools:ignore="UnusedAttribute">
+        tools:ignore="UnusedAttribute"
+        android:largeHeap="true">
 
         <meta-data
             android:name="com.google.mlkit.vision.DEPENDENCIES"

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

@@ -18,7 +18,10 @@
 
 package xyz.quaver.pupil
 
-import android.app.*
+import android.app.Application
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri

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

@@ -18,13 +18,17 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.util.Log
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -93,6 +97,13 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                             visibility = View.VISIBLE
                     }
 
+                    view.galleryblock_id.setOnClickListener {
+                        (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
+                            ClipData.newPlainText("gallery_id", galleryID.toString())
+                        )
+                        Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
+                    }
+
                     if (!imageList.contains(null)) {
                         val downloadManager = DownloadManager.getInstance(context)
 
@@ -126,6 +137,7 @@ 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)
 
@@ -228,24 +240,29 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                     }
 
                     tags.clear()
-                    tags.addAll(
-                        galleryBlock.relatedTags.sortedBy {
-                            val tag = Tag.parse(it)
 
-                            if (favoriteTags.contains(tag))
+                    CoroutineScope(Dispatchers.IO).launch {
-                                -1
+                        tags.addAll(
-                            else
+                            galleryBlock.relatedTags.sortedBy {
-                                when(Tag.parse(it).area) {
+                                val tag = Tag.parse(it)
-                                    "female" -> 0
+
-                                    "male" -> 1
+                                if (favoriteTags.contains(tag))
-                                    else -> 2
+                                    -1
-                                }
+                                else
-                        }.map {
+                                    when(Tag.parse(it).area) {
-                            Tag.parse(it)
+                                        "female" -> 0
+                                        "male" -> 1
+                                        else -> 2
+                                    }
+                            }.map {
+                                Tag.parse(it)
+                            }
+                        )
+
+                        launch(Dispatchers.Main) {
+                            refresh()
                         }
-                    )
+                    }
-
-                    refresh()
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()

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

@@ -19,7 +19,6 @@
 package xyz.quaver.pupil.adapters
 
 import android.content.Context
-import android.graphics.DiscretePathEffect
 import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.view.LayoutInflater

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

@@ -294,10 +294,10 @@ class DownloadService : Service() {
     }
 
     fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        cleanCache(this@DownloadService)
+        if (DownloadManager.getInstance(this@DownloadService).isDownloading(galleryID))
+            return@launch
 
-        if (progress.containsKey(galleryID))
+        cleanCache(this@DownloadService)
-            cancel(galleryID)
 
         val cache = Cache.getInstance(this@DownloadService, galleryID)
 

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

@@ -28,11 +28,13 @@ 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
-import androidx.core.text.util.LinkifyCompat
 import androidx.core.view.GravityCompat
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.navigation.NavigationView
@@ -123,11 +125,15 @@ class MainActivity :
         if (Preferences["download_folder", ""].isEmpty())
             DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
 
-        checkUpdate(this)
-
         initView()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        checkUpdate(this)
+    }
+
     @OptIn(ExperimentalStdlibApi::class)
     override fun onBackPressed() {
         when {
@@ -932,7 +938,7 @@ class MainActivity :
                         }
                     }
                 }
-            }
+            }.toList()
         }
     }
 

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

@@ -258,7 +258,7 @@ class ReaderActivity : BaseActivity() {
         //currentPage is 1-based
         return when(keyCode) {
             KeyEvent.KEYCODE_VOLUME_UP -> {
-                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage-2, 0)
+                (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
 
                 true
             }
@@ -339,7 +339,7 @@ class ReaderActivity : BaseActivity() {
                         scrollMode(false)
                         fullscreen(true)
                     } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
+                        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
                     }
                 }
             }
@@ -359,7 +359,6 @@ class ReaderActivity : BaseActivity() {
                         return
                     currentPage = layoutManager.findFirstVisibleItemPosition()+1
                     menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
-
                 }
             })
         }
@@ -455,7 +454,11 @@ class ReaderActivity : BaseActivity() {
             reader_recyclerview.layoutManager = LinearLayoutManager(this)
         } else {
             snapHelper.attachToRecyclerView(reader_recyclerview)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, Preferences["rtl", false])
+            reader_recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
+                override fun calculateExtraLayoutSpace(state: RecyclerView.State, extraLayoutSpace: IntArray) {
+                    extraLayoutSpace.fill(600)
+                }
+            }
         }
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)

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

@@ -24,11 +24,11 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
+import androidx.preference.*
-import androidx.preference.PreferenceCategory
-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 +37,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(),
@@ -109,7 +110,7 @@ class SettingsFragment :
                     (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                         ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                     )
-                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
                 }
                 else -> return false
             }
@@ -123,6 +124,9 @@ class SettingsFragment :
             this ?: return false
 
             when (key) {
+                "tag_translation" -> {
+                    updateTranslations()
+                }
                 "nomedia" -> {
                     val create = (newValue as? Boolean) ?: return false
 
@@ -243,6 +247,27 @@ class SettingsFragment :
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
+                        "tag_translation" -> {
+                            this as ListPreference
+
+                            isEnabled = false
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                kotlin.runCatching {
+                                    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

@@ -57,7 +57,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
     var onFavoriteHistorySwitchClickListener: (() -> Unit)? = null
 
     init {
-        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI or searchInputView.imeOptions
 
         searchInputView.addTextChangedListener(this)
         onSearchListener = this
@@ -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)
@@ -217,4 +215,4 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
             }
         }
     }
-}
+}

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

@@ -21,8 +21,10 @@ package xyz.quaver.pupil.ui.view
 import android.content.Context
 import android.content.res.TypedArray
 import android.util.AttributeSet
+import android.util.Log
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
+import kotlinx.coroutines.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.Tags
@@ -66,19 +68,27 @@ class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSe
         maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
     }
 
+    private var refreshJob: Job? = null
     fun refresh() {
+        refreshJob?.cancel()
         this.removeAllViews()
 
-        tags.take(maxChipSize).forEach {
+        refreshJob = CoroutineScope(Dispatchers.Main).launch {
-            this.addView(TagChip(context, it).apply {
+            tags.take(maxChipSize).map {
-                setOnClickListener {
+                CoroutineScope(Dispatchers.Default).async {
-                    onClickListener?.invoke(this.tag)
+                    TagChip(context, it).apply {
+                        setOnClickListener {
+                            onClickListener?.invoke(this.tag)
+                        }
+                    }
                 }
-            })
+            }.forEach {
-        }
+                addView(it.await())
+            }
 
-        if (maxChipSize > 0 && this.size > maxChipSize)
+            if (maxChipSize > 0 && tags.size > maxChipSize && parent == null)
-            addView(moreView)
+                addView(moreView)
+        }
     }
 
     init {

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

@@ -24,7 +24,7 @@ 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> = Collections.synchronizedSet(mutableSetOf())) : MutableSet<T> by set {
+class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
 
     @Suppress("UNCHECKED_CAST")
     @OptIn(ExperimentalSerializationApi::class)
@@ -39,24 +39,23 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         load()
     }
 
+    @Synchronized
     fun load() {
-        synchronized(this) {
+        set.clear()
-            set.clear()
+        kotlin.runCatching {
-            kotlin.runCatching {
+            Json.decodeFromString(serializer, file.readText())
-                Json.decodeFromString(serializer, file.readText())
+        }.onSuccess {
-            }.onSuccess {
+            set.addAll(it)
-                set.addAll(it)
-            }
         }
     }
 
+    @Synchronized
     @OptIn(ExperimentalSerializationApi::class)
     fun save() {
-        synchronized(this) {
+        file.writeText(Json.encodeToString(serializer, set.toList()))
-            file.writeText(Json.encodeToString(serializer, set.toList()))
-        }
     }
 
+    @Synchronized
     override fun add(element: T): Boolean {
         load()
 
@@ -67,6 +66,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         }
     }
 
+    @Synchronized
     override fun addAll(elements: Collection<T>): Boolean {
         load()
 
@@ -77,6 +77,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         }
     }
 
+    @Synchronized
     override fun remove(element: T): Boolean {
         load()
 
@@ -85,6 +86,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         }
     }
 
+    @Synchronized
     override fun clear() {
         set.clear()
         save()

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/DownloadManager.kt

@@ -80,7 +80,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
                 }.invoke()
             }
 
-            return downloadFolderMapInstance!!
+            return downloadFolderMapInstance ?: mutableMapOf()
         }
 
 

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

@@ -55,10 +55,12 @@ fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
             while (cacheSize.invoke() > limit/2) {
                 val caches = cacheFolder.list() ?: return@withLock
 
-                (histories.firstOrNull {
+                synchronized(histories) {
-                    caches.contains(it.toString()) && !downloadManager.isDownloading(it)
+                    (histories.firstOrNull {
-                } ?: return@withLock).let {
+                        caches.contains(it.toString()) && !downloadManager.isDownloading(it)
-                    Cache.delete(context, it)
+                    } ?: return@withLock).let {
+                        Cache.delete(context, it)
+                    }
                 }
             }
     }

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
@@ -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,68 @@
+/*
+ *     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()
+    kotlin.runCatching {
+        translations = Json.decodeFromString<Map<String, String>>(client.newCall(
+            Request.Builder()
+                .url(contentURL + "${Preferences["tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.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/res/layout/item_galleryblock.xml

@@ -197,9 +197,7 @@
 				android:id="@+id/galleryblock_id"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
+				android:layout_margin="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
 				app:layout_constraintTop_toBottomOf="@id/divider"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintLeft_toLeftOf="parent"/>
@@ -212,8 +210,8 @@
 				android:layout_marginBottom="8dp"
 				app:layout_constraintTop_toBottomOf="@id/divider"
 				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintLeft_toRightOf="parent"
+				app:layout_constraintLeft_toLeftOf="parent"
-				app:layout_constraintRight_toLeftOf="parent" />
+				app:layout_constraintRight_toRightOf="parent" />
 
 			<ImageView
 				android:id="@+id/galleryblock_favorite"

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

@@ -128,7 +128,7 @@
     <string name="settings_lock_fingerprint_prompt_subtitle">こうかはばつぐんだ!</string>
     <string name="default_query_dialog_filter_loli">登場人物を全て18歳以上にする</string>
     <string name="settings_user_id">ユーザーID</string>
-    <string name="settings_user_id_toast">ユーザーIDをクリップボードにコピーしました</string>
+    <string name="copied_to_clipboard">クリップボードにコピーしました</string>
     <string name="reader_fab_retry">リトライ</string>
     <string name="reader_fab_auto">まばたき検知スクロール</string>
     <string name="search_all">全てのギャラリーを対象に検索</string>
@@ -152,4 +152,7 @@
     <string name="error">エラー</string>
     <string name="settings_cache_limit">キャッシュサイズ制限</string>
     <string name="settings_cache_unlimited">制限なし</string>
+    <string name="settings_tag_translation">タグ言語</string>
+    <string name="settings_tag_translation_message">Githubにて翻訳に参加できます</string>
+    <string name="settings_concurrent_download">並列ダウンロード</string>
 </resources>

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

@@ -128,7 +128,7 @@
     <string name="settings_lock_fingerprint_prompt_subtitle">힘세고 강한 지문 인식</string>
     <string name="default_query_dialog_filter_loli">판사님 저는 페도가 아닙니다</string>
     <string name="settings_user_id">유저 ID</string>
-    <string name="settings_user_id_toast">유저 ID를 클립보드에 복사했습니다</string>
+    <string name="copied_to_clipboard">클립보드에 복사됨</string>
     <string name="reader_fab_retry">재시도</string>
     <string name="reader_fab_auto">눈 깜빡임 감지 스크롤</string>
     <string name="search_all">모든 갤러리 검색</string>
@@ -152,4 +152,7 @@
     <string name="error">오류</string>
     <string name="settings_cache_limit">캐시 크기 제한</string>
     <string name="settings_cache_unlimited">무제한</string>
+    <string name="settings_tag_translation">태그 언어</string>
+    <string name="settings_tag_translation_message">Github에서 번역에 참여하세요</string>
+    <string name="settings_concurrent_download">병렬 다운로드</string>
 </resources>

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

@@ -30,6 +30,8 @@
 
     <string name="ignore_update">Ignore</string>
 
+    <string name="copied_to_clipboard">Copied to clipboard</string>
+
     <string name="channel_download">Download</string>
     <string name="channel_download_description">Shows download status</string>
 
@@ -175,6 +177,9 @@
     <!-- SETTINGS/MISCELLANEOUS -->
 
     <string name="settings_miscellaneous_title">Miscellaneous</string>
+    <string name="settings_tag_translation">Tag Language</string>
+    <string name="settings_concurrent_download">Concurrent Download</string>
+    <string name="settings_tag_translation_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>
@@ -184,7 +189,6 @@
     <string name="settings_dark_mode_summary">Protect yourself against light attacks!</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>
     <string name="settings_oss">Open Source Notice</string>
 
     <!-- MANAGE FAVORITES -->

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"
@@ -76,6 +75,11 @@
     <PreferenceCategory
         app:title="@string/settings_miscellaneous_title">
 
+        <ListPreference
+            app:key="tag_translation"
+            app:title="@string/settings_tag_translation"
+            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.1.0'
         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.properties

@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
+org.gradle.caching=true
 kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 01 20:54:37 KST 2020
+#Tue Oct 13 22:37:11 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip