gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

issue 2931 progress

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-15 10:12:48 -05:00 committed by Andy Scherzinger
parent 9e9c6e81b9
commit b91e17ca3d
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,23 +2,14 @@ package com.nextcloud.talk.translate
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.os.Bundle import android.os.Bundle
import android.text.method.ScrollingMovementMethod import android.text.method.ScrollingMovementMethod
import android.util.Log
import android.view.View
import autodagger.AutoInjector import autodagger.AutoInjector
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.BaseActivity import com.nextcloud.talk.activities.BaseActivity
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.ActivityTranslateBinding import com.nextcloud.talk.databinding.ActivityTranslateBinding
import com.nextcloud.talk.models.json.translations.TranslationsOverall
import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.users.UserManager
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys
import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import javax.inject.Inject import javax.inject.Inject
@ -37,8 +28,6 @@ class TranslateActivity : BaseActivity()
@Inject @Inject
lateinit var userManager: UserManager lateinit var userManager: UserManager
lateinit var currentUser : User
var text : String? = null var text : String? = null
var fromLanguage : String = "en" var fromLanguage : String = "en"
@ -48,7 +37,7 @@ class TranslateActivity : BaseActivity()
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityTranslateBinding.inflate(layoutInflater) binding = ActivityTranslateBinding.inflate(layoutInflater)
currentUser = userManager.currentUser.blockingGet()
setupTextViews() setupTextViews()
setupActionBar() setupActionBar()
setupSpinners() setupSpinners()
@ -77,7 +66,7 @@ class TranslateActivity : BaseActivity()
val bundle = intent.extras val bundle = intent.extras
binding.originalMessageTextview.text = bundle?.getString(BundleKeys.KEY_TRANSLATE_MESSAGE) binding.originalMessageTextview.text = bundle?.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
text = binding.originalMessageTextview.text as String? text = bundle?.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
} }
@ -91,36 +80,38 @@ class TranslateActivity : BaseActivity()
// TODO get this function working // TODO get this function working
private fun translate() { private fun translate() {
val credentials = ApiUtils.getCredentials(currentUser.username, currentUser.token) // var currentUser = userManager.currentUser.blockingGet()
val translateURL = currentUser.baseUrl + "/translation" + "/translate" // Log.d("TranslateActivity Current User", currentUser.toString())
// val credentials = ApiUtils.getCredentials(currentUser.username, currentUser.token)
// val translateURL = currentUser.baseUrl + "/translation" + "/translate"
ncApi.translateMessage(credentials, translateURL, text, fromLanguage, toLanguage) // ncApi.translateMessage(credentials, translateURL, text, fromLanguage, toLanguage)
?.subscribeOn(Schedulers.io()) // ?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread()) // ?.observeOn(AndroidSchedulers.mainThread())
?.subscribe(object : Observer<TranslationsOverall> { // ?.subscribe(object : Observer<TranslationsOverall> {
override fun onSubscribe(d: Disposable) { // override fun onSubscribe(d: Disposable) {
// TODO set progress bar to show // // TODO set progress bar to show
binding.translatedMessageTextview.visibility = View.GONE // binding.translatedMessageTextview.visibility = View.GONE
binding.progressBar.visibility = View.VISIBLE // binding.progressBar.visibility = View.VISIBLE
} // }
//
override fun onNext(translationOverall: TranslationsOverall) { // override fun onNext(translationOverall: TranslationsOverall) {
// TODO hide progress bar // // TODO hide progress bar
binding.progressBar.visibility = View.GONE // binding.progressBar.visibility = View.GONE
binding.translatedMessageTextview.visibility = View.VISIBLE // binding.translatedMessageTextview.visibility = View.VISIBLE
binding.translatedMessageTextview.text = translationOverall.ocs?.data?.text // binding.translatedMessageTextview.text = translationOverall.ocs?.data?.text
} // }
//
override fun onError(e: Throwable) { // override fun onError(e: Throwable) {
Log.e("TranslateActivity", "Error") // Log.e("TranslateActivity", "Error")
} // }
//
override fun onComplete() { // override fun onComplete() {
// not needed? // // not needed?
} // }
}) // })
} }