changes to allow editing of scheduled messages

This commit is contained in:
gavine99
2025-02-20 08:16:53 +11:00
parent ff5bafb00c
commit 1986f76356
8 changed files with 134 additions and 15 deletions
@@ -49,6 +49,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
override val deleteScheduledMessages: Subject<List<Long>> = PublishSubject.create()
override val sendScheduledMessages: Subject<List<Long>> = PublishSubject.create()
override val editScheduledMessage: Subject<Long> = PublishSubject.create()
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
@@ -85,12 +86,16 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
})
// show/hide menu items
toolbar.menu.findItem(R.id.delete)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.select_all)?.isVisible =
((scheduledMessageAdapter.itemCount > 1) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.copy)?.isVisible = (state.selectedMessages != 0)
toolbar.menu.findItem(R.id.send_now)?.isVisible = (state.selectedMessages != 0)
toolbar.menu.findItem(R.id.delete)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.copy)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.send_now)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.edit_message)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages == 1))
// show compose button
compose.isVisible = state.upgraded
@@ -123,6 +128,17 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
.show()
}
override fun showEditMessageDialog(message: Long) {
android.app.AlertDialog.Builder(this)
.setTitle(R.string.dialog_edit_scheduled_message_title)
.setMessage(R.string.dialog_edit_scheduled_message)
.setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ ->
editScheduledMessage.onNext(message)
}
.setNegativeButton(R.string.button_cancel, null)
.show()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.scheduled_messages, menu)
return super.onCreateOptionsMenu(menu)
@@ -29,12 +29,14 @@ interface ScheduledView : QkView<ScheduledState> {
val optionsItemIntent: Observable<Int>
val deleteScheduledMessages: Observable<List<Long>>
val sendScheduledMessages: Observable<List<Long>>
val editScheduledMessage: Observable<Long>
val backPressedIntent: Observable<Unit>
fun clearSelection()
fun toggleSelectAll()
fun showDeleteDialog(messages: List<Long>)
fun showSendNowDialog(messages: List<Long>)
fun showEditMessageDialog(message: Long)
fun finishActivity()
}
@@ -81,6 +81,13 @@ class ScheduledViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe { view.showSendNowDialog(it) }
// edit message menu item selected
view.optionsItemIntent
.filter { it == R.id.edit_message }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage -> selectedMessage.first() }
.autoDisposable(view.scope())
.subscribe { view.showEditMessageDialog(it) }
// delete message(s) (fired after the confirmation dialog has been shown)
view.deleteScheduledMessages
.observeOn(AndroidSchedulers.mainThread())
@@ -101,6 +108,20 @@ class ScheduledViewModel @Inject constructor(
view.clearSelection()
}
// edit message (fired after the confirmation dialog has been shown)
view.editScheduledMessage
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.autoDisposable(view.scope())
.subscribe {
scheduledMessageRepo.getScheduledMessage(it)?.let {
navigator.showCompose(it)
scheduledMessageRepo.deleteScheduledMessage(it.id)
}
view.clearSelection()
}
// navigate back or unselect
view.optionsItemIntent
.filter { it == android.R.id.home }