update to echo v3 & romanization

Author: rebelonion

app/build.gradle.kts

@@ -7,9 +7,8 @@ plugins {
 
 dependencies {
     implementation(project(":ext"))
-    val libVersion: String by project
-    compileOnly("com.github.brahmkshatriya:echo:$libVersion")
-    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
+    compileOnly("dev.brahmkshatriya.echo:common:1.0")
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.2.10")
 }
 
 val extType: String by project
@@ -58,11 +57,11 @@ tasks.register("uninstall") {
 
 android {
     namespace = "dev.brahmkshatriya.echo.extension"
-    compileSdk = 35
+    compileSdk = 36
     defaultConfig {
         applicationId = "dev.brahmkshatriya.echo.extension.$extId"
         minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
 
         manifestPlaceholders.apply {
             put("type", "dev.brahmkshatriya.echo.${extType}")

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.application") version "8.10.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
-    id("org.jetbrains.kotlin.jvm") version "2.0.0" apply false
+    id("com.android.application") version "8.13.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.10" apply false
+    id("org.jetbrains.kotlin.jvm") version "2.2.10" apply false
 }

ext/build.gradle.kts

@@ -4,7 +4,7 @@ import java.io.IOException
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
-    id("com.gradleup.shadow") version "8.3.0"
+    id("com.gradleup.shadow") version "9.1.0"
     kotlin("plugin.serialization") version "2.1.0"
 }
 
@@ -18,18 +18,17 @@ kotlin {
 }
 
 dependencies {
-    val libVersion: String by project
     implementation("com.github.rebelonion:translator:1.1.2") {
         exclude("org.jetbrains.kotlin", "kotlin-stdlib")
         exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-core")
         exclude("org.jetbrains.kotlinx", "kotlinx-serialization-json")
         exclude("com.squareup.okhttp3", "okhttp")
     }
-    compileOnly("com.github.brahmkshatriya:echo:$libVersion")
-    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
+    compileOnly("dev.brahmkshatriya.echo:common:1.0")
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.2.10")
     //compile only kotlinx serialization
-    compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-    compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+    compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
+    compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
 }
 
 // Extension properties goto `gradle.properties` to set values

ext/src/main/java/dev/brahmkshatriya/echo/extension/LyricsTranslator.kt

@@ -6,6 +6,9 @@ import dev.brahmkshatriya.echo.common.MusicExtension
 import dev.brahmkshatriya.echo.common.clients.ExtensionClient
 import dev.brahmkshatriya.echo.common.clients.LyricsClient
 import dev.brahmkshatriya.echo.common.helpers.PagedData
+import dev.brahmkshatriya.echo.common.models.Feed
+import dev.brahmkshatriya.echo.common.models.Feed.Companion.loadAll
+import dev.brahmkshatriya.echo.common.models.Feed.Companion.toFeed
 import dev.brahmkshatriya.echo.common.models.Lyrics
 import dev.brahmkshatriya.echo.common.models.Track
 import dev.brahmkshatriya.echo.common.providers.LyricsExtensionsProvider
@@ -26,13 +29,18 @@ class LyricsTranslator : ExtensionClient, LyricsClient, LyricsExtensionsProvider
 
     ////--------------------------------------------------------------------------------------------
     // ExtensionClient
-    override val settingItems: List<Setting> by lazy {
-        listOf(
+    override suspend fun getSettingItems(): List<Setting> {
+        return listOf(
             SettingSwitch(
                 title = "Translate Lyrics",
                 key = "translateLyrics",
                 defaultValue = true
             ),
+            SettingSwitch(
+                title = "Romanize Translated Lyrics",
+                key = "romanizeTranslatedLyrics",
+                defaultValue = false
+            ),
             SettingList(
                 title = "Translation Language",
                 key = "translationLanguage",
@@ -74,12 +82,16 @@ class LyricsTranslator : ExtensionClient, LyricsClient, LyricsExtensionsProvider
         return settings.getString("preferLyricsFrom")
     }
 
+    private fun romanizeTranslatedLyrics(): Boolean {
+        return settings.getBoolean("romanizeTranslatedLyrics") == true
+    }
+
     ////--------------------------------------------------------------------------------------------
     // LyricsClient
 
     override suspend fun loadLyrics(lyrics: Lyrics): Lyrics {
         if (lyrics.lyrics != null) {
-            return lyrics.translate(selectedLanguage())
+            return lyrics.translate(selectedLanguage(), romanizeTranslatedLyrics())
         } else {
             val id = lyrics.getIdFromLyric()!!
             val extension =
@@ -89,7 +101,7 @@ class LyricsTranslator : ExtensionClient, LyricsClient, LyricsExtensionsProvider
             val client: LyricsClient? = extension.instance.value().getOrThrow() as? LyricsClient
             return runMutatedCatching(extension) {
                 client?.loadLyrics(lyrics)
-                    ?.translate(selectedLanguage()) ?: lyrics
+                    ?.translate(selectedLanguage(), romanizeTranslatedLyrics()) ?: lyrics
             }
         }
     }
@@ -108,7 +120,7 @@ class LyricsTranslator : ExtensionClient, LyricsClient, LyricsExtensionsProvider
                     return@mapNotNull null
                 }
                 runMutatedCatching(lyricsExtension) {
-                    client.searchTrackLyrics(clientId, track).loadList(null).data
+                    client.searchTrackLyrics(clientId, track).loadAll()
                         .map { it.updateMetadata(lyricsExtension) }
                 }
             } catch (e: Exception) {
@@ -126,7 +138,7 @@ class LyricsTranslator : ExtensionClient, LyricsClient, LyricsExtensionsProvider
                     client.searchTrackLyrics(
                         clientId,
                         track
-                    ).loadList(null).data.map { it.updateMetadata(musicExtension) }
+                    ).loadAll().map { it.updateMetadata(musicExtension) }
                 }
             } catch (e: Exception) {
                 null
@@ -144,10 +156,10 @@ class LyricsTranslator : ExtensionClient, LyricsClient, LyricsExtensionsProvider
         return preferredLyrics + currentClient + otherLyrics
     }
 
-    override fun searchTrackLyrics(clientId: String, track: Track): PagedData<Lyrics> =
+    override suspend fun searchTrackLyrics(clientId: String, track: Track): Feed<Lyrics> =
         PagedData.Single {
             getAllLyrics(clientId, track)
-        }
+        }.toFeed()
 
     ////--------------------------------------------------------------------------------------------
     // LyricsExtensionsProvider

ext/src/main/java/dev/brahmkshatriya/echo/extension/lyricsTranslator/helpers/Translation.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.withContext
 import dev.rebelonion.translator.Language
 import dev.rebelonion.translator.Translator
 
-suspend fun Lyrics.translate(language: Language?): Lyrics {
+suspend fun Lyrics.translate(language: Language?, romanize: Boolean): Lyrics {
     if (language == null) {
         return this
     }
@@ -18,17 +18,17 @@ suspend fun Lyrics.translate(language: Language?): Lyrics {
         title = title,
         subtitle = subtitle,
         lyrics = when (val lyr = this.lyrics) {
-            is Lyrics.Timed -> translate(lyr, language)
-            is Lyrics.Simple -> translate(lyr, language)
+            is Lyrics.Timed -> translate(lyr, language, romanize)
+            is Lyrics.Simple -> translate(lyr, language, romanize)
             else -> lyr
         },
         extras = extras
     )
 }
 
-suspend fun translate(lyrics: Lyrics.Timed, language: Language): Lyrics.Timed {
+suspend fun translate(lyrics: Lyrics.Timed, language: Language, romanize: Boolean): Lyrics.Timed {
     val stings = lyrics.list.map { it.text }
-    val translationMap = translateList(stings, language, hardFail = true) ?: return lyrics
+    val translationMap = translateList(stings, language, hardFail = true, romanize) ?: return lyrics
     val items = mutableListOf<Lyrics.Item>()
     lyrics.list.forEach {
         val translatedText = translationMap[it.text] ?: it.text
@@ -37,8 +37,8 @@ suspend fun translate(lyrics: Lyrics.Timed, language: Language): Lyrics.Timed {
     return Lyrics.Timed(items)
 }
 
-suspend fun translate(lyrics: Lyrics.Simple, language: Language): Lyrics.Simple {
-    val translationMap = translateList(listOf(lyrics.text), language, hardFail = true) ?: return lyrics
+suspend fun translate(lyrics: Lyrics.Simple, language: Language, romanize: Boolean): Lyrics.Simple {
+    val translationMap = translateList(listOf(lyrics.text), language, hardFail = true, romanize) ?: return lyrics
     val translatedText = translationMap[lyrics.text] ?: lyrics.text
     return Lyrics.Simple(translatedText)
 }
@@ -48,7 +48,8 @@ private val translationCache = TimeBasedLRUCache<Map<String, String>>(1000)
 private suspend fun translateList(
     list: List<String>,
     language: Language,
-    hardFail: Boolean = false
+    hardFail: Boolean = false,
+    romanize: Boolean
 ): Map<String, String>? {
     if (list.isEmpty()) {
         return emptyMap()
@@ -87,7 +88,11 @@ private suspend fun translateList(
                     }
 
                     val translated = translatedCatch.getOrNull() ?: return@async null
-                    translated.translatedText.split("\n")
+                    if (romanize) {
+                        (translated.translatedPronunciation ?: translated.translatedText).split("\n")
+                    } else {
+                        translated.translatedText.split("\n")
+                    }
                 }
             }.awaitAll()
 

gradle.properties

@@ -3,8 +3,6 @@ android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
 
-libVersion=e0f9973799
-
 extType=lyrics
 extId=lyricstranslator
 extClass=LyricsTranslator

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Feb 19 15:14:17 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists