gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-11 18:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3148 from nextcloud/dependabot/gradle/com.google.android.exoplayer-exoplayer-2.19.0

Browse Source 
Build(deps): Bump com.google.android.exoplayer:exoplayer from 2.18.7 to 2.19.0
This commit is contained in:
Andy Scherzinger 2023-07-06 15:38:58 +02:00 committed by GitHub
commit 09b6e4098f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -262,7 +262,7 @@ dependencies {
implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}" implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}"
implementation 'com.google.code.gson:gson:2.10.1' 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 'com.github.chrisbanes:PhotoView:2.3.0'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.27' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.27'

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)