diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index 7952f303..ccefd38d 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
android:theme="@style/AppTheme">
@@ -44,7 +44,7 @@
-
+
create(modelClass: Class): T {
+ return when (modelClass) {
+ MessagesViewModel::class.java -> {
+ MessagesViewModel(intent.getLongExtra("threadId", 0))
+ }
+
+ else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt")
+ } as T
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkView.kt
new file mode 100644
index 00000000..3cf6ec9c
--- /dev/null
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkView.kt
@@ -0,0 +1,7 @@
+package com.moez.QKSMS.presentation.base
+
+interface QkView {
+
+ fun render(state: State)
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt
index e2330f3b..fdf9fe69 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt
@@ -4,9 +4,14 @@ import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import io.reactivex.subjects.PublishSubject
-abstract class QkViewModel(initialState: State) : ViewModel() {
+abstract class QkViewModel, State>(initialState: State) : ViewModel() {
val state = MutableLiveData()
+ var view: View? = null
+ set(value) {
+ field = value
+ bindIntents()
+ }
private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create()
@@ -16,6 +21,8 @@ abstract class QkViewModel(initialState: State) : ViewModel() {
.subscribe { newState -> state.value = newState }
}
+ fun bindIntents() {}
+
protected fun newState(reducer: (State) -> State) {
stateReducer.onNext(reducer)
}
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt
similarity index 72%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt
index b1775833..30709e3b 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt
@@ -14,27 +14,33 @@ import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.di.AppComponentManager
+import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkActivity
-import com.moez.QKSMS.presentation.messages.MessageListActivity
import kotlinx.android.synthetic.main.conversation_list_activity.*
import kotlinx.android.synthetic.main.drawer_view.*
import kotlinx.android.synthetic.main.toolbar.*
import timber.log.Timber
+import javax.inject.Inject
-class ConversationListActivity : QkActivity(), Observer {
+class ConversationsActivity : QkActivity(), ConversationsView {
- private lateinit var viewModel: ConversationListViewModel
+ @Inject lateinit var navigator: Navigator
+
+ private lateinit var viewModel: ConversationsViewModel
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ AppComponentManager.appComponent.inject(this)
setContentView(R.layout.conversation_list_activity)
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
onNewIntent(intent)
requestPermissions()
- viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java]
- viewModel.state.observe(this, this)
+ viewModel = ViewModelProviders.of(this)[ConversationsViewModel::class.java]
+ viewModel.state.observe(this, Observer { it?.let { render(it) } })
+ viewModel.view = this
conversationList.layoutManager = LinearLayoutManager(this)
@@ -49,19 +55,17 @@ class ConversationListActivity : QkActivity(), Observer threadId > 0 }?.let { threadId ->
- startActivity(Intent(this, MessageListActivity::class.java).putExtra("threadId", threadId))
- }
+ intent?.getLongExtra("threadId", 0)
+ ?.takeIf { threadId -> threadId > 0 }
+ ?.let { threadId -> navigator.showConversation(threadId) }
}
- override fun onChanged(state: ConversationListViewState?) {
- state?.let {
- if (conversationList.adapter == null && state.conversations?.isValid == true) {
- conversationList.adapter = ConversationAdapter(state.conversations)
- }
-
- swipeRefresh.isRefreshing = state.refreshing
+ override fun render(state: ConversationsState) {
+ if (conversationList.adapter == null && state.conversations?.isValid == true) {
+ conversationList.adapter = ConversationsAdapter(state.conversations)
}
+
+ swipeRefresh.isRefreshing = state.refreshing
}
private fun requestPermissions() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsAdapter.kt
similarity index 81%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationAdapter.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsAdapter.kt
index c16f332e..507938a8 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationAdapter.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsAdapter.kt
@@ -1,7 +1,6 @@
package com.moez.QKSMS.presentation.conversations
import android.content.Context
-import android.content.Intent
import android.view.LayoutInflater
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
@@ -11,17 +10,18 @@ import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
+import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkViewHolder
-import com.moez.QKSMS.presentation.messages.MessageListActivity
import io.realm.OrderedRealmCollection
import io.realm.RealmList
import io.realm.RealmRecyclerViewAdapter
import kotlinx.android.synthetic.main.conversation_list_item.view.*
import javax.inject.Inject
-class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(data, true) {
+class ConversationsAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(data, true) {
@Inject lateinit var context: Context
+ @Inject lateinit var navigator: Navigator
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var themeManager: ThemeManager
@@ -51,10 +51,7 @@ class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecycle
val conversation = messageRepo.getConversation(message.threadId)
val view = viewHolder.itemView
- RxView.clicks(view)
- .map { Intent(context, MessageListActivity::class.java) }
- .doOnNext { intent -> intent.putExtra("threadId", message.threadId) }
- .subscribe { intent -> context.startActivity(intent) }
+ RxView.clicks(view).subscribe { navigator.showConversation(message.threadId) }
view.avatars.contacts = conversation?.contacts ?: RealmList()
view.title.text = conversation?.getTitle()
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsState.kt
similarity index 86%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsState.kt
index e6605af5..e2c34d86 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsState.kt
@@ -3,7 +3,7 @@ package com.moez.QKSMS.presentation.conversations
import com.moez.QKSMS.data.model.Message
import io.realm.OrderedRealmCollection
-data class ConversationListViewState(
+data class ConversationsState(
val conversations: OrderedRealmCollection? = null,
val refreshing: Boolean = false
)
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt
new file mode 100644
index 00000000..0f0d9885
--- /dev/null
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt
@@ -0,0 +1,5 @@
+package com.moez.QKSMS.presentation.conversations
+
+import com.moez.QKSMS.presentation.base.QkView
+
+interface ConversationsView : QkView
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt
index 36e2aaa3..2d7684db 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt
@@ -9,7 +9,7 @@ import com.moez.QKSMS.presentation.base.QkViewModel
import io.realm.RealmResults
import javax.inject.Inject
-class ConversationListViewModel : QkViewModel(ConversationListViewState()) {
+class ConversationsViewModel : QkViewModel(ConversationsState()) {
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var syncConversations: SyncConversations
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
similarity index 72%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListActivity.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
index 00475f62..befe730c 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListActivity.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
@@ -9,19 +9,20 @@ import com.jakewharton.rxbinding2.view.RxView
import com.jakewharton.rxbinding2.widget.RxTextView
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
-import com.moez.QKSMS.data.model.Message
-import com.moez.QKSMS.presentation.base.QkActivity
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 MessageListActivity : QkActivity(), Observer {
+class MessagesActivity : QkActivity(), MessagesView {
@Inject lateinit var themeManager: ThemeManager
- private lateinit var viewModel: MessageListViewModel
+ private lateinit var viewModel: MessagesViewModel
private lateinit var layoutManager: LinearLayoutManager
override fun onCreate(savedInstanceState: Bundle?) {
@@ -30,9 +31,9 @@ class MessageListActivity : QkActivity(), Observer {
setContentView(R.layout.message_list_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
- viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java]
- viewModel.threadId = intent.getLongExtra("threadId", 0)
- viewModel.state.observe(this, this)
+ viewModel = ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[MessagesViewModel::class.java]
+ viewModel.state.observe(this, Observer { it?.let { render(it) } })
+ viewModel.view = this
attach.setTint(themeManager.color)
@@ -45,20 +46,18 @@ class MessageListActivity : QkActivity(), Observer {
RxView.clicks(send).subscribe { viewModel.sendMessage(message.text.toString()) }
}
- override fun onChanged(state: MessageListViewState?) {
- state?.let {
- if (title != state.title) title = state.title
- if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = createAdapter(state.messages)
- if (message.text.toString() != state.draft) message.setText(state.draft)
- if (state.hasError) finish()
+ override fun render(state: MessagesState) {
+ if (title != state.title) title = state.title
+ if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = createAdapter(state.messages)
+ if (message.text.toString() != state.draft) message.setText(state.draft)
+ if (state.hasError) finish()
- send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
- send.isEnabled = state.canSend
- }
+ send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
+ send.isEnabled = state.canSend
}
- private fun createAdapter(messages: RealmResults): MessageAdapter {
- val adapter = MessageAdapter(messages)
+ private fun createAdapter(messages: RealmResults): MessagesAdapter {
+ val adapter = MessagesAdapter(messages)
adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
super.onItemRangeInserted(positionStart, itemCount)
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageAdapter.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt
index edf18eb6..403a9648 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageAdapter.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt
@@ -22,7 +22,7 @@ import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
-class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(data, true) {
+class MessagesAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(data, true) {
companion object {
private val VIEWTYPE_ME = -1
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
index 8914f134..4bd42a0a 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
@@ -3,7 +3,7 @@ package com.moez.QKSMS.presentation.messages
import com.moez.QKSMS.data.model.Message
import io.realm.RealmResults
-data class MessageListViewState(
+data class MessagesState(
val title: String = "",
val messages: RealmResults? = null,
val draft: String = "",
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
new file mode 100644
index 00000000..97e9a957
--- /dev/null
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
@@ -0,0 +1,5 @@
+package com.moez.QKSMS.presentation.messages
+
+import com.moez.QKSMS.presentation.base.QkView
+
+interface MessagesView : QkView
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
similarity index 74%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
index 6d8dbb4e..4522e9f5 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
@@ -8,29 +8,20 @@ import com.moez.QKSMS.domain.interactor.SendMessage
import com.moez.QKSMS.presentation.base.QkViewModel
import javax.inject.Inject
-class MessageListViewModel : QkViewModel(MessageListViewState()) {
+class MessagesViewModel(val threadId: Long) : QkViewModel(MessagesState()) {
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var sendMessage: SendMessage
@Inject lateinit var markRead: MarkRead
- var threadId: Long = 0
- set(value) {
- field = value
- newThreadId()
- }
-
- private var conversation: Conversation? = null
+ private var conversation: Conversation
init {
AppComponentManager.appComponent.inject(this)
- }
- private fun newThreadId() {
dataChanged()
- conversation?.removeAllChangeListeners()
conversation = messageRepo.getConversationAsync(threadId)
- conversation?.addChangeListener { conversation: Conversation ->
+ conversation.addChangeListener { conversation: Conversation ->
when (conversation.isValid) {
true -> {
val title = conversation.getTitle()
@@ -43,7 +34,7 @@ class MessageListViewModel : QkViewModel(MessageListViewSt
}
fun sendMessage(body: String) {
- conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation ->
+ conversation.takeIf { conversation -> conversation.isValid }?.let { conversation ->
sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, body))
newState { it.copy(draft = "", canSend = false) }
}
@@ -61,7 +52,7 @@ class MessageListViewModel : QkViewModel(MessageListViewSt
super.onCleared()
sendMessage.dispose()
markRead.dispose()
- conversation?.removeAllChangeListeners()
+ conversation.removeAllChangeListeners()
}
}
\ No newline at end of file