From 20af29c1d483562259d16650c4b5189a86dd6698 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 1 Nov 2017 17:37:14 -0700 Subject: [PATCH] Create Adapter in ViewModel instead of Activity --- .../presentation/conversations/ConversationsActivity.kt | 4 ++-- .../QKSMS/presentation/conversations/ConversationsState.kt | 5 ++--- .../presentation/conversations/ConversationsViewModel.kt | 7 +------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt index 7f0281d9..9f68823d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt @@ -57,8 +57,8 @@ class ConversationsActivity : QkActivity? = null, + val adapter: RecyclerView.Adapter<*>? = null, val refreshing: Boolean = false, val drawerOpen: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt index 8d107a7b..91d896fa 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt @@ -1,13 +1,11 @@ package com.moez.QKSMS.presentation.conversations import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkAllSeen import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkViewModel import io.reactivex.rxkotlin.plusAssign -import io.realm.RealmResults import javax.inject.Inject class ConversationsViewModel : QkViewModel(ConversationsState()) { @@ -16,15 +14,12 @@ class ConversationsViewModel : QkViewModel - init { AppComponentManager.appComponent.inject(this) disposables += markAllSeen - conversations = messageRepo.getConversationMessagesAsync() - newState { it.copy(conversations = conversations) } + newState { it.copy(adapter = ConversationsAdapter(messageRepo.getConversationMessagesAsync())) } markAllSeen.execute(Unit) }