feat: add button to swap languages in translation dialog (closes #466)

you-apps · Dec 8, 2024 · 44c69d2 · 44c69d2
1 parent ae0cdb9
commit 44c69d2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/app/src/main/java/com/bnyro/translate/ui/components/LanguageSelectionComponent.kt b/app/src/main/java/com/bnyro/translate/ui/components/LanguageSelectionComponent.kt
@@ -145,18 +145,7 @@ fun SwapLanguagesButton(viewModel: TranslationModel) {
 
     IconButton(
         onClick = {
-            if (viewModel.availableLanguages.isEmpty()) return@IconButton
-            if (!switchBtnEnabled) return@IconButton
-            val temp = viewModel.sourceLanguage
-            viewModel.sourceLanguage = viewModel.targetLanguage
-            viewModel.targetLanguage = temp
-
-            if (viewModel.translation.translatedText.isNotEmpty()) {
-                viewModel.insertedText = viewModel.translation.translatedText
-                viewModel.translation = Translation("")
-            }
-
-            viewModel.translateNow(context)
+            if (switchBtnEnabled) viewModel.swapLanguages(context)
         }
     ) {
         Icon(

diff --git a/app/src/main/java/com/bnyro/translate/ui/components/TranslationField.kt b/app/src/main/java/com/bnyro/translate/ui/components/TranslationField.kt
@@ -30,6 +30,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.DoneAll
 import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.SwapHoriz
 import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -95,6 +96,10 @@ fun TranslationField(
 
             Spacer(modifier = Modifier.weight(1f))
 
+            if (isSourceField && showLanguageSelector) {
+                SwapLanguagesButton(translationModel)
+            }
+
             var copyImageVector by remember {
                 mutableStateOf(Icons.Default.ContentCopy)
             }

diff --git a/app/src/main/java/com/bnyro/translate/ui/models/TranslationModel.kt b/app/src/main/java/com/bnyro/translate/ui/models/TranslationModel.kt
@@ -277,6 +277,21 @@ class TranslationModel : ViewModel() {
         )
     }
 
+    fun swapLanguages(context: Context) {
+        if (availableLanguages.isEmpty()) return
+
+        val temp = sourceLanguage
+        sourceLanguage = targetLanguage
+        targetLanguage = temp
+
+        if (translation.translatedText.isNotEmpty()) {
+            insertedText = translation.translatedText
+            translation = Translation("")
+        }
+
+        translateNow(context)
+    }
+
     fun playAudio(languageCode: String, text: String) {
         releaseMediaPlayer()