gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-14 16:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

issue 2931 progress - final push I hope

Browse Source 
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
rapterjet2004 2023-05-16 16:38:45 -05:00 committed by Andy Scherzinger
parent 0f8aa7f9e6
commit 5bc0f82398
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

@ -660,11 +660,4 @@ public interface NcApi {
@POST @POST
Observable<TranslationsOverall> translateMessage(@Header("Authorization") String authorization, Observable<TranslationsOverall> translateMessage(@Header("Authorization") String authorization,
@Url String url); @Url String url);
// @GET
// Observable<TranslationsOverall> getLanguageOptions(@Header("Authorization") String authorization,
// @Url String url,
// @Field("languageDetection") String fromLanguage,
// @Field("languages") Object languages[]);
// TODO finish ^ function declaration
} }

34
app/src/main/java/com/nextcloud/talk/translate/TranslateActivity.kt
View File

@ -43,15 +43,13 @@ class TranslateActivity : BaseActivity()
@Inject @Inject
lateinit var userManager: UserManager lateinit var userManager: UserManager
var fromLanguages = arrayOf<String>() var fromLanguages = arrayOf<String>()
var toLanguages = arrayOf<String>() var toLanguages = arrayOf<String>()
var text : String? = null var text : String? = null
var check : Int = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -65,7 +63,6 @@ class TranslateActivity : BaseActivity()
setupSpinners() setupSpinners()
getLanguageOptions() getLanguageOptions()
translate(null, Locale.getDefault().language) translate(null, Locale.getDefault().language)
} }
private fun setupActionBar() { private fun setupActionBar() {
@ -132,9 +129,9 @@ class TranslateActivity : BaseActivity()
val credentials : String = ApiUtils.getCredentials(currentUser.username, currentUser.token) val credentials : String = ApiUtils.getCredentials(currentUser.username, currentUser.token)
val translateURL = currentUser.baseUrl + val translateURL = currentUser.baseUrl +
"/ocs/v2.php/translation/translate?text=$text&toLanguage=$toLanguage" + "/ocs/v2.php/translation/translate?text=$text&toLanguage=$toLanguage" +
if(fromLanguage != "") { "&fromLanguage=$fromLanguage" } else {""} if(fromLanguage != null && fromLanguage != "") { "&fromLanguage=$fromLanguage" } else {""}
Log.i("TranslateActivity", "Url is: $translateURL")
ncApi.translateMessage(credentials, translateURL) ncApi.translateMessage(credentials, translateURL)
?.subscribeOn(Schedulers.io()) ?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread()) ?.observeOn(AndroidSchedulers.mainThread())
@ -195,13 +192,15 @@ class TranslateActivity : BaseActivity()
binding.toLanguageSpinner.adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, binding.toLanguageSpinner.adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item,
toLanguages) toLanguages)
// TODO set up onclickers make sure to deal with options becoming unavaliable in the spinner onClicker
binding.fromLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { binding.fromLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
var fromLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString()) if(++check > 1) {
var toLabel : String = getISOFromLanguage(binding.toLanguageSpinner.selectedItem.toString()) var fromLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
Log.i("TranslateActivity", "fromLanguageSpinner :: fromLabel = $fromLabel, toLabel = $toLabel") var toLabel : String = getISOFromLanguage(binding.toLanguageSpinner.selectedItem.toString())
translate(fromLabel, toLabel) Log.i("TranslateActivity", "fromLanguageSpinner :: fromLabel = $fromLabel, toLabel = $ count: " +
"$check")
translate(fromLabel, toLabel)
}
} }
override fun onNothingSelected(parent: AdapterView<*>) { override fun onNothingSelected(parent: AdapterView<*>) {
@ -211,10 +210,13 @@ class TranslateActivity : BaseActivity()
binding.toLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { binding.toLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
var toLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString()) if(++check > 2) {
var fromLabel : String = getISOFromLanguage(binding.fromLanguageSpinner.selectedItem.toString()) var toLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
Log.i("TranslateActivity", "toLanguageSpinner :: fromLabel = $fromLabel, toLabel = $toLabel") var fromLabel : String = getISOFromLanguage(binding.fromLanguageSpinner.selectedItem.toString())
translate(fromLabel, toLabel) Log.i("TranslateActivity", "toLanguageSpinner :: fromLabel = $fromLabel, toLabel = $toLabel " +
"count: $check")
translate(fromLabel, toLabel)
}
} }
override fun onNothingSelected(parent: AdapterView<*>) { override fun onNothingSelected(parent: AdapterView<*>) {
@ -222,8 +224,6 @@ class TranslateActivity : BaseActivity()
} }
} }
} }