refactor: adapt for new translator json format

timschneeb · Jun 21, 2023 · 587d386 · 587d386
1 parent 00092ea
commit 587d386
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt
@@ -245,7 +245,7 @@ class MainApplication : Application(), SharedPreferences.OnSharedPreferenceChang
                     detectLeakedSqlLiteObjects()
                     detectContentUriWithoutPermission()
                     penaltyLog()
-                    penaltyDeath()
+                    // penaltyDeath()
                 }
                 .build()
         )

diff --git a/.../main/java/me/timschneeberger/rootlessjamesdsp/fragment/settings/SettingsAboutFragment.kt b/.../main/java/me/timschneeberger/rootlessjamesdsp/fragment/settings/SettingsAboutFragment.kt
@@ -14,8 +14,8 @@ import me.timschneeberger.rootlessjamesdsp.BuildConfig
 import me.timschneeberger.rootlessjamesdsp.R
 import me.timschneeberger.rootlessjamesdsp.flavor.UpdateManager
 import me.timschneeberger.rootlessjamesdsp.model.Translator
-import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.toast
 import me.timschneeberger.rootlessjamesdsp.utils.Result
+import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.toast
 import org.koin.android.ext.android.inject
 import java.util.Locale
 
@@ -62,12 +62,12 @@ class SettingsAboutFragment : SettingsBaseFragment() {
 
                 setOnPreferenceClickListener {
                     if(tls.size == 1)
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://crowdin.com/profile/${tls[0].user}")))
+                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://crowdin.com/profile/${tls[0].username}")))
                     else {
                         this@SettingsAboutFragment.context?.let { ctx ->
                             MaterialAlertDialogBuilder(ctx)
                                 .setItems(tls.map { it.name }.toTypedArray()) { dialogInterface, i ->
-                                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://crowdin.com/profile/${tls[i].user}")))
+                                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://crowdin.com/profile/${tls[i].username}")))
                                     dialogInterface.dismiss()
                                 }
                                 .setTitle(title)

diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/model/Translator.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/model/Translator.kt
@@ -11,11 +11,15 @@ import timber.log.Timber
 data class Translator(
     val id: String,
     val name: String,
-    val user: String,
+    val username: String,
+    val picture: String,
     val translated: Int,
     val approved: Int,
-    val languages: List<String>
+    val languages: List<Language>
 ) {
+    @Serializable
+    data class Language(val id: String, val name: String)
+
     companion object {
         fun readLanguageMap(context: Context): Map<String, List<Translator>> {
             val languageMap = mutableMapOf<String, MutableList<Translator>>()
@@ -25,9 +29,11 @@ data class Translator(
                     // At least 8 words
                     if (tl.translated < 8)
                         return@forEach
-                    tl.languages.forEach next@{ lang ->
+                    tl.languages.forEach next@{ langObj ->
+                        val lang = langObj.id
+
                         // Fix: only display my name for German, not all languages
-                        if (tl.user == "ThePBone" && lang != "de")
+                        if (tl.username == "ThePBone" && lang != "de")
                             return@next
 
                         if (languageMap[lang] == null)