v0.77.1

vitorpamplona · Sep 20, 2023 · 791debb · 791debb
1 parent 3bb5a4e
commit 791debb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 297
-        versionName "0.77.0"
+        versionCode 298
+        versionName "0.77.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
@@ -26,9 +26,7 @@ import com.vitorpamplona.amethyst.service.Nip11Retriever
 import com.vitorpamplona.amethyst.service.OnlineChecker
 import com.vitorpamplona.amethyst.service.ZapPaymentHandler
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
 import com.vitorpamplona.amethyst.ui.actions.Dao
-import com.vitorpamplona.amethyst.ui.components.TranslationConfig
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 import com.vitorpamplona.amethyst.ui.note.ZapAmountCommentNotification
 import com.vitorpamplona.amethyst.ui.note.ZapraiserStatus
@@ -566,27 +564,9 @@ class AccountViewModel(val account: Account) : ViewModel(), Dao {
         }
     }
 
-    fun translate(content: String, onTranslated: (TranslationConfig) -> Unit) {
+    fun runOnIO(runOnIO: () -> Unit) {
         viewModelScope.launch(Dispatchers.IO) {
-            LanguageTranslatorService.autoTranslate(
-                content,
-                account.dontTranslateFrom,
-                account.translateTo
-            ).addOnCompleteListener { task ->
-                if (task.isSuccessful && !content.equals(task.result.result, true)) {
-                    if (task.result.sourceLang != null && task.result.targetLang != null) {
-                        val preference = account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
-                        val newConfig = TranslationConfig(
-                            result = task.result.result,
-                            sourceLang = task.result.sourceLang,
-                            targetLang = task.result.targetLang,
-                            showOriginal = preference == task.result.sourceLang
-                        )
-
-                        onTranslated(newConfig)
-                    }
-                }
-            }
+            runOnIO()
         }
     }
 

diff --git a/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt b/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.core.os.ConfigurationCompat
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
@@ -304,6 +305,26 @@ fun TranslateAndWatchLanguageChanges(content: String, accountViewModel: AccountV
     val accountState by accountViewModel.accountLanguagesLiveData.observeAsState()
 
     LaunchedEffect(accountState) {
-        accountViewModel.translate(content, onTranslated)
+        accountViewModel.runOnIO {
+            LanguageTranslatorService.autoTranslate(
+                content,
+                accountViewModel.account.dontTranslateFrom,
+                accountViewModel.account.translateTo
+            ).addOnCompleteListener { task ->
+                if (task.isSuccessful && !content.equals(task.result.result, true)) {
+                    if (task.result.sourceLang != null && task.result.targetLang != null) {
+                        val preference = accountViewModel.account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
+                        val newConfig = TranslationConfig(
+                            result = task.result.result,
+                            sourceLang = task.result.sourceLang,
+                            targetLang = task.result.targetLang,
+                            showOriginal = preference == task.result.sourceLang
+                        )
+
+                        onTranslated(newConfig)
+                    }
+                }
+            }
+        }
     }
 }