mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
@@ -22,11 +22,9 @@ import io.realm.RealmList
|
||||
import io.realm.RealmObject
|
||||
import io.realm.annotations.PrimaryKey
|
||||
|
||||
open class Contact : RealmObject() {
|
||||
|
||||
@PrimaryKey var lookupKey: String = ""
|
||||
var numbers: RealmList<PhoneNumber> = RealmList()
|
||||
var name: String = ""
|
||||
var lastUpdate: Long = 0
|
||||
|
||||
}
|
||||
open class Contact(
|
||||
@PrimaryKey var lookupKey: String = "",
|
||||
var numbers: RealmList<PhoneNumber> = RealmList(),
|
||||
var name: String = "",
|
||||
var lastUpdate: Long = 0
|
||||
) : RealmObject()
|
||||
@@ -20,9 +20,7 @@ package data.model
|
||||
|
||||
import io.realm.RealmObject
|
||||
|
||||
open class PhoneNumber : RealmObject() {
|
||||
|
||||
var address: String = ""
|
||||
var type: String = ""
|
||||
|
||||
}
|
||||
open class PhoneNumber(
|
||||
var address: String = "",
|
||||
var type: String = ""
|
||||
) : RealmObject()
|
||||
@@ -35,10 +35,10 @@ import common.util.extensions.dpToPx
|
||||
import common.util.extensions.setBackgroundTint
|
||||
import common.util.extensions.showKeyboard
|
||||
import data.model.Contact
|
||||
import presentation.common.base.QkAdapter
|
||||
import presentation.common.base.QkViewHolder
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.contact_chip.view.*
|
||||
import presentation.common.base.QkAdapter
|
||||
import presentation.common.base.QkViewHolder
|
||||
import javax.inject.Inject
|
||||
|
||||
class ChipsAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<Contact>() {
|
||||
@@ -100,7 +100,14 @@ class ChipsAdapter @Inject constructor(private val context: Context, private val
|
||||
val view = holder.itemView
|
||||
|
||||
view.avatar.contact = contact
|
||||
view.name.text = contact.name
|
||||
|
||||
// If the contact's name is empty, try to display a phone number instead
|
||||
// The contacts provided here should only have one number
|
||||
view.name.text = if (contact.name.isNotBlank()) {
|
||||
contact.name
|
||||
} else {
|
||||
contact.numbers.firstOrNull { it.address.isNotBlank() }?.address ?: ""
|
||||
}
|
||||
|
||||
view.setOnClickListener { showDetailedChip(contact) }
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ package presentation.feature.compose
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.telephony.PhoneNumberUtils
|
||||
import com.mlsdev.rximagepicker.RxImagePicker
|
||||
import com.mlsdev.rximagepicker.Sources
|
||||
import com.moez.QKSMS.R
|
||||
@@ -34,6 +35,7 @@ import common.util.filter.ContactFilter
|
||||
import data.model.Contact
|
||||
import data.model.Conversation
|
||||
import data.model.Message
|
||||
import data.model.PhoneNumber
|
||||
import data.repository.ContactRepository
|
||||
import data.repository.MessageRepository
|
||||
import interactor.*
|
||||
@@ -46,6 +48,7 @@ import io.reactivex.schedulers.Schedulers
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import io.realm.RealmList
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkViewModel
|
||||
import java.net.URLDecoder
|
||||
@@ -78,7 +81,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
||||
appComponent.inject(this)
|
||||
|
||||
draft = intent.extras?.getString(Intent.EXTRA_TEXT) ?: ""
|
||||
intent.clipData
|
||||
val threadId = intent.extras?.getLong("threadId") ?: 0L
|
||||
var address = ""
|
||||
|
||||
@@ -187,9 +189,15 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
||||
// that have already been selected
|
||||
Observables
|
||||
.combineLatest(view.queryChangedIntent, contacts, selectedContacts, { query, contacts, selectedContacts ->
|
||||
contacts
|
||||
var filteredContacts = contacts
|
||||
.filterNot { contact -> selectedContacts.contains(contact) }
|
||||
.filter { contact -> contactFilter.filter(contact, query) }
|
||||
|
||||
if (PhoneNumberUtils.isWellFormedSmsAddress(query.toString())) {
|
||||
filteredContacts = listOf(Contact(numbers = RealmList(PhoneNumber(address = query.toString())))) + filteredContacts
|
||||
}
|
||||
|
||||
filteredContacts
|
||||
})
|
||||
.skipUntil(state.filter { state -> state.editingMode })
|
||||
.takeUntil(state.filter { state -> !state.editingMode })
|
||||
|
||||
@@ -24,6 +24,7 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import common.util.extensions.setVisible
|
||||
import data.model.Contact
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
@@ -51,6 +52,7 @@ class ContactAdapter @Inject constructor(private val context: Context) : QkAdapt
|
||||
|
||||
view.avatar.contact = contact
|
||||
view.name.text = contact.name
|
||||
view.name.setVisible(view.name.text.isNotEmpty())
|
||||
view.address.text = contact.numbers.first()?.address ?: ""
|
||||
view.type.text = contact.numbers.first()?.type ?: ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user