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
@@ -18,6 +18,8 @@
*/
package feature.plus
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.graphics.Typeface
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
@@ -31,24 +33,23 @@ import common.util.FontProvider
import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
import injection.appComponent
import dagger.android.AndroidInjection
import kotlinx.android.synthetic.main.qksms_plus_activity.*
import javax.inject.Inject
class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
class PlusActivity : QkThemedActivity(), PlusView {
@Inject lateinit var fontProvider: FontProvider
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
override val viewModelClass = PlusViewModel::class
override val upgradeIntent by lazy { upgrade.clicks() }
override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
override val donateIntent by lazy { donate.clicks() }
init {
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.qksms_plus_activity)
setTitle(R.string.title_qksms_plus)
@@ -0,0 +1,17 @@
package feature.plus
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class PlusActivityModule {
@Provides
@IntoMap
@ViewModelKey(PlusViewModel::class)
fun providePlusViewModel(viewModel: PlusViewModel): ViewModel = viewModel
}
@@ -23,20 +23,18 @@ import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import common.util.BillingManager
import injection.appComponent
import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
import manager.AnalyticsManager
import javax.inject.Inject
class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
@Inject lateinit var analyticsManager: AnalyticsManager
@Inject lateinit var billingManager: BillingManager
@Inject lateinit var navigator: Navigator
class PlusViewModel @Inject constructor(
private val analyticsManager: AnalyticsManager,
private val billingManager: BillingManager,
private val navigator: Navigator
) : QkViewModel<PlusView, PlusState>(PlusState()) {
init {
appComponent.inject(this)
analyticsManager.track("Viewed QKSMS+")
disposables += billingManager.upgradeStatus