Don't pass arguments in ViewModel constructors

This commit is contained in:
Moez Bhatti
2017-09-19 17:48:27 -04:00
parent bd6e676f4f
commit f5b6f0fa91
9 changed files with 63 additions and 75 deletions
@@ -1,22 +1,20 @@
package com.moez.QKSMS.dagger package com.moez.QKSMS.dagger
import android.content.Context
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import com.moez.QKSMS.ui.conversations.ConversationListActivity
import com.moez.QKSMS.ui.messages.MessageAdapter import com.moez.QKSMS.ui.messages.MessageAdapter
import com.moez.QKSMS.ui.messages.MessageListViewModel
import dagger.Component import dagger.Component
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class)) @Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class, MessagesModule::class))
interface AppComponent { interface AppComponent {
fun inject(activity: ConversationListActivity) fun inject(viewModel: ConversationListViewModel)
fun inject(viewModel: MessageListViewModel)
fun inject(message: Message) fun inject(message: Message)
fun inject(adapter: MessageAdapter) fun inject(adapter: MessageAdapter)
fun provideContext(): Context
fun provideConversationRepository(): ConversationRepository
} }
@@ -1,8 +1,6 @@
package com.moez.QKSMS.dagger package com.moez.QKSMS.dagger
import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import javax.inject.Singleton import javax.inject.Singleton
@@ -16,10 +14,4 @@ class ConversationsModule {
return ConversationRepository() return ConversationRepository()
} }
@Provides
@Singleton
fun provideViewModel(syncManager: SyncManager, repository: ConversationRepository): ConversationListViewModel {
return ConversationListViewModel(syncManager, repository)
}
} }
@@ -1,12 +0,0 @@
package com.moez.QKSMS.dagger
import com.moez.QKSMS.ui.messages.MessageListActivity
import dagger.Component
@ActivityScope
@Component(dependencies = arrayOf(AppComponent::class), modules = arrayOf(MessagesModule::class))
interface MessagesComponent {
fun inject(activity: MessageListActivity)
}
@@ -1,31 +1,17 @@
package com.moez.QKSMS.dagger package com.moez.QKSMS.dagger
import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.ui.messages.MessageListViewModel
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import javax.inject.Named import javax.inject.Singleton
@Module @Module
class MessagesModule(val threadId: Long) { class MessagesModule {
@Provides @Singleton
@Named("thread_id")
fun provideThreadId(): Long {
return threadId
}
@ActivityScope
@Provides @Provides
fun provideRepository(): MessageRepository { fun provideRepository(): MessageRepository {
return MessageRepository(threadId) return MessageRepository()
}
@ActivityScope
@Provides
fun provideViewModel(conversations: ConversationRepository, repository: MessageRepository): MessageListViewModel {
return MessageListViewModel(threadId, conversations, repository)
} }
} }
@@ -4,9 +4,9 @@ import com.moez.QKSMS.data.model.Message
import io.realm.Realm import io.realm.Realm
import io.realm.RealmResults import io.realm.RealmResults
class MessageRepository(val threadId: Long) { class MessageRepository {
fun getMessages(): RealmResults<Message> { fun getMessages(threadId: Long): RealmResults<Message> {
return Realm.getDefaultInstance() return Realm.getDefaultInstance()
.where(Message::class.java) .where(Message::class.java)
.equalTo("threadId", threadId) .equalTo("threadId", threadId)
@@ -1,6 +1,7 @@
package com.moez.QKSMS.ui.conversations package com.moez.QKSMS.ui.conversations
import android.Manifest import android.Manifest
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.util.Log import android.util.Log
@@ -10,20 +11,19 @@ import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.ui.base.QkActivity import com.moez.QKSMS.ui.base.QkActivity
import kotlinx.android.synthetic.main.conversation_list_activity.* import kotlinx.android.synthetic.main.conversation_list_activity.*
import javax.inject.Inject
class ConversationListActivity : QkActivity() { class ConversationListActivity : QkActivity() {
val TAG = "MainActivity" val TAG = "MainActivity"
@Inject lateinit var viewModel: ConversationListViewModel lateinit var viewModel: ConversationListViewModel
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.conversation_list_activity) setContentView(R.layout.conversation_list_activity)
AppComponentManager.appComponent.inject(this)
viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java]
conversationList.layoutManager = LinearLayoutManager(this) conversationList.layoutManager = LinearLayoutManager(this)
conversationList.adapter = ConversationAdapter(this, viewModel.conversations) conversationList.adapter = ConversationAdapter(this, viewModel.conversations)
@@ -1,12 +1,25 @@
package com.moez.QKSMS.ui.conversations package com.moez.QKSMS.ui.conversations
import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.data.sync.SyncManager
import io.realm.RealmResults
import javax.inject.Inject
class ConversationListViewModel(val syncManager: SyncManager, repository: ConversationRepository) : ViewModel() { class ConversationListViewModel : ViewModel() {
val conversations = repository.getConversations() @Inject lateinit var syncManager: SyncManager
@Inject lateinit var conversationRepo: ConversationRepository
val conversations: RealmResults<Conversation>
init {
AppComponentManager.appComponent.inject(this)
conversations = conversationRepo.getConversations()
}
fun onRefresh(completionListener: () -> Unit) { fun onRefresh(completionListener: () -> Unit) {
syncManager.copyToRealm(completionListener::invoke) syncManager.copyToRealm(completionListener::invoke)
@@ -1,32 +1,25 @@
package com.moez.QKSMS.ui.messages package com.moez.QKSMS.ui.messages
import android.arch.lifecycle.Observer import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.dagger.DaggerMessagesComponent
import com.moez.QKSMS.dagger.MessagesModule
import com.moez.QKSMS.ui.base.QkActivity import com.moez.QKSMS.ui.base.QkActivity
import com.moez.QKSMS.util.observe import com.moez.QKSMS.util.observe
import kotlinx.android.synthetic.main.message_list_activity.* import kotlinx.android.synthetic.main.message_list_activity.*
import javax.inject.Inject
class MessageListActivity : QkActivity(), Observer<MessageListViewState> { class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
@Inject lateinit var viewModel: MessageListViewModel lateinit var viewModel: MessageListViewModel
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.message_list_activity) setContentView(R.layout.message_list_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
val threadId = intent.getLongExtra("thread_id", 0) viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java]
DaggerMessagesComponent.builder() viewModel.setThreadId(intent.getLongExtra("thread_id", 0))
.appComponent(AppComponentManager.appComponent)
.messagesModule(MessagesModule(threadId))
.build()
.inject(this)
val layoutManager = LinearLayoutManager(this) val layoutManager = LinearLayoutManager(this)
layoutManager.stackFromEnd = true layoutManager.stackFromEnd = true
@@ -2,33 +2,51 @@ package com.moez.QKSMS.ui.messages
import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.repository.MessageRepository
import io.realm.RealmResults import io.realm.RealmResults
import javax.inject.Inject
class MessageListViewModel(val threadId: Long, conversations: ConversationRepository, repository: MessageRepository) : ViewModel() { class MessageListViewModel : ViewModel() {
@Inject lateinit var conversationRepo: ConversationRepository
@Inject lateinit var messageRepo: MessageRepository
val state: MutableLiveData<MessageListViewState> = MutableLiveData() val state: MutableLiveData<MessageListViewState> = MutableLiveData()
private val conversation = conversations.getConversation(threadId) private var conversation: RealmResults<Conversation>? = null
private val messages: RealmResults<Message> = repository.getMessages() private var messages: RealmResults<Message>? = null
init { init {
state.value = MessageListViewState.MessagesLoaded(messages) AppComponentManager.appComponent.inject(this)
}
conversation.addChangeListener { realmResults -> fun setThreadId(threadId: Long) {
when (realmResults.size) { onCleared()
0 -> state.value = MessageListViewState.ConversationError(0)
else -> state.value = MessageListViewState.ConversationLoaded(realmResults[0]) messageRepo.getMessages(threadId).let {
messages = it
state.value = MessageListViewState.MessagesLoaded(messages!!)
}
conversationRepo.getConversation(threadId).let {
conversation = it
it.addChangeListener { realmResults ->
when (realmResults.size) {
0 -> state.value = MessageListViewState.ConversationError(0)
else -> state.value = MessageListViewState.ConversationLoaded(realmResults[0])
}
} }
} }
} }
override fun onCleared() { override fun onCleared() {
super.onCleared() super.onCleared()
conversation.removeAllChangeListeners() conversation?.removeAllChangeListeners()
messages.removeAllChangeListeners() messages?.removeAllChangeListeners()
} }
} }