Use custom ViewModelFactory for all ViewModels

This commit is contained in:
Moez Bhatti
2017-10-31 13:40:38 -07:00
parent f2088d73c1
commit 5a865962cd
4 changed files with 25 additions and 19 deletions
@@ -4,6 +4,7 @@ import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import android.content.Context
import android.content.Intent
import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
import com.moez.QKSMS.presentation.messages.MessagesActivity
import com.moez.QKSMS.presentation.messages.MessagesViewModel
import javax.inject.Inject
@@ -28,8 +29,14 @@ class Navigator @Inject constructor(val context: Context) {
@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return when (modelClass) {
ConversationsViewModel::class.java -> {
ConversationsViewModel()
}
MessagesViewModel::class.java -> {
MessagesViewModel(intent.getLongExtra("threadId", 0))
val threadId = intent.getLongExtra("threadId", 0)
MessagesViewModel(threadId)
}
else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt")
@@ -1,19 +1,30 @@
package com.moez.QKSMS.presentation.base
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.MenuItem
import com.moez.QKSMS.presentation.Navigator
import kotlinx.android.synthetic.main.toolbar.*
import kotlin.reflect.KClass
abstract class QkActivity : AppCompatActivity() {
abstract class QkActivity<VM : QkViewModel<*, State>, State> : AppCompatActivity(), QkView<State> {
protected abstract val viewModelClass: KClass<VM>
protected val viewModel: VM by lazy {
ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[viewModelClass.java]
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
onNewIntent(intent)
viewModel.state.observe(this, Observer { it?.let { render(it) } })
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when(item.itemId) {
return when (item.itemId) {
android.R.id.home -> {
onBackPressed()
true
@@ -1,8 +1,6 @@
package com.moez.QKSMS.presentation.conversations
import android.Manifest
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.ActionBarDrawerToggle
@@ -23,12 +21,11 @@ import kotlinx.android.synthetic.main.toolbar.*
import timber.log.Timber
import javax.inject.Inject
class ConversationsActivity : QkActivity(), ConversationsView {
class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsState>(), ConversationsView {
@Inject lateinit var navigator: Navigator
private lateinit var viewModel: ConversationsViewModel
override val viewModelClass = ConversationsViewModel::class
override val composeIntent by lazy { compose.clicks() }
override val archivedIntent by lazy { archived.clicks() }
override val scheduledIntent by lazy { scheduled.clicks() }
@@ -41,9 +38,6 @@ class ConversationsActivity : QkActivity(), ConversationsView {
setContentView(R.layout.conversation_list_activity)
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
requestPermissions()
viewModel = ViewModelProviders.of(this)[ConversationsViewModel::class.java]
viewModel.state.observe(this, Observer { it?.let { render(it) } })
viewModel.setView(this)
conversationList.layoutManager = LinearLayoutManager(this)
@@ -1,7 +1,5 @@
package com.moez.QKSMS.presentation.messages
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
@@ -12,19 +10,18 @@ import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkActivity
import io.realm.RealmResults
import kotlinx.android.synthetic.main.message_list_activity.*
import javax.inject.Inject
class MessagesActivity : QkActivity(), MessagesView {
class MessagesActivity : QkActivity<MessagesViewModel, MessagesState>(), MessagesView {
@Inject lateinit var themeManager: ThemeManager
private lateinit var layoutManager: LinearLayoutManager
private lateinit var viewModel: MessagesViewModel
override val viewModelClass = MessagesViewModel::class
override val textChangedIntent by lazy { message.textChanges() }
override val attachIntent by lazy { attach.clicks() }
override val sendIntent by lazy { send.clicks() }
@@ -34,9 +31,6 @@ class MessagesActivity : QkActivity(), MessagesView {
AppComponentManager.appComponent.inject(this)
setContentView(R.layout.message_list_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel = ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[MessagesViewModel::class.java]
viewModel.state.observe(this, Observer { it?.let { render(it) } })
viewModel.setView(this)
attach.setTint(themeManager.color)