#678 - Allow deciding between sending as group or individual

This commit is contained in:
Moez Bhatti
2018-06-05 19:45:42 -04:00
parent 11880a9f99
commit fc99ae83ad
10 changed files with 123 additions and 54 deletions
@@ -79,6 +79,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override val chipDeletedIntent: Subject<Contact> by lazy { chipsAdapter.chipDeleted }
override val menuReadyIntent: Observable<Unit> = menu.map { Unit }
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
override val sendAsGroupIntent by lazy { sendAsGroupBackground.clicks() }
override val messageClickIntent: Subject<Message> by lazy { messageAdapter.clicks }
override val messagesSelectedIntent by lazy { messageAdapter.selectionChanges }
override val cancelSendingIntent: Subject<Message> by lazy { messageAdapter.cancelSending }
@@ -185,6 +186,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
chipsAdapter.data = state.selectedContacts
contactsAdapter.data = state.contacts
sendAsGroup.setVisible(state.editingMode && state.selectedContacts.size >= 2)
sendAsGroupSwitch.isChecked = state.sendAsGroup
messageList.setVisible(state.sendAsGroup)
messageAdapter.data = state.messages
messageAdapter.highlight = state.searchSelectionId
@@ -32,6 +32,7 @@ data class ComposeState(
val contactsVisible: Boolean = false,
val selectedConversation: Long = 0,
val selectedContacts: List<Contact> = ArrayList(),
val sendAsGroup: Boolean = true,
val conversationtitle: String = "",
val query: String = "",
val searchSelectionId: Long = -1,
@@ -37,6 +37,7 @@ interface ComposeView : QkView<ComposeState> {
val chipDeletedIntent: Subject<Contact>
val menuReadyIntent: Observable<Unit>
val optionsItemIntent: Observable<Int>
val sendAsGroupIntent: Observable<*>
val messageClickIntent: Subject<Message>
val messagesSelectedIntent: Observable<List<Long>>
val cancelSendingIntent: Subject<Message>
@@ -127,7 +127,10 @@ class ComposeViewModel @Inject constructor(
address.isNotBlank() -> {
newState { it.copy(editingMode = false) }
messageRepo.getOrCreateConversation(address).toObservable()
Observable.just(address)
.mapNotNull { messageRepo.getOrCreateConversation(it) }
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
}
else -> {
@@ -146,7 +149,7 @@ class ComposeViewModel @Inject constructor(
.skipUntil(state.filter { state -> state.editingMode })
.takeUntil(state.filter { state -> !state.editingMode })
.map { contacts -> contacts.map { it.numbers.firstOrNull()?.address ?: "" } }
.flatMapMaybe { addresses -> messageRepo.getOrCreateConversation(addresses) }
.mapNotNull { addresses -> messageRepo.getOrCreateConversation(addresses) }
.mergeWith(initialConversation)
.filter { conversation -> conversation.isLoaded }
.doOnNext { conversation ->
@@ -379,6 +382,12 @@ class ComposeViewModel @Inject constructor(
.subscribe { newState { it.copy(query = "", searchSelectionId = -1) } }
// Toggle the group sending mode
view.sendAsGroupIntent
.autoDisposable(view.scope())
.subscribe { newState { it.copy(sendAsGroup = !it.sendAsGroup) } }
// Scroll to search position
searchSelection
.filter { id -> id != -1L }
@@ -524,17 +533,31 @@ class ComposeViewModel @Inject constructor(
view.sendIntent
.withLatestFrom(view.textChangedIntent, { _, body -> body })
.map { body -> body.toString() }
.withLatestFrom(state, attachments, conversation, { body, state, attachments, conversation ->
.withLatestFrom(state, attachments, conversation, selectedContacts, { body, state, attachments, conversation, contacts ->
val subId = state.subscription?.subscriptionId ?: -1
val threadId = conversation.id
val addresses = conversation.recipients.map { it.address }
sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body, attachments))
if (state.sendAsGroup) {
val threadId = conversation.id
val addresses = conversation.recipients.map { it.address }
sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body, attachments))
} else {
contacts
.map { contact -> contact.numbers }
.mapNotNull { numbers -> numbers.firstOrNull() }
.map { number -> number.address }
.mapNotNull { address -> messageRepo.getOrCreateConversation(address) }
.filter { it.recipients.isNotEmpty() }
.forEach {
val address = it.recipients.map { it.address }
sendMessage.execute(SendMessage.Params(subId, it.id, address, body, attachments))
}
}
view.setDraft("")
this.attachments.onNext(ArrayList())
})
.withLatestFrom(state, { _, state ->
if (state.editingMode) {
newState { it.copy(editingMode = false) }
newState { it.copy(editingMode = false, sendAsGroup = true, hasError = !state.sendAsGroup) }
}
})
.autoDisposable(view.scope())
@@ -287,12 +287,69 @@
</android.support.v7.widget.Toolbar>
<android.support.constraint.Group
android:id="@+id/sendAsGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="sendAsGroupBackground, sendAsGroupTitle, sendAsGroupSummary, sendAsGroupSwitch, sendAsGroupShadow" />
<View
android:id="@+id/sendAsGroupBackground"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="?attr/colorPrimary"
app:layout_constraintBottom_toBottomOf="@id/sendAsGroupSummary"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<common.widget.QkTextView
android:id="@+id/sendAsGroupTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/compose_send_group_title"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/sendAsGroupSwitch"
app:layout_constraintStart_toStartOf="@id/sendAsGroupBackground"
app:layout_constraintTop_toTopOf="@id/sendAsGroupBackground"
app:textSize="primary" />
<common.widget.QkTextView
android:id="@+id/sendAsGroupSummary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingBottom="16dp"
android:text="@string/compose_send_group_summary"
android:textColor="?android:attr/textColorTertiary"
app:layout_constraintEnd_toEndOf="@id/sendAsGroupTitle"
app:layout_constraintStart_toStartOf="@id/sendAsGroupTitle"
app:layout_constraintTop_toBottomOf="@id/sendAsGroupTitle"
app:textSize="secondary" />
<common.widget.QkSwitch
android:id="@+id/sendAsGroupSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:checked="true"
android:clickable="false"
app:layout_constraintBottom_toBottomOf="@id/sendAsGroupBackground"
app:layout_constraintEnd_toEndOf="@id/sendAsGroupBackground"
app:layout_constraintTop_toTopOf="@id/sendAsGroupBackground" />
<View
android:id="@+id/sendAsGroupShadow"
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@drawable/ab_shadow"
app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground" />
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@drawable/ab_shadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<View
@@ -83,6 +83,8 @@
<string name="compose_title_selected">%d selected</string>
<string name="compose_subtitle_results">%1$d of %2$d results</string>
<string name="compose_send_group_title">Send as group message</string>
<string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
<string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
<string name="compose_hint">Write a message…</string>
<string name="compose_menu_copy">Copy text</string>