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

improve detekt score

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2023-07-06 15:30:32 +02:00
parent dbd34ad207
commit f3452127d3
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt
View File

@ -57,6 +57,7 @@ class ViewModelFactory @Inject constructor(
internal annotation class ViewModelKey(val value: KClass<out ViewModel>) internal annotation class ViewModelKey(val value: KClass<out ViewModel>)
@Module @Module
@Suppress("TooManyFunctions")
abstract class ViewModelModule { abstract class ViewModelModule {
@Binds @Binds

72
app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
View File

@ -181,29 +181,7 @@ class SetStatusDialogFragment :
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
currentStatus?.let { setupCurrentStatus()
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)
}
}
}
}
adapter = PredefinedStatusListAdapter(this, requireContext()) adapter = PredefinedStatusListAdapter(this, requireContext())
adapter.list = predefinedStatusesList adapter.list = predefinedStatusesList
@ -211,15 +189,7 @@ class SetStatusDialogFragment :
binding.predefinedStatusList.adapter = adapter binding.predefinedStatusList.adapter = adapter
binding.predefinedStatusList.layoutManager = LinearLayoutManager(context) binding.predefinedStatusList.layoutManager = LinearLayoutManager(context)
binding.onlineStatus.setOnClickListener { setStatus(StatusType.ONLINE) } setupGeneralStatusOptions()
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)
binding.clearStatus.setOnClickListener { clearStatus() } binding.clearStatus.setOnClickListener { clearStatus() }
binding.setStatus.setOnClickListener { setStatusMessage() } 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<String> { private fun createClearTimesArrayAdapter(): ArrayAdapter<String> {
val adapter = ArrayAdapter<String>(requireContext(), android.R.layout.simple_spinner_item) val adapter = ArrayAdapter<String>(requireContext(), android.R.layout.simple_spinner_item)
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)