forked from upstream-mirrors/quik
Fix messageList visibility
This commit is contained in:
@@ -216,7 +216,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
sendAsGroup.setVisible(state.editingMode && state.selectedChips.size >= 2)
|
||||
sendAsGroupSwitch.isChecked = state.sendAsGroup
|
||||
|
||||
messageList.setVisible(state.sendAsGroup)
|
||||
messageList.setVisible(!state.editingMode || state.sendAsGroup)
|
||||
messageAdapter.data = state.messages
|
||||
messageAdapter.highlight = state.searchSelectionId
|
||||
|
||||
|
||||
@@ -640,6 +640,7 @@ class ComposeViewModel @Inject constructor(
|
||||
Preferences.SEND_DELAY_LONG -> 10000
|
||||
else -> 0
|
||||
}
|
||||
val sendAsGroup = !state.editingMode || state.sendAsGroup
|
||||
|
||||
when {
|
||||
// Scheduling a message
|
||||
@@ -650,13 +651,13 @@ class ComposeViewModel @Inject constructor(
|
||||
.map { it.getUri() }
|
||||
.map { it.toString() }
|
||||
val params = AddScheduledMessage
|
||||
.Params(state.scheduled, subId, addresses, state.sendAsGroup, body, uris)
|
||||
.Params(state.scheduled, subId, addresses, sendAsGroup, body, uris)
|
||||
addScheduledMessage.execute(params)
|
||||
context.makeToast(R.string.compose_scheduled_toast)
|
||||
}
|
||||
|
||||
// Sending a group message
|
||||
state.sendAsGroup -> {
|
||||
sendAsGroup -> {
|
||||
sendMessage.execute(SendMessage
|
||||
.Params(subId, conversation.id, addresses, body, attachments, delay))
|
||||
}
|
||||
@@ -691,7 +692,7 @@ class ComposeViewModel @Inject constructor(
|
||||
this.attachments.onNext(ArrayList())
|
||||
|
||||
if (state.editingMode) {
|
||||
newState { copy(editingMode = false, sendAsGroup = true, hasError = !state.sendAsGroup) }
|
||||
newState { copy(editingMode = false, hasError = !sendAsGroup) }
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
Reference in New Issue
Block a user