Use constructor injection for ViewModels

This commit is contained in:
Moez Bhatti
2018-05-11 03:36:40 -04:00
parent 697f665674
commit bf8cab3c8b
45 changed files with 532 additions and 308 deletions
@@ -19,33 +19,34 @@
package feature.blocked
import android.app.AlertDialog
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.base.QkThemedActivity
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.blocked_activity.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import javax.inject.Inject
class BlockedActivity : QkThemedActivity<BlockedViewModel>(), BlockedView {
class BlockedActivity : QkThemedActivity(), BlockedView {
@Inject lateinit var blockedAdapter: BlockedAdapter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = BlockedViewModel::class
override val siaClickedIntent by lazy { shouldIAnswer.clicks() }
override val unblockIntent by lazy { blockedAdapter.unblock }
override val confirmUnblockIntent: Subject<Unit> = PublishSubject.create()
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockedViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.blocked_activity)
setTitle(R.string.blocked_title)
@@ -0,0 +1,17 @@
package feature.blocked
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class BlockedActivityModule {
@Provides
@IntoMap
@ViewModelKey(BlockedViewModel::class)
fun provideBlockedViewModel(viewModel: BlockedViewModel): ViewModel = viewModel
}
@@ -23,7 +23,6 @@ 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.MarkUnblocked
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
@@ -32,17 +31,15 @@ import util.Preferences
import util.tryOrNull
import javax.inject.Inject
class BlockedViewModel : QkViewModel<BlockedView, BlockedState>(BlockedState()) {
@Inject lateinit var context: Context
@Inject lateinit var markUnblocked: MarkUnblocked
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@Inject lateinit var prefs: Preferences
class BlockedViewModel @Inject constructor(
private val context: Context,
private val markUnblocked: MarkUnblocked,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
private val prefs: Preferences
) : QkViewModel<BlockedView, BlockedState>(BlockedState()) {
init {
appComponent.inject(this)
newState { it.copy(data = messageRepo.getBlockedConversations()) }
disposables += prefs.sia.asObservable()