From 5a865962cd59d48a56db36b3d971bc5310077756 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 31 Oct 2017 13:40:38 -0700 Subject: [PATCH] Use custom ViewModelFactory for all ViewModels --- .../java/com/moez/QKSMS/presentation/Navigator.kt | 9 ++++++++- .../moez/QKSMS/presentation/base/QkActivity.kt | 15 +++++++++++++-- .../conversations/ConversationsActivity.kt | 10 ++-------- .../presentation/messages/MessagesActivity.kt | 10 ++-------- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt index 702d4f77..3169ae23 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -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 create(modelClass: Class): 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") diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index a8f6cf99..4be4843c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.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, State> : AppCompatActivity(), QkView { + + protected abstract val viewModelClass: KClass + 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 diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt index fc942653..1e0b3214 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt @@ -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(), 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) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt index 6432ba43..baa35d5d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt @@ -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(), 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)