From 5a18a0565423aea467b33e3f33cfa87cfd469983 Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Mon, 22 May 2023 11:47:14 -0500 Subject: [PATCH] fixing detekt errors :| Signed-off-by: Julius Linus --- .../repositories/TranslateRepository.kt | 6 ++--- .../repositories/TranslateRepositoryImpl.kt | 5 ++--- .../talk/translate/ui/TranslateActivity.kt | 17 +++++++------- .../viewmodels/TranslateViewModel.kt | 22 ++++++++++++------- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt index 509fa11c9..0e925aee8 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt @@ -5,10 +5,10 @@ import io.reactivex.Observable interface TranslateRepository { fun translateMessage( - authorization : String, + authorization: String, url: String, text: String, toLanguage: String, fromLanguage: String? - ) : Observable -} \ No newline at end of file + ): Observable +} diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt index b9ed799c1..9a81d9248 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt @@ -13,7 +13,6 @@ class TranslateRepositoryImpl @Inject constructor(private val ncApi: NcApi) : Tr toLanguage: String, fromLanguage: String? ): Observable { - 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 } } - -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt b/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt index 5c8198698..a73671824 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt @@ -58,8 +58,8 @@ class TranslateActivity : BaseActivity() { lateinit var viewModel: TranslateViewModel lateinit var binding: ActivityTranslateBinding - private var toLanguages : Array? = null - private var fromLanguages : Array? = null + private var toLanguages: Array? = null + private var fromLanguages: Array? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -67,10 +67,10 @@ class TranslateActivity : BaseActivity() { NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) binding = ActivityTranslateBinding.inflate(layoutInflater) - viewModel = ViewModelProvider(this, viewModelFactory)[TranslateViewModel::class.java] + viewModel = ViewModelProvider(this, viewModelFactory)[TranslateViewModel::class.java] viewModel.viewState.observe(this) { state -> - when(state) { + when (state) { is TranslateViewModel.StartState -> { onStartState() } @@ -93,7 +93,7 @@ class TranslateActivity : BaseActivity() { setupCopyButton() 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!!) } else { binding.translatedMessageTextview.text = savedInstanceState.getString(BundleKeys.SAVED_TRANSLATED_MESSAGE) @@ -150,7 +150,7 @@ class TranslateActivity : BaseActivity() { binding.originalMessageTextview.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 } @@ -228,7 +228,7 @@ class TranslateActivity : BaseActivity() { viewThemeUtils.material.colorTextInputLayout(binding.fromLanguageInputLayout) viewThemeUtils.material.colorTextInputLayout(binding.toLanguageInputLayout) 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, _ -> val fromLabel: String = getISOFromLanguage(parent.getItemAtPosition(position).toString()) @@ -271,7 +271,7 @@ class TranslateActivity : BaseActivity() { binding.copyTranslatedMessage.visibility = View.GONE } - private fun onTranslatedState(msg : String) { + private fun onTranslatedState(msg: String) { binding.progressBar.visibility = View.GONE binding.translatedMessageContainer.visibility = View.VISIBLE binding.translatedMessageTextview.text = msg @@ -290,5 +290,4 @@ class TranslateActivity : BaseActivity() { private const val FROM_LABEL = "fromLabel" private const val TO_LABEL = "toLabel" } - } diff --git a/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt b/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt index 4452b766a..421c8d436 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt @@ -14,8 +14,10 @@ import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import javax.inject.Inject -class TranslateViewModel @Inject constructor(private val repository: TranslateRepository, - private val userManager: UserManager) : ViewModel() { +class TranslateViewModel @Inject constructor( + private val repository: TranslateRepository, + private val userManager: UserManager +) : ViewModel() { sealed interface ViewState @@ -23,8 +25,8 @@ class TranslateViewModel @Inject constructor(private val repository: TranslateRe class TranslatedState(val msg: String) : ViewState object ErrorState : ViewState - private val _viewState : MutableLiveData = MutableLiveData(StartState) - val viewState : LiveData + private val _viewState: MutableLiveData = MutableLiveData(StartState) + val viewState: LiveData get() = _viewState 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 calculatedFromLanguage = if (fromLanguage == null || fromLanguage == "") { null } else { fromLanguage } Log.i(TAG, "translateMessage Called") - repository.translateMessage(authorization, url,text,toLanguage, - calculatedFromLanguage) + repository.translateMessage( + authorization, + url, + text, + toLanguage, + calculatedFromLanguage + ) .subscribeOn(Schedulers.io()) ?.observeOn(AndroidSchedulers.mainThread()) ?.subscribe(TranslateObserver()) @@ -61,5 +68,4 @@ class TranslateViewModel @Inject constructor(private val repository: TranslateRe companion object { private val TAG = TranslateViewModel::class.simpleName } - -} \ No newline at end of file +}