forked from upstream-mirrors/quik
Show custom/random colours in compose screen
This commit is contained in:
@@ -0,0 +1,13 @@
|
|||||||
|
package com.moez.QKSMS.extensions
|
||||||
|
|
||||||
|
inline fun <K, T> Iterable<T>.associateByNotNull(keySelector: (T) -> K?): Map<K, T> {
|
||||||
|
val map = hashMapOf<K, T>()
|
||||||
|
forEach { value ->
|
||||||
|
val key = keySelector(value)
|
||||||
|
if (key != null) {
|
||||||
|
map[key] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return map
|
||||||
|
}
|
||||||
@@ -206,6 +206,17 @@ class ConversationRepositoryImpl @Inject constructor(
|
|||||||
.observeOn(Schedulers.io())
|
.observeOn(Schedulers.io())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun getUnmanagedRecipients(): Observable<List<Recipient>> {
|
||||||
|
val realm = Realm.getDefaultInstance()
|
||||||
|
return realm.where(Recipient::class.java)
|
||||||
|
.isNotNull("contact")
|
||||||
|
.findAllAsync()
|
||||||
|
.asObservable()
|
||||||
|
.filter { it.isLoaded && it.isValid }
|
||||||
|
.map { realm.copyFromRealm(it) }
|
||||||
|
.subscribeOn(AndroidSchedulers.mainThread())
|
||||||
|
}
|
||||||
|
|
||||||
override fun getRecipient(recipientId: Long): Recipient? {
|
override fun getRecipient(recipientId: Long): Recipient? {
|
||||||
return Realm.getDefaultInstance()
|
return Realm.getDefaultInstance()
|
||||||
.where(Recipient::class.java)
|
.where(Recipient::class.java)
|
||||||
|
|||||||
@@ -54,6 +54,8 @@ interface ConversationRepository {
|
|||||||
|
|
||||||
fun getUnmanagedConversations(): Observable<List<Conversation>>
|
fun getUnmanagedConversations(): Observable<List<Conversation>>
|
||||||
|
|
||||||
|
fun getUnmanagedRecipients(): Observable<List<Recipient>>
|
||||||
|
|
||||||
fun getRecipient(recipientId: Long): Recipient?
|
fun getRecipient(recipientId: Long): Recipient?
|
||||||
|
|
||||||
fun getThreadId(recipient: String): Long?
|
fun getThreadId(recipient: String): Long?
|
||||||
|
|||||||
+35
-5
@@ -29,21 +29,35 @@ import com.moez.QKSMS.common.base.QkViewHolder
|
|||||||
import com.moez.QKSMS.common.util.Colors
|
import com.moez.QKSMS.common.util.Colors
|
||||||
import com.moez.QKSMS.common.util.extensions.forwardTouches
|
import com.moez.QKSMS.common.util.extensions.forwardTouches
|
||||||
import com.moez.QKSMS.common.util.extensions.setTint
|
import com.moez.QKSMS.common.util.extensions.setTint
|
||||||
|
import com.moez.QKSMS.extensions.associateByNotNull
|
||||||
import com.moez.QKSMS.model.Contact
|
import com.moez.QKSMS.model.Contact
|
||||||
import com.moez.QKSMS.model.ContactGroup
|
import com.moez.QKSMS.model.ContactGroup
|
||||||
import com.moez.QKSMS.model.Conversation
|
import com.moez.QKSMS.model.Conversation
|
||||||
import com.moez.QKSMS.model.Recipient
|
import com.moez.QKSMS.model.Recipient
|
||||||
|
import com.moez.QKSMS.repository.ConversationRepository
|
||||||
|
import io.reactivex.disposables.CompositeDisposable
|
||||||
|
import io.reactivex.rxkotlin.plusAssign
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import kotlinx.android.synthetic.main.contact_list_item.view.*
|
import kotlinx.android.synthetic.main.contact_list_item.view.*
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAdapter<ComposeItem>() {
|
class ComposeItemAdapter @Inject constructor(
|
||||||
|
private val colors: Colors,
|
||||||
|
private val conversationRepo: ConversationRepository
|
||||||
|
) : QkAdapter<ComposeItem>() {
|
||||||
|
|
||||||
val clicks: Subject<ComposeItem> = PublishSubject.create()
|
val clicks: Subject<ComposeItem> = PublishSubject.create()
|
||||||
val longClicks: Subject<ComposeItem> = PublishSubject.create()
|
val longClicks: Subject<ComposeItem> = PublishSubject.create()
|
||||||
|
|
||||||
private val numbersViewPool = RecyclerView.RecycledViewPool()
|
private val numbersViewPool = RecyclerView.RecycledViewPool()
|
||||||
|
private val disposables = CompositeDisposable()
|
||||||
|
|
||||||
|
var recipients: Map<String, Recipient> = mapOf()
|
||||||
|
set(value) {
|
||||||
|
field = value
|
||||||
|
notifyDataSetChanged()
|
||||||
|
}
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||||
val layoutInflater = LayoutInflater.from(parent.context)
|
val layoutInflater = LayoutInflater.from(parent.context)
|
||||||
@@ -87,7 +101,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
|
|||||||
|
|
||||||
view.icon.isVisible = false
|
view.icon.isVisible = false
|
||||||
|
|
||||||
view.avatar.recipients = listOf(Recipient(contact = contact))
|
view.avatar.recipients = listOf(createRecipient(contact))
|
||||||
|
|
||||||
view.title.text = contact.numbers.joinToString { it.address }
|
view.title.text = contact.numbers.joinToString { it.address }
|
||||||
|
|
||||||
@@ -123,7 +137,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
|
|||||||
view.icon.isVisible = prev !is ComposeItem.Starred
|
view.icon.isVisible = prev !is ComposeItem.Starred
|
||||||
view.icon.setImageResource(R.drawable.ic_star_black_24dp)
|
view.icon.setImageResource(R.drawable.ic_star_black_24dp)
|
||||||
|
|
||||||
view.avatar.recipients = listOf(Recipient(contact = contact))
|
view.avatar.recipients = listOf(createRecipient(contact))
|
||||||
|
|
||||||
view.title.text = contact.name
|
view.title.text = contact.name
|
||||||
|
|
||||||
@@ -139,7 +153,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
|
|||||||
view.icon.isVisible = prev !is ComposeItem.Group
|
view.icon.isVisible = prev !is ComposeItem.Group
|
||||||
view.icon.setImageResource(R.drawable.ic_people_black_24dp)
|
view.icon.setImageResource(R.drawable.ic_people_black_24dp)
|
||||||
|
|
||||||
view.avatar.recipients = group.contacts.map { contact -> Recipient(contact = contact) }
|
view.avatar.recipients = group.contacts.map(::createRecipient)
|
||||||
|
|
||||||
view.title.text = group.title
|
view.title.text = group.title
|
||||||
|
|
||||||
@@ -158,7 +172,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
|
|||||||
|
|
||||||
view.icon.isVisible = false
|
view.icon.isVisible = false
|
||||||
|
|
||||||
view.avatar.recipients = listOf(Recipient(contact = contact))
|
view.avatar.recipients = listOf(createRecipient(contact))
|
||||||
|
|
||||||
view.title.text = contact.name
|
view.title.text = contact.name
|
||||||
|
|
||||||
@@ -168,6 +182,22 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
|
|||||||
(view.numbers.adapter as PhoneNumberAdapter).data = contact.numbers
|
(view.numbers.adapter as PhoneNumberAdapter).data = contact.numbers
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun createRecipient(contact: Contact): Recipient {
|
||||||
|
return recipients[contact.lookupKey] ?: Recipient(
|
||||||
|
address = contact.numbers.firstOrNull()?.address ?: "",
|
||||||
|
contact = contact)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
|
||||||
|
disposables += conversationRepo.getUnmanagedRecipients()
|
||||||
|
.map { recipients -> recipients.associateByNotNull { recipient -> recipient.contact?.lookupKey } }
|
||||||
|
.subscribe { recipients -> this@ComposeItemAdapter.recipients = recipients }
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
||||||
|
disposables.clear()
|
||||||
|
}
|
||||||
|
|
||||||
override fun areItemsTheSame(old: ComposeItem, new: ComposeItem): Boolean {
|
override fun areItemsTheSame(old: ComposeItem, new: ComposeItem): Boolean {
|
||||||
val oldIds = old.getContacts().map { contact -> contact.lookupKey }
|
val oldIds = old.getContacts().map { contact -> contact.lookupKey }
|
||||||
val newIds = new.getContacts().map { contact -> contact.lookupKey }
|
val newIds = new.getContacts().map { contact -> contact.lookupKey }
|
||||||
|
|||||||
Reference in New Issue
Block a user