forked from upstream-mirrors/quik
Build phone number picker
This commit is contained in:
@@ -54,10 +54,14 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.common.util.extensions.showKeyboard
|
||||
import com.moez.QKSMS.common.widget.QkDialog
|
||||
import com.moez.QKSMS.extensions.Optional
|
||||
import com.moez.QKSMS.feature.compose.editing.Chip
|
||||
import com.moez.QKSMS.feature.compose.editing.ChipsAdapter
|
||||
import com.moez.QKSMS.feature.compose.editing.ComposeItem
|
||||
import com.moez.QKSMS.feature.compose.editing.ComposeItemAdapter
|
||||
import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
|
||||
import com.moez.QKSMS.feature.compose.editing.PhoneNumberPickerAdapter
|
||||
import com.moez.QKSMS.model.Attachment
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
@@ -84,13 +88,17 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
@Inject lateinit var dateFormatter: DateFormatter
|
||||
@Inject lateinit var messageAdapter: MessagesAdapter
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var phoneNumberAdapter: PhoneNumberPickerAdapter
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
|
||||
override val queryChangedIntent: Observable<CharSequence> by lazy { search.textChanges() }
|
||||
override val queryBackspaceIntent: Observable<*> by lazy { search.backspaces }
|
||||
override val queryEditorActionIntent: Observable<Int> by lazy { search.editorActions() }
|
||||
override val chipSelectedIntent: Subject<ComposeItem> by lazy { contactsAdapter.itemSelected }
|
||||
override val composeItemPressedIntent: Subject<ComposeItem> by lazy { contactsAdapter.clicks }
|
||||
override val composeItemLongPressedIntent: Subject<ComposeItem> by lazy { contactsAdapter.longClicks }
|
||||
override val phoneNumberSelectedIntent: Subject<Optional<Long>> by lazy { phoneNumberAdapter.selectedItemChanges }
|
||||
override val phoneNumberActionIntent: Subject<PhoneNumberAction> = PublishSubject.create()
|
||||
override val chipDeletedIntent: Subject<Chip> by lazy { chipsAdapter.chipDeleted }
|
||||
override val menuReadyIntent: Observable<Unit> = menu.map { Unit }
|
||||
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
|
||||
@@ -116,6 +124,18 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
|
||||
|
||||
private val phoneNumberDialog by lazy {
|
||||
QkDialog(this).apply {
|
||||
titleRes = R.string.compose_number_picker_title
|
||||
adapter = phoneNumberAdapter
|
||||
positiveButton = R.string.compose_number_picker_always
|
||||
positiveButtonListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.ALWAYS) }
|
||||
negativeButton = R.string.compose_number_picker_once
|
||||
negativeButtonListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.JUST_ONCE) }
|
||||
cancelListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.CANCEL) }
|
||||
}
|
||||
}
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] }
|
||||
|
||||
private var cameraDestination: Uri? = null
|
||||
@@ -202,8 +222,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
if (state.editingMode && contacts.adapter == null) contacts.adapter = contactsAdapter
|
||||
|
||||
toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode && !state.searching
|
||||
toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0 && state.query.isEmpty()
|
||||
toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0 && state.query.isEmpty()
|
||||
toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0
|
||||
&& state.query.isEmpty()
|
||||
toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0
|
||||
&& state.query.isEmpty()
|
||||
toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages == 1
|
||||
toolbar.menu.findItem(R.id.details)?.isVisible = !state.editingMode && state.selectedMessages == 1
|
||||
toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0
|
||||
@@ -219,6 +241,14 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
chipsAdapter.data = state.selectedChips
|
||||
contactsAdapter.data = state.composeItems
|
||||
|
||||
if (state.selectedContact != null && !phoneNumberDialog.isShowing) {
|
||||
phoneNumberAdapter.data = state.selectedContact.numbers
|
||||
phoneNumberDialog.subtitle = state.selectedContact.name
|
||||
phoneNumberDialog.show()
|
||||
} else if (state.selectedContact == null && phoneNumberDialog.isShowing) {
|
||||
phoneNumberDialog.dismiss()
|
||||
}
|
||||
|
||||
loading.setVisible(state.loading)
|
||||
|
||||
sendAsGroup.setVisible(state.editingMode && state.selectedChips.size >= 2)
|
||||
@@ -282,7 +312,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
calendar.set(Calendar.HOUR_OF_DAY, hour)
|
||||
calendar.set(Calendar.MINUTE, minute)
|
||||
scheduleSelectedIntent.onNext(calendar.timeInMillis)
|
||||
}, calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), DateFormat.is24HourFormat(this)).show()
|
||||
}, calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), DateFormat.is24HourFormat(this))
|
||||
.show()
|
||||
}, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show()
|
||||
}
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ import com.moez.QKSMS.compat.SubscriptionInfoCompat
|
||||
import com.moez.QKSMS.feature.compose.editing.Chip
|
||||
import com.moez.QKSMS.feature.compose.editing.ComposeItem
|
||||
import com.moez.QKSMS.model.Attachment
|
||||
import com.moez.QKSMS.model.Contact
|
||||
import com.moez.QKSMS.model.Conversation
|
||||
import com.moez.QKSMS.model.Message
|
||||
import io.realm.RealmResults
|
||||
@@ -32,6 +33,7 @@ data class ComposeState(
|
||||
val searching: Boolean = false,
|
||||
val composeItems: List<ComposeItem> = ArrayList(),
|
||||
val selectedConversation: Long = 0,
|
||||
val selectedContact: Contact? = null, // For phone number picker
|
||||
val selectedChips: List<Chip> = ArrayList(),
|
||||
val sendAsGroup: Boolean = true,
|
||||
val conversationtitle: String = "",
|
||||
|
||||
@@ -22,8 +22,10 @@ import android.net.Uri
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.core.view.inputmethod.InputContentInfoCompat
|
||||
import com.moez.QKSMS.common.base.QkView
|
||||
import com.moez.QKSMS.extensions.Optional
|
||||
import com.moez.QKSMS.feature.compose.editing.Chip
|
||||
import com.moez.QKSMS.feature.compose.editing.ComposeItem
|
||||
import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
|
||||
import com.moez.QKSMS.model.Attachment
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.Subject
|
||||
@@ -34,7 +36,10 @@ interface ComposeView : QkView<ComposeState> {
|
||||
val queryChangedIntent: Observable<CharSequence>
|
||||
val queryBackspaceIntent: Observable<*>
|
||||
val queryEditorActionIntent: Observable<Int>
|
||||
val chipSelectedIntent: Subject<ComposeItem>
|
||||
val composeItemPressedIntent: Subject<ComposeItem>
|
||||
val composeItemLongPressedIntent: Subject<ComposeItem>
|
||||
val phoneNumberSelectedIntent: Subject<Optional<Long>>
|
||||
val phoneNumberActionIntent: Subject<PhoneNumberAction>
|
||||
val chipDeletedIntent: Subject<Chip>
|
||||
val menuReadyIntent: Observable<Unit>
|
||||
val optionsItemIntent: Observable<Int>
|
||||
|
||||
@@ -40,6 +40,7 @@ import com.moez.QKSMS.extensions.removeAccents
|
||||
import com.moez.QKSMS.feature.compose.editing.Chip
|
||||
import com.moez.QKSMS.feature.compose.editing.ComposeItem
|
||||
import com.moez.QKSMS.feature.compose.editing.ComposeItem.*
|
||||
import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
|
||||
import com.moez.QKSMS.filter.ContactFilter
|
||||
import com.moez.QKSMS.filter.ContactGroupFilter
|
||||
import com.moez.QKSMS.interactor.AddScheduledMessage
|
||||
@@ -49,6 +50,7 @@ import com.moez.QKSMS.interactor.DeleteMessages
|
||||
import com.moez.QKSMS.interactor.MarkRead
|
||||
import com.moez.QKSMS.interactor.RetrySending
|
||||
import com.moez.QKSMS.interactor.SendMessage
|
||||
import com.moez.QKSMS.interactor.SetDefaultPhoneNumber
|
||||
import com.moez.QKSMS.manager.ActiveConversationManager
|
||||
import com.moez.QKSMS.manager.PermissionManager
|
||||
import com.moez.QKSMS.model.Attachment
|
||||
@@ -77,6 +79,8 @@ import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import io.realm.RealmList
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.coroutines.rx2.awaitFirst
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
import javax.inject.Inject
|
||||
@@ -107,6 +111,7 @@ class ComposeViewModel @Inject constructor(
|
||||
private val prefs: Preferences,
|
||||
private val retrySending: RetrySending,
|
||||
private val sendMessage: SendMessage,
|
||||
private val setDefaultPhoneNumber: SetDefaultPhoneNumber,
|
||||
private val subscriptionManager: SubscriptionManagerCompat,
|
||||
private val syncContacts: ContactSync
|
||||
) : QkViewModel<ComposeView, ComposeState>(ComposeState(
|
||||
@@ -310,18 +315,49 @@ class ComposeViewModel @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
// Enter the first contact suggestion if the enter button is pressed, and enter contacts that are selected
|
||||
// Listen for ComposeItems being selected, and then send them off to the number picker dialog in case
|
||||
// the user needs to select a phone number
|
||||
view.queryEditorActionIntent
|
||||
.filter { actionId -> actionId == EditorInfo.IME_ACTION_DONE }
|
||||
.withLatestFrom(state) { _, state -> state }
|
||||
.mapNotNull { state -> state.composeItems.firstOrNull() }
|
||||
.mergeWith(view.chipSelectedIntent)
|
||||
.mergeWith(view.composeItemPressedIntent)
|
||||
.map { composeItem -> composeItem to false }
|
||||
.mergeWith(view.composeItemLongPressedIntent.map { composeItem -> composeItem to true })
|
||||
.observeOn(Schedulers.io())
|
||||
.skipUntil(state.filter { state -> state.editingMode })
|
||||
.takeUntil(state.filter { state -> !state.editingMode })
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { composeItem ->
|
||||
newState { copy(searching = false) }
|
||||
chipsReducer.onNext { chips ->
|
||||
chips + composeItem.getContacts().map { Chip(it.numbers.first()?.address.orEmpty(), it) }
|
||||
.subscribe { (composeItem, force) ->
|
||||
val contacts = composeItem.getContacts()
|
||||
val newChips = contacts.map { contact ->
|
||||
if (contact.numbers.size == 1 || contact.getDefaultNumber() != null && !force) {
|
||||
val number = contact.getDefaultNumber() ?: contact.numbers[0]!!
|
||||
Chip(number.address, contact)
|
||||
} else {
|
||||
runBlocking {
|
||||
newState { copy(selectedContact = contact) }
|
||||
val action = view.phoneNumberActionIntent.awaitFirst()
|
||||
newState { copy(selectedContact = null) }
|
||||
val numberId = view.phoneNumberSelectedIntent.awaitFirst().value
|
||||
val number = contact.numbers.find { number -> number.id == numberId }
|
||||
|
||||
if (action == PhoneNumberAction.CANCEL || number == null) {
|
||||
return@runBlocking null
|
||||
}
|
||||
|
||||
if (action == PhoneNumberAction.ALWAYS) {
|
||||
val params = SetDefaultPhoneNumber.Params(contact.lookupKey, number.id)
|
||||
setDefaultPhoneNumber.execute(params)
|
||||
}
|
||||
|
||||
Chip(number.address, contact)
|
||||
} ?: return@subscribe
|
||||
}
|
||||
}
|
||||
|
||||
newState { copy(searching = false) }
|
||||
chipsReducer.onNext { chips -> chips + newChips }
|
||||
}
|
||||
|
||||
// Update the list of selected contacts when a new contact is selected or an existing one is deselected
|
||||
|
||||
+8
-2
@@ -40,7 +40,8 @@ import javax.inject.Inject
|
||||
|
||||
class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAdapter<ComposeItem>() {
|
||||
|
||||
val itemSelected: Subject<ComposeItem> = PublishSubject.create()
|
||||
val clicks: Subject<ComposeItem> = PublishSubject.create()
|
||||
val longClicks: Subject<ComposeItem> = PublishSubject.create()
|
||||
|
||||
private val numbersViewPool = RecyclerView.RecycledViewPool()
|
||||
|
||||
@@ -57,7 +58,12 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
val item = getItem(adapterPosition)
|
||||
itemSelected.onNext(item)
|
||||
clicks.onNext(item)
|
||||
}
|
||||
view.setOnLongClickListener {
|
||||
val item = getItem(adapterPosition)
|
||||
longClicks.onNext(item)
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.moez.QKSMS.feature.compose.editing
|
||||
|
||||
enum class PhoneNumberAction {
|
||||
CANCEL,
|
||||
JUST_ONCE,
|
||||
ALWAYS
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.moez.QKSMS.feature.compose.editing
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkAdapter
|
||||
import com.moez.QKSMS.common.base.QkViewHolder
|
||||
import com.moez.QKSMS.extensions.Optional
|
||||
import com.moez.QKSMS.model.PhoneNumber
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.phone_number_list_item.view.*
|
||||
import kotlinx.android.synthetic.main.radio_preference_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class PhoneNumberPickerAdapter @Inject constructor(
|
||||
private val context: Context
|
||||
) : QkAdapter<PhoneNumber>() {
|
||||
|
||||
val selectedItemChanges: Subject<Optional<Long>> = BehaviorSubject.create()
|
||||
|
||||
private var selectedItem: Long? = null
|
||||
set(value) {
|
||||
data.indexOfFirst { number -> number.id == field }.takeIf { it != -1 }?.run(::notifyItemChanged)
|
||||
field = value
|
||||
data.indexOfFirst { number -> number.id == field }.takeIf { it != -1 }?.run(::notifyItemChanged)
|
||||
selectedItemChanges.onNext(Optional(value))
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val inflater = LayoutInflater.from(parent.context)
|
||||
val view = inflater.inflate(R.layout.phone_number_list_item, parent, false)
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
val phoneNumber = getItem(adapterPosition)
|
||||
selectedItem = phoneNumber.id
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val phoneNumber = getItem(position)
|
||||
val view = holder.itemView
|
||||
|
||||
view.number.radioButton.isChecked = phoneNumber.id == selectedItem
|
||||
view.number.titleView.text = phoneNumber.address
|
||||
view.number.summaryView.text = when (phoneNumber.isDefault) {
|
||||
true -> context.getString(R.string.compose_number_picker_default, phoneNumber.type)
|
||||
false -> phoneNumber.type
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDatasetChanged() {
|
||||
super.onDatasetChanged()
|
||||
selectedItem = data.find { number -> number.isDefault }?.id ?: data.firstOrNull()?.id
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user