From dbd34ad207beb144379abdf8b1f39a7ba39df41e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 01:54:05 +0000 Subject: [PATCH 1/2] Build(deps): Bump com.google.android.exoplayer:exoplayer Bumps [com.google.android.exoplayer:exoplayer](https://github.com/google/ExoPlayer) from 2.18.7 to 2.19.0. - [Release notes](https://github.com/google/ExoPlayer/releases) - [Changelog](https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md) - [Commits](https://github.com/google/ExoPlayer/compare/r2.18.7...r2.19.0) --- updated-dependencies: - dependency-name: com.google.android.exoplayer:exoplayer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7747abf37..5392817f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -262,7 +262,7 @@ dependencies { implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}" implementation 'com.google.code.gson:gson:2.10.1' - implementation 'com.google.android.exoplayer:exoplayer:2.18.7' + implementation 'com.google.android.exoplayer:exoplayer:2.19.0' implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.27' From f3452127d3f15392396b8ed8759f79e3989dc9bc Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 6 Jul 2023 15:30:32 +0200 Subject: [PATCH 2/2] improve detekt score Signed-off-by: Andy Scherzinger --- .../talk/dagger/modules/ViewModelModule.kt | 1 + .../talk/ui/dialog/SetStatusDialogFragment.kt | 72 ++++++++++--------- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt index f37209837..b2a26758c 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt @@ -57,6 +57,7 @@ class ViewModelFactory @Inject constructor( internal annotation class ViewModelKey(val value: KClass) @Module +@Suppress("TooManyFunctions") abstract class ViewModelModule { @Binds diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index 354440bdc..e92ae94b1 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -181,29 +181,7 @@ class SetStatusDialogFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - currentStatus?.let { - binding.emoji.setText(it.icon) - binding.customStatusInput.text?.clear() - binding.customStatusInput.setText(it.message?.trim()) - binding.setStatus.isEnabled = it.message?.isEmpty() == false - visualizeStatus(it.status) - - if (it.clearAt > 0) { - binding.clearStatusAfterSpinner.visibility = View.GONE - binding.remainingClearTime.apply { - binding.clearStatusMessageTextView.text = getString(R.string.clear_status_message) - visibility = View.VISIBLE - text = DisplayUtils.getRelativeTimestamp(context, it.clearAt * ONE_SECOND_IN_MILLIS, true) - .toString() - .decapitalize(Locale.getDefault()) - setOnClickListener { - visibility = View.GONE - binding.clearStatusAfterSpinner.visibility = View.VISIBLE - binding.clearStatusMessageTextView.text = getString(R.string.clear_status_message_after) - } - } - } - } + setupCurrentStatus() adapter = PredefinedStatusListAdapter(this, requireContext()) adapter.list = predefinedStatusesList @@ -211,15 +189,7 @@ class SetStatusDialogFragment : binding.predefinedStatusList.adapter = adapter binding.predefinedStatusList.layoutManager = LinearLayoutManager(context) - binding.onlineStatus.setOnClickListener { setStatus(StatusType.ONLINE) } - binding.dndStatus.setOnClickListener { setStatus(StatusType.DND) } - binding.awayStatus.setOnClickListener { setStatus(StatusType.AWAY) } - binding.invisibleStatus.setOnClickListener { setStatus(StatusType.INVISIBLE) } - - viewThemeUtils.talk.themeStatusCardView(binding.onlineStatus) - viewThemeUtils.talk.themeStatusCardView(binding.dndStatus) - viewThemeUtils.talk.themeStatusCardView(binding.awayStatus) - viewThemeUtils.talk.themeStatusCardView(binding.invisibleStatus) + setupGeneralStatusOptions() binding.clearStatus.setOnClickListener { clearStatus() } binding.setStatus.setOnClickListener { setStatusMessage() } @@ -264,6 +234,44 @@ class SetStatusDialogFragment : } } + private fun setupCurrentStatus() { + currentStatus?.let { + binding.emoji.setText(it.icon) + binding.customStatusInput.text?.clear() + binding.customStatusInput.setText(it.message?.trim()) + binding.setStatus.isEnabled = it.message?.isEmpty() == false + visualizeStatus(it.status) + + if (it.clearAt > 0) { + binding.clearStatusAfterSpinner.visibility = View.GONE + binding.remainingClearTime.apply { + binding.clearStatusMessageTextView.text = getString(R.string.clear_status_message) + visibility = View.VISIBLE + text = DisplayUtils.getRelativeTimestamp(context, it.clearAt * ONE_SECOND_IN_MILLIS, true) + .toString() + .decapitalize(Locale.getDefault()) + setOnClickListener { + visibility = View.GONE + binding.clearStatusAfterSpinner.visibility = View.VISIBLE + binding.clearStatusMessageTextView.text = getString(R.string.clear_status_message_after) + } + } + } + } + } + + private fun setupGeneralStatusOptions() { + binding.onlineStatus.setOnClickListener { setStatus(StatusType.ONLINE) } + binding.dndStatus.setOnClickListener { setStatus(StatusType.DND) } + binding.awayStatus.setOnClickListener { setStatus(StatusType.AWAY) } + binding.invisibleStatus.setOnClickListener { setStatus(StatusType.INVISIBLE) } + + viewThemeUtils.talk.themeStatusCardView(binding.onlineStatus) + viewThemeUtils.talk.themeStatusCardView(binding.dndStatus) + viewThemeUtils.talk.themeStatusCardView(binding.awayStatus) + viewThemeUtils.talk.themeStatusCardView(binding.invisibleStatus) + } + private fun createClearTimesArrayAdapter(): ArrayAdapter { val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item) adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)