From a150f5c59636fab233904194a5d955a45040733b Mon Sep 17 00:00:00 2001
From: theberdakh <theberdakh@gmail.com>
Date: Sat, 3 Aug 2024 18:23:14 +0500
Subject: [PATCH] add transliterate from from-to.uz

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .idea/other.xml                               | 11 -----
 .../screen/translate/TranslateFragment.kt     | 12 ++---
 .../java/com/theberdakh/fromtouz/Calls.kt     | 47 ++++++++++++++++++-
 .../theberdakh/fromtouz/api/FromToUzApi.kt    |  9 +++-
 .../transliterate/TransliterateLanguage.kt    |  8 ++++
 .../request/TransliterateBody.kt              | 11 +++++
 .../request/TransliterateRequest.kt           |  5 ++
 .../response/TransliterateResponse.kt         |  5 ++
 9 files changed, 85 insertions(+), 25 deletions(-)
 create mode 100644 fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/TransliterateLanguage.kt
 create mode 100644 fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateBody.kt
 create mode 100644 fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateRequest.kt
 create mode 100644 fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/response/TransliterateResponse.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 2159e85..b268ef3 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="MainActivity">
+      <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>
diff --git a/.idea/other.xml b/.idea/other.xml
index 0d3a1fb..4604c44 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -179,17 +179,6 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q2q" />
-          <option name="id" value="q2q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold3" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1768" />
-          <option name="screenY" value="2208" />
-        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
diff --git a/app/src/main/java/com/theberdakh/from2/screen/translate/TranslateFragment.kt b/app/src/main/java/com/theberdakh/from2/screen/translate/TranslateFragment.kt
index 4cca23b..ad51944 100644
--- a/app/src/main/java/com/theberdakh/from2/screen/translate/TranslateFragment.kt
+++ b/app/src/main/java/com/theberdakh/from2/screen/translate/TranslateFragment.kt
@@ -5,25 +5,16 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
-import android.net.Network
 import android.os.Bundle
 import android.text.Editable
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.WindowManager
-import androidx.appcompat.app.ActionBar.LayoutParams
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
-import androidx.core.widget.addTextChangedListener
 import androidx.core.widget.doAfterTextChanged
-import androidx.core.widget.doBeforeTextChanged
-import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.theberdakh.from2.R
 import com.theberdakh.from2.data.Language
@@ -36,6 +27,8 @@ import com.theberdakh.from2.util.showUpMenu
 import com.theberdakh.fromtouz.getAllTranslateLanguages
 import com.theberdakh.fromtouz.translate
 import com.theberdakh.fromtouz.translate.TranslateLanguage
+import com.theberdakh.fromtouz.transliterate
+import com.theberdakh.fromtouz.transliterate.TransliterateLanguage
 import kotlinx.coroutines.launch
 
 
@@ -129,6 +122,7 @@ class TranslateFragment : Fragment() {
             binding.editTextTopInput.setText("")
         }
 
