mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-14 00:05:04 +01:00
issue 2931 progress - final push I hope
Signed-off-by: Julius Linus <juliuslinus1@gmail.com> Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
0f8aa7f9e6
commit
5bc0f82398
@ -660,11 +660,4 @@ public interface NcApi {
|
||||
@POST
|
||||
Observable<TranslationsOverall> translateMessage(@Header("Authorization") String authorization,
|
||||
@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
|
||||
}
|
||||
|
@ -43,15 +43,13 @@ class TranslateActivity : BaseActivity()
|
||||
@Inject
|
||||
lateinit var userManager: UserManager
|
||||
|
||||
|
||||
|
||||
|
||||
var fromLanguages = arrayOf<String>()
|
||||
|
||||
var toLanguages = arrayOf<String>()
|
||||
|
||||
var text : String? = null
|
||||
|
||||
var check : Int = 0
|
||||
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@ -65,7 +63,6 @@ class TranslateActivity : BaseActivity()
|
||||
setupSpinners()
|
||||
getLanguageOptions()
|
||||
translate(null, Locale.getDefault().language)
|
||||
|
||||
}
|
||||
|
||||
private fun setupActionBar() {
|
||||
@ -132,9 +129,9 @@ class TranslateActivity : BaseActivity()
|
||||
val credentials : String = ApiUtils.getCredentials(currentUser.username, currentUser.token)
|
||||
val translateURL = currentUser.baseUrl +
|
||||
"/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)
|
||||
?.subscribeOn(Schedulers.io())
|
||||
?.observeOn(AndroidSchedulers.mainThread())
|
||||
@ -195,13 +192,15 @@ class TranslateActivity : BaseActivity()
|
||||
binding.toLanguageSpinner.adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item,
|
||||
toLanguages)
|
||||
|
||||
// TODO set up onclickers make sure to deal with options becoming unavaliable in the spinner onClicker
|
||||
binding.fromLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
||||
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
|
||||
var fromLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
|
||||
var toLabel : String = getISOFromLanguage(binding.toLanguageSpinner.selectedItem.toString())
|
||||
Log.i("TranslateActivity", "fromLanguageSpinner :: fromLabel = $fromLabel, toLabel = $toLabel")
|
||||
translate(fromLabel, toLabel)
|
||||
if(++check > 1) {
|
||||
var fromLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
|
||||
var toLabel : String = getISOFromLanguage(binding.toLanguageSpinner.selectedItem.toString())
|
||||
Log.i("TranslateActivity", "fromLanguageSpinner :: fromLabel = $fromLabel, toLabel = $ count: " +
|
||||
"$check")
|
||||
translate(fromLabel, toLabel)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNothingSelected(parent: AdapterView<*>) {
|
||||
@ -211,10 +210,13 @@ class TranslateActivity : BaseActivity()
|
||||
|
||||
binding.toLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
||||
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
|
||||
var toLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
|
||||
var fromLabel : String = getISOFromLanguage(binding.fromLanguageSpinner.selectedItem.toString())
|
||||
Log.i("TranslateActivity", "toLanguageSpinner :: fromLabel = $fromLabel, toLabel = $toLabel")
|
||||
translate(fromLabel, toLabel)
|
||||
if(++check > 2) {
|
||||
var toLabel : String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
|
||||
var fromLabel : String = getISOFromLanguage(binding.fromLanguageSpinner.selectedItem.toString())
|
||||
Log.i("TranslateActivity", "toLanguageSpinner :: fromLabel = $fromLabel, toLabel = $toLabel " +
|
||||
"count: $check")
|
||||
translate(fromLabel, toLabel)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNothingSelected(parent: AdapterView<*>) {
|
||||
@ -222,8 +224,6 @@ class TranslateActivity : BaseActivity()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user