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
import android.content.Context
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.ui.conversations.ConversationListActivity
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import com.moez.QKSMS.ui.messages.MessageAdapter
import com.moez.QKSMS.ui.messages.MessageListViewModel
import dagger.Component
import javax.inject.Singleton
@Singleton
@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class))
@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class, MessagesModule::class))
interface AppComponent {
fun inject(activity: ConversationListActivity)
fun inject(viewModel: ConversationListViewModel)
fun inject(viewModel: MessageListViewModel)
fun inject(message: Message)
fun inject(adapter: MessageAdapter)
fun provideContext(): Context
fun provideConversationRepository(): ConversationRepository
}
@@ -1,8 +1,6 @@
package com.moez.QKSMS.dagger
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.Provides
import javax.inject.Singleton
@@ -16,10 +14,4 @@ class ConversationsModule {
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
import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.ui.messages.MessageListViewModel
import dagger.Module
import dagger.Provides
import javax.inject.Named
import javax.inject.Singleton
@Module
class MessagesModule(val threadId: Long) {
class MessagesModule {
@Provides
@Named("thread_id")
fun provideThreadId(): Long {
return threadId
}
@ActivityScope
@Singleton
@Provides
fun provideRepository(): MessageRepository {
return MessageRepository(threadId)
}
@ActivityScope
@Provides
fun provideViewModel(conversations: ConversationRepository, repository: MessageRepository): MessageListViewModel {
return MessageListViewModel(threadId, conversations, repository)
return MessageRepository()
}
}