Tag translation

app/release/output-metadata.json

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

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

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/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
@@ -129,3 +132,9 @@ fun String.ellipsize(n: Int): String =
         this.slice(0 until n) + "…"
     else
         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/res/values-ja/strings.xml

@@ -152,4 +152,6 @@
     <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

@@ -152,4 +152,6 @@
     <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/strings.xml

@@ -175,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>

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,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"