mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-10 22:34:15 +01:00
fixing detekt errors :|
Signed-off-by: Julius Linus <julius.linus@nextcloud.com>
This commit is contained in:
parent
847c21d710
commit
5a18a05654
@ -5,10 +5,10 @@ import io.reactivex.Observable
|
|||||||
interface TranslateRepository {
|
interface TranslateRepository {
|
||||||
|
|
||||||
fun translateMessage(
|
fun translateMessage(
|
||||||
authorization : String,
|
authorization: String,
|
||||||
url: String,
|
url: String,
|
||||||
text: String,
|
text: String,
|
||||||
toLanguage: String,
|
toLanguage: String,
|
||||||
fromLanguage: String?
|
fromLanguage: String?
|
||||||
) : Observable<String>
|
): Observable<String>
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,6 @@ class TranslateRepositoryImpl @Inject constructor(private val ncApi: NcApi) : Tr
|
|||||||
toLanguage: String,
|
toLanguage: String,
|
||||||
fromLanguage: String?
|
fromLanguage: String?
|
||||||
): Observable<String> {
|
): Observable<String> {
|
||||||
return ncApi.translateMessage(authorization, url, text, toLanguage, fromLanguage).map { it.ocs?.data!!.text}
|
return ncApi.translateMessage(authorization, url, text, toLanguage, fromLanguage).map { it.ocs?.data!!.text }
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -58,8 +58,8 @@ class TranslateActivity : BaseActivity() {
|
|||||||
lateinit var viewModel: TranslateViewModel
|
lateinit var viewModel: TranslateViewModel
|
||||||
lateinit var binding: ActivityTranslateBinding
|
lateinit var binding: ActivityTranslateBinding
|
||||||
|
|
||||||
private var toLanguages : Array<String>? = null
|
private var toLanguages: Array<String>? = null
|
||||||
private var fromLanguages : Array<String>? = null
|
private var fromLanguages: Array<String>? = null
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@ -67,10 +67,10 @@ class TranslateActivity : BaseActivity() {
|
|||||||
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
|
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
|
||||||
|
|
||||||
binding = ActivityTranslateBinding.inflate(layoutInflater)
|
binding = ActivityTranslateBinding.inflate(layoutInflater)
|
||||||
viewModel = ViewModelProvider(this, viewModelFactory)[TranslateViewModel::class.java]
|
viewModel = ViewModelProvider(this, viewModelFactory)[TranslateViewModel::class.java]
|
||||||
|
|
||||||
viewModel.viewState.observe(this) { state ->
|
viewModel.viewState.observe(this) { state ->
|
||||||
when(state) {
|
when (state) {
|
||||||
is TranslateViewModel.StartState -> {
|
is TranslateViewModel.StartState -> {
|
||||||
onStartState()
|
onStartState()
|
||||||
}
|
}
|
||||||
@ -93,7 +93,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
setupCopyButton()
|
setupCopyButton()
|
||||||
|
|
||||||
if (savedInstanceState == null) {
|
if (savedInstanceState == null) {
|
||||||
val text = intent.extras !!.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
|
val text = intent.extras!!.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
|
||||||
viewModel.translateMessage(Locale.getDefault().language, null, text!!)
|
viewModel.translateMessage(Locale.getDefault().language, null, text!!)
|
||||||
} else {
|
} else {
|
||||||
binding.translatedMessageTextview.text = savedInstanceState.getString(BundleKeys.SAVED_TRANSLATED_MESSAGE)
|
binding.translatedMessageTextview.text = savedInstanceState.getString(BundleKeys.SAVED_TRANSLATED_MESSAGE)
|
||||||
@ -150,7 +150,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
|
|
||||||
binding.originalMessageTextview.movementMethod = ScrollingMovementMethod()
|
binding.originalMessageTextview.movementMethod = ScrollingMovementMethod()
|
||||||
binding.translatedMessageTextview.movementMethod = ScrollingMovementMethod()
|
binding.translatedMessageTextview.movementMethod = ScrollingMovementMethod()
|
||||||
val text =intent.extras !!.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
|
val text = intent.extras!!.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
|
||||||
binding.originalMessageTextview.text = text
|
binding.originalMessageTextview.text = text
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -228,7 +228,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
viewThemeUtils.material.colorTextInputLayout(binding.fromLanguageInputLayout)
|
viewThemeUtils.material.colorTextInputLayout(binding.fromLanguageInputLayout)
|
||||||
viewThemeUtils.material.colorTextInputLayout(binding.toLanguageInputLayout)
|
viewThemeUtils.material.colorTextInputLayout(binding.toLanguageInputLayout)
|
||||||
fillSpinners()
|
fillSpinners()
|
||||||
val text = intent.extras !!.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
|
val text = intent.extras!!.getString(BundleKeys.KEY_TRANSLATE_MESSAGE)
|
||||||
|
|
||||||
binding.fromLanguage.onItemClickListener = AdapterView.OnItemClickListener { parent, _, position, _ ->
|
binding.fromLanguage.onItemClickListener = AdapterView.OnItemClickListener { parent, _, position, _ ->
|
||||||
val fromLabel: String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
|
val fromLabel: String = getISOFromLanguage(parent.getItemAtPosition(position).toString())
|
||||||
@ -271,7 +271,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
binding.copyTranslatedMessage.visibility = View.GONE
|
binding.copyTranslatedMessage.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onTranslatedState(msg : String) {
|
private fun onTranslatedState(msg: String) {
|
||||||
binding.progressBar.visibility = View.GONE
|
binding.progressBar.visibility = View.GONE
|
||||||
binding.translatedMessageContainer.visibility = View.VISIBLE
|
binding.translatedMessageContainer.visibility = View.VISIBLE
|
||||||
binding.translatedMessageTextview.text = msg
|
binding.translatedMessageTextview.text = msg
|
||||||
@ -290,5 +290,4 @@ class TranslateActivity : BaseActivity() {
|
|||||||
private const val FROM_LABEL = "fromLabel"
|
private const val FROM_LABEL = "fromLabel"
|
||||||
private const val TO_LABEL = "toLabel"
|
private const val TO_LABEL = "toLabel"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,10 @@ import io.reactivex.disposables.Disposable
|
|||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class TranslateViewModel @Inject constructor(private val repository: TranslateRepository,
|
class TranslateViewModel @Inject constructor(
|
||||||
private val userManager: UserManager) : ViewModel() {
|
private val repository: TranslateRepository,
|
||||||
|
private val userManager: UserManager
|
||||||
|
) : ViewModel() {
|
||||||
|
|
||||||
sealed interface ViewState
|
sealed interface ViewState
|
||||||
|
|
||||||
@ -23,8 +25,8 @@ class TranslateViewModel @Inject constructor(private val repository: TranslateRe
|
|||||||
class TranslatedState(val msg: String) : ViewState
|
class TranslatedState(val msg: String) : ViewState
|
||||||
object ErrorState : ViewState
|
object ErrorState : ViewState
|
||||||
|
|
||||||
private val _viewState : MutableLiveData<ViewState> = MutableLiveData(StartState)
|
private val _viewState: MutableLiveData<ViewState> = MutableLiveData(StartState)
|
||||||
val viewState : LiveData<ViewState>
|
val viewState: LiveData<ViewState>
|
||||||
get() = _viewState
|
get() = _viewState
|
||||||
|
|
||||||
fun translateMessage(toLanguage: String, fromLanguage: String?, text: String) {
|
fun translateMessage(toLanguage: String, fromLanguage: String?, text: String) {
|
||||||
@ -33,8 +35,13 @@ class TranslateViewModel @Inject constructor(private val repository: TranslateRe
|
|||||||
val url: String = ApiUtils.getUrlForTranslation(currentUser.baseUrl)
|
val url: String = ApiUtils.getUrlForTranslation(currentUser.baseUrl)
|
||||||
val calculatedFromLanguage = if (fromLanguage == null || fromLanguage == "") { null } else { fromLanguage }
|
val calculatedFromLanguage = if (fromLanguage == null || fromLanguage == "") { null } else { fromLanguage }
|
||||||
Log.i(TAG, "translateMessage Called")
|
Log.i(TAG, "translateMessage Called")
|
||||||
repository.translateMessage(authorization, url,text,toLanguage,
|
repository.translateMessage(
|
||||||
calculatedFromLanguage)
|
authorization,
|
||||||
|
url,
|
||||||
|
text,
|
||||||
|
toLanguage,
|
||||||
|
calculatedFromLanguage
|
||||||
|
)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
?.observeOn(AndroidSchedulers.mainThread())
|
?.observeOn(AndroidSchedulers.mainThread())
|
||||||
?.subscribe(TranslateObserver())
|
?.subscribe(TranslateObserver())
|
||||||
@ -61,5 +68,4 @@ class TranslateViewModel @Inject constructor(private val repository: TranslateRe
|
|||||||
companion object {
|
companion object {
|
||||||
private val TAG = TranslateViewModel::class.simpleName
|
private val TAG = TranslateViewModel::class.simpleName
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user