diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/ConversationMessagePair.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/InboxItem.kt similarity index 56% rename from qksms/src/main/java/com/moez/QKSMS/data/model/ConversationMessagePair.kt rename to qksms/src/main/java/com/moez/QKSMS/data/model/InboxItem.kt index c2dabd6f..1ce4c83a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/ConversationMessagePair.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/InboxItem.kt @@ -3,4 +3,4 @@ package com.moez.QKSMS.data.model /** * Groups a conversation with its latest message into a single model */ -data class ConversationMessagePair(val conversation: Conversation, val message: Message) \ No newline at end of file +data class InboxItem(val conversation: Conversation, val message: Message) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 9935b5c5..61bff479 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -14,7 +14,7 @@ import com.moez.QKSMS.common.util.extensions.insertOrUpdate import com.moez.QKSMS.data.mapper.CursorToConversation import com.moez.QKSMS.data.mapper.CursorToMessage import com.moez.QKSMS.data.model.Conversation -import com.moez.QKSMS.data.model.ConversationMessagePair +import com.moez.QKSMS.data.model.InboxItem import com.moez.QKSMS.data.model.Message import io.reactivex.Flowable import io.reactivex.Maybe @@ -33,7 +33,7 @@ class MessageRepository @Inject constructor( private val cursorToMessage: CursorToMessage, private val cursorToConversation: CursorToConversation) { - fun getConversations(archived: Boolean = false): Flowable> { + fun getConversations(archived: Boolean = false): Flowable> { val realm = Realm.getDefaultInstance() val conversations = realm.where(Conversation::class.java) @@ -53,7 +53,7 @@ class MessageRepository @Inject constructor( return Flowable.combineLatest(conversations, messages, BiFunction { conversations, messages -> messages.mapNotNull { message -> val conversation = conversations[message.threadId] - if (conversation == null) null else ConversationMessagePair(conversation, message) + if (conversation == null) null else InboxItem(conversation, message) } }) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index 5dc3ffca..c2614c1e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -9,7 +9,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.data.model.Contact -import com.moez.QKSMS.data.model.ConversationMessagePair +import com.moez.QKSMS.data.model.InboxItem import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.FlowableAdapter @@ -27,7 +27,7 @@ class ConversationsAdapter @Inject constructor( val messageRepo: MessageRepository, val dateFormatter: DateFormatter, val colors: Colors -) : FlowableAdapter() { +) : FlowableAdapter() { val longClicks: Subject = PublishSubject.create() @@ -73,7 +73,7 @@ class ConversationsAdapter @Inject constructor( return if (getItem(position).message.read) 0 else 1 } - override fun areItemsTheSame(old: ConversationMessagePair, new: ConversationMessagePair): Boolean { + override fun areItemsTheSame(old: InboxItem, new: InboxItem): Boolean { return old.conversation.id == new.conversation.id } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt index 2005148e..d3ba3c9a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt @@ -1,6 +1,6 @@ package com.moez.QKSMS.presentation.main -import com.moez.QKSMS.data.model.ConversationMessagePair +import com.moez.QKSMS.data.model.InboxItem import io.reactivex.Flowable data class MainState( @@ -10,9 +10,9 @@ data class MainState( sealed class MainPage -data class Inbox(val data: Flowable>?) : MainPage() +data class Inbox(val data: Flowable>?) : MainPage() -data class Archived(val data: Flowable>?) : MainPage() +data class Archived(val data: Flowable>?) : MainPage() data class Scheduled(val data: Any? = null) : MainPage()