mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-16 19:18:52 +01:00
Use RealmAdapter for conversation info media
This commit is contained in:
@@ -94,7 +94,7 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
||||
false -> R.string.info_block
|
||||
})
|
||||
|
||||
mediaAdapter.data = state.media
|
||||
mediaAdapter.updateData(state.media)
|
||||
}
|
||||
|
||||
override fun showDeleteDialog() {
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
package feature.conversationinfo
|
||||
|
||||
import io.realm.RealmList
|
||||
import io.realm.RealmResults
|
||||
import model.MmsPart
|
||||
import model.Recipient
|
||||
|
||||
@@ -27,6 +28,6 @@ data class ConversationInfoState(
|
||||
val threadId: Long = 0,
|
||||
val archived: Boolean = false,
|
||||
val blocked: Boolean = false,
|
||||
val media: List<MmsPart> = ArrayList(),
|
||||
val media: RealmResults<MmsPart>? = null,
|
||||
val hasError: Boolean = false
|
||||
)
|
||||
@@ -22,6 +22,8 @@ import android.content.Context
|
||||
import android.content.Intent
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import injection.appComponent
|
||||
import interactor.DeleteConversation
|
||||
import interactor.MarkArchived
|
||||
@@ -32,11 +34,8 @@ import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import model.Conversation
|
||||
import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import repository.MessageRepository
|
||||
import util.extensions.asObservable
|
||||
import util.extensions.isImage
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoView,
|
||||
@@ -59,6 +58,9 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoVi
|
||||
|
||||
newState { it.copy(threadId = threadId) }
|
||||
|
||||
// Load the attachments from the conversation
|
||||
newState { it.copy(media = messageRepo.getPartsForConversation(threadId)) }
|
||||
|
||||
conversation = messageRepo.getConversationAsync(threadId)
|
||||
.asObservable<Conversation>()
|
||||
.filter { conversation -> conversation.isLoaded }
|
||||
@@ -93,12 +95,6 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoVi
|
||||
.map { conversation -> conversation.blocked }
|
||||
.distinctUntilChanged()
|
||||
.subscribe { blocked -> newState { it.copy(blocked = blocked) } }
|
||||
|
||||
// Load the attachments from the conversation
|
||||
disposables += messageRepo.getPartsForConversation(threadId)
|
||||
.map { parts -> parts.filter { part -> part.isImage() } }
|
||||
.map { parts -> parts.reversed() }
|
||||
.subscribe { media -> newState { it.copy(media = media) } }
|
||||
}
|
||||
|
||||
override fun bindView(view: ConversationInfoView) {
|
||||
|
||||
@@ -24,6 +24,8 @@ import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.moez.QKSMS.R
|
||||
import common.base.QkRealmAdapter
|
||||
import common.base.QkViewHolder
|
||||
import common.util.Colors
|
||||
import common.util.GlideApp
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
@@ -31,14 +33,12 @@ import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
|
||||
import model.MmsPart
|
||||
import common.base.QkAdapter
|
||||
import common.base.QkViewHolder
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationMediaAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val colors: Colors
|
||||
) : QkAdapter<MmsPart>() {
|
||||
) : QkRealmAdapter<MmsPart>() {
|
||||
|
||||
val thumbnailClicks: PublishSubject<View> = PublishSubject.create()
|
||||
|
||||
@@ -53,7 +53,7 @@ class ConversationMediaAdapter @Inject constructor(
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val part = getItem(position)
|
||||
val part = getItem(position)!!
|
||||
val view = holder.itemView
|
||||
|
||||
GlideApp.with(context)
|
||||
|
||||
Reference in New Issue
Block a user