+
         binding.editTextTopInput.doAfterTextChanged { text: Editable? ->
             Log.d(TAG, "EditText: doAfter: $text")
             translateText(text.toString())
diff --git a/fromtouz/src/main/java/com/theberdakh/fromtouz/Calls.kt b/fromtouz/src/main/java/com/theberdakh/fromtouz/Calls.kt
index 0e6f1d4..bf32b0e 100644
--- a/fromtouz/src/main/java/com/theberdakh/fromtouz/Calls.kt
+++ b/fromtouz/src/main/java/com/theberdakh/fromtouz/Calls.kt
@@ -3,6 +3,9 @@ package com.theberdakh.fromtouz
 import com.theberdakh.fromtouz.translate.TranslateLanguage
 import com.theberdakh.fromtouz.translate.request.TranslateBody
 import com.theberdakh.fromtouz.translate.request.TranslateRequest
+import com.theberdakh.fromtouz.transliterate.TransliterateLanguage
+import com.theberdakh.fromtouz.transliterate.request.TransliterateBody
+import com.theberdakh.fromtouz.transliterate.request.TransliterateRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
@@ -10,7 +13,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 
 fun getAllTranslateLanguages() = TranslateLanguage.entries.toTypedArray()
-
+fun getAllTransliterateLanguages() = TransliterateLanguage.entries.toTypedArray()
 
 suspend fun translate(
     langFrom: TranslateLanguage, langTo: TranslateLanguage, text: String,
@@ -34,6 +37,8 @@ suspend fun translate(
     }
 }
 
+
+
 fun translateRequest(langFrom: String, langTo: String, text: String) = flow {
     val translateBody = TranslateBody(langFrom = langFrom, langTo = langTo, text = text)
     val translateRequest = TranslateRequest(translateBody)
@@ -48,4 +53,42 @@ fun translateRequest(langFrom: String, langTo: String, text: String) = flow {
     }
 }.catch {
     emit(TranslationResult.Error(it))
-}.flowOn(Dispatchers.IO)
\ No newline at end of file
+}.flowOn(Dispatchers.IO)
+
+fun transliterateRequest(langFrom: String, langTo: String, text: String) = flow {
+    val translateBody = TransliterateBody(langFrom = langFrom, langTo = langTo, text = text)
+    val translateRequest = TransliterateRequest(translateBody)
+
+    val response = FromToUzApiClient.fromToUzApi.transliterate(translateRequest)
+    if (response.isSuccessful) {
+        if (response.body() != null) {
+            emit(TranslationResult.Success(response.body()!!))
+        }  else {
+            emit(TranslationResult.Message(response.message()))
+        }
+    }
+}.catch {
+    emit(TranslationResult.Error(it))
+}.flowOn(Dispatchers.IO)
+
+suspend fun transliterate(
+    langFrom: TransliterateLanguage, langTo: TransliterateLanguage, text: String,
+    onSuccess: (String) -> Unit, onMessage: (String) -> Unit, onError: (Throwable) -> Unit
+) {
+    val response = transliterateRequest(langFrom.code, langTo.code, text)
+
+    response.collectLatest {
+        when (it) {
+            is TranslationResult.Success -> {
+                /*Manual handling bug of server that returns Uppercased words even if it starts from lower case*/
+                if (text.isNotEmpty() && text.first().isLowerCase()) {
+                    onSuccess.invoke(it.data.result.replaceFirstChar { firstChar -> firstChar.lowercase() })
+                } else {
+                    onSuccess.invoke(it.data.result)
+                }
+            }
+            is TranslationResult.Message -> onMessage.invoke(it.message)
+            is TranslationResult.Error -> onError.invoke(it.error)
+        }
+    }
+}
\ No newline at end of file
diff --git a/fromtouz/src/main/java/com/theberdakh/fromtouz/api/FromToUzApi.kt b/fromtouz/src/main/java/com/theberdakh/fromtouz/api/FromToUzApi.kt
index a1069a4..2f1acb9 100644
--- a/fromtouz/src/main/java/com/theberdakh/fromtouz/api/FromToUzApi.kt
+++ b/fromtouz/src/main/java/com/theberdakh/fromtouz/api/FromToUzApi.kt
@@ -1,7 +1,9 @@
 package com.theberdakh.fromtouz.api
 
 import com.theberdakh.fromtouz.translate.request.TranslateRequest
-import com.theberdakh.fromtouz.translate.response.TranslateResponse
+import com.theberdakh.fromtouz.transliterate.request.TransliterateBody
+import com.theberdakh.fromtouz.transliterate.request.TransliterateRequest
+import com.theberdakh.fromtouz.transliterate.response.TransliterateResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
@@ -9,6 +11,9 @@ import retrofit2.http.POST
 internal interface FromToUzApi {
 
     @POST("/api/v1/translate")
-    suspend fun translate(@Body translateRequest: TranslateRequest): Response<TranslateResponse>
+    suspend fun translate(@Body translateRequest: TranslateRequest): Response<TransliterateResponse>
+
+    @POST("/api/v1/transliterate")
+    suspend fun transliterate(@Body transliterateRequest: TransliterateRequest): Response<TransliterateResponse>
 
 }
\ No newline at end of file
diff --git a/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/TransliterateLanguage.kt b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/TransliterateLanguage.kt
new file mode 100644
index 0000000..0112e53
--- /dev/null
+++ b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/TransliterateLanguage.kt
@@ -0,0 +1,8 @@
+package com.theberdakh.fromtouz.transliterate
+
+enum class TransliterateLanguage(val code: String) {
+    KARAKALPAK_LATIN("kaa_latin"),
+    KARAKALPAK_CYRILLIC("kaa_cyrillic"),
+    UZBEK_LATIN("uz_latin"),
+    UZBEK_CYRILLIC("uz_cyrillic")
+}
\ No newline at end of file
diff --git a/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateBody.kt b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateBody.kt
new file mode 100644
index 0000000..decef44
--- /dev/null
+++ b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateBody.kt
@@ -0,0 +1,11 @@
+package com.theberdakh.fromtouz.transliterate.request
+
+import com.google.gson.annotations.SerializedName
+
+data class TransliterateBody(
+    @SerializedName("lang_from")
+    val langFrom: String,
+    @SerializedName("lang_to")
+    val langTo: String,
+    val text: String
+)
diff --git a/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateRequest.kt b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateRequest.kt
new file mode 100644
index 0000000..08c26d2
--- /dev/null
+++ b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/request/TransliterateRequest.kt
@@ -0,0 +1,5 @@
+package com.theberdakh.fromtouz.transliterate.request
+
+data class TransliterateRequest(
+    val body: TransliterateBody
+)
diff --git a/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/response/TransliterateResponse.kt b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/response/TransliterateResponse.kt
new file mode 100644
index 0000000..ff8cc92
--- /dev/null
+++ b/fromtouz/src/main/java/com/theberdakh/fromtouz/transliterate/response/TransliterateResponse.kt
@@ -0,0 +1,5 @@
+package com.theberdakh.fromtouz.transliterate.response
+
+data class TransliterateResponse(
+    val result: String
+)