Merge pull request #331 from Inhishonor/translation-skill

Author: Stypox

app/build.gradle.kts

@@ -1,12 +1,14 @@
 import org.gradle.configurationcache.extensions.capitalized
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.stypox.dicio.unicodeCldrPlugin.UnicodeCldrLanguagesTask
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
         classpath(libs.dicio.sentences.compiler.plugin)
+        classpath(libs.dicio.unicode.cldr.plugin)
     }
 }
 
@@ -20,6 +22,7 @@ plugins {
     alias(libs.plugins.com.google.dagger.hilt.android)
     alias(libs.plugins.com.google.protobuf)
     alias(libs.plugins.dicio.sentences.compiler.plugin)
+    alias(libs.plugins.dicio.unicode.cldr.plugin)
 }
 
 android {
@@ -36,11 +39,6 @@ android {
 
         vectorDrawables.useSupportLibrary = true
 
-        // add folders generated by sentencesCompiler task
-        sourceSets["main"].java {
-            srcDir("build/generated/source/sentences/main")
-        }
-
         ndk {
             abiFilters += arrayOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
         }
@@ -116,6 +114,12 @@ androidComponents {
     }
 }
 
+tasks.withType(UnicodeCldrLanguagesTask::class) {
+    // tell the UnicodeCldrLanguagesTask plugin which git commit of the
+    // https://github.com/unicode-org/cldr repo to use as a source of data
+    unicodeCldrGitCommit = libs.versions.unicodeCldrGitCommit
+}
+
 dependencies {
     // Desugaring
     coreLibraryDesugaring(libs.desugar.jdk.libs)

app/src/main/kotlin/org/stypox/dicio/error/ExceptionUtils.kt

@@ -1,17 +1,26 @@
 package org.stypox.dicio.error
 
-import java.io.IOException
 import java.io.InterruptedIOException
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.net.ConnectException
 import java.net.SocketException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLException
 
 object ExceptionUtils {
     fun isNetworkError(throwable: Throwable?): Boolean {
         return hasAssignableCause(
-            throwable,  // network api cancellation
-            IOException::class.java, SocketException::class.java,  // blocking code disposed
-            InterruptedException::class.java, InterruptedIOException::class.java
+            throwable,
+
+            UnknownHostException::class.java,
+            SSLException::class.java,
+            ConnectException::class.java,
+            SocketException::class.java,
+
+            // blocking code disposed
+            InterruptedException::class.java,
+            InterruptedIOException::class.java,
         )
     }
 

app/src/main/kotlin/org/stypox/dicio/eval/SkillHandler.kt

@@ -28,6 +28,7 @@ import org.stypox.dicio.skills.open.OpenInfo
 import org.stypox.dicio.skills.search.SearchInfo
 import org.stypox.dicio.skills.telephone.TelephoneInfo
 import org.stypox.dicio.skills.timer.TimerInfo
+import org.stypox.dicio.skills.translation.TranslationInfo
 import org.stypox.dicio.skills.weather.WeatherInfo
 import org.stypox.dicio.skills.joke.JokeInfo
 import javax.inject.Inject
@@ -53,6 +54,7 @@ class SkillHandler @Inject constructor(
         MediaInfo,
         JokeInfo,
         ListeningInfo(dataStore),
+        TranslationInfo,
     )
 
     // TODO add more fallback skills (e.g. search)

app/src/main/kotlin/org/stypox/dicio/skills/search/SearchSkill.kt

@@ -49,23 +49,12 @@ internal fun searchOnDuckDuckGo(ctx: SkillContext, query: String): List<SearchOu
     // make request using headers
     val html: String = ConnectionUtils.getPage(
         DUCK_DUCK_GO_SEARCH_URL + ConnectionUtils.urlEncode(query),
-        object : HashMap<String?, String?>() {
-            init {
-                put(
-                    "User-Agent",
-                    "Mozilla/5.0 (X11; Linux x86_64; rv:135.0) Gecko/20100101 Firefox/135.0"
-                )
-                put(
-                    "Accept",
-                    "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
-                )
-                put(
-                    "Host",
-                    "html.duckduckgo.com"
-                )
-                put("Cookie", "kl=$locale")
-            }
-        }
+        mapOf(
+            "User-Agent" to "Mozilla/5.0 (X11; Linux x86_64; rv:135.0) Gecko/20100101 Firefox/135.0",
+            "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+            "Host" to "html.duckduckgo.com",
+            "Cookie" to "kl=$locale",
+        )
     )
 
     val document: Document = Jsoup.parse(html)

app/src/main/kotlin/org/stypox/dicio/skills/translation/TranslationInfo.kt

@@ -0,0 +1,43 @@
+package org.stypox.dicio.skills.translation
+
+import android.content.Context
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Language
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.core.os.LocaleListCompat
+import org.dicio.skill.context.SkillContext
+import org.dicio.skill.skill.Skill
+import org.dicio.skill.skill.SkillInfo
+import org.stypox.dicio.R
+import org.stypox.dicio.sentences.Sentences
+import org.stypox.dicio.util.LocaleUtils
+
+object TranslationInfo : SkillInfo("translation") {
+    override fun name(context: Context) =
+        context.getString(R.string.skill_name_translation)
+
+    override fun sentenceExample(context: Context) =
+        context.getString(R.string.skill_sentence_example_translation)
+
+    @Composable
+    override fun icon() =
+        rememberVectorPainter(Icons.Default.Language)
+
+    override fun isAvailable(ctx: SkillContext): Boolean {
+        val hasSupportedLocale = try {
+            LocaleUtils.resolveSupportedLocale(
+                LocaleListCompat.create(ctx.locale),
+                TranslationSkill.TRANSLATE_SUPPORTED_LOCALES
+            )
+            true
+        } catch (ignored: LocaleUtils.UnsupportedLocaleException) {
+            false
+        }
+        return (Sentences.Translation[ctx.sentencesLanguage] != null) && hasSupportedLocale
+    }
+
+    override fun build(ctx: SkillContext): Skill<*> {
+        return TranslationSkill(TranslationInfo, Sentences.Translation[ctx.sentencesLanguage]!!)
+    }
+}