forked from upstream-mirrors/quik
Create Navigator to allow custom ViewModel constructors
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
android:theme="@style/AppTheme">
|
||||
|
||||
<activity
|
||||
android:name="com.moez.QKSMS.presentation.conversations.ConversationListActivity"
|
||||
android:name="com.moez.QKSMS.presentation.conversations.ConversationsActivity"
|
||||
android:launchMode="singleTask">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
@@ -44,7 +44,7 @@
|
||||
<data android:scheme="sms_body" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name="com.moez.QKSMS.presentation.messages.MessageListActivity" />
|
||||
<activity android:name="com.moez.QKSMS.presentation.messages.MessagesActivity" />
|
||||
|
||||
<receiver
|
||||
android:name=".receiver.SmsReceiver"
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package com.moez.QKSMS.common.di
|
||||
|
||||
import com.moez.QKSMS.common.util.NotificationManager
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationAdapter
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationListViewModel
|
||||
import com.moez.QKSMS.presentation.messages.MessageAdapter
|
||||
import com.moez.QKSMS.presentation.messages.MessageListActivity
|
||||
import com.moez.QKSMS.presentation.messages.MessageListViewModel
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsActivity
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsAdapter
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
|
||||
import com.moez.QKSMS.presentation.messages.MessagesActivity
|
||||
import com.moez.QKSMS.presentation.messages.MessagesAdapter
|
||||
import com.moez.QKSMS.presentation.messages.MessagesViewModel
|
||||
import com.moez.QKSMS.presentation.view.AvatarView
|
||||
import com.moez.QKSMS.receiver.*
|
||||
import dagger.Component
|
||||
@@ -15,10 +16,11 @@ import javax.inject.Singleton
|
||||
@Component(modules = arrayOf(AppModule::class))
|
||||
interface AppComponent {
|
||||
|
||||
fun inject(activity: MessageListActivity)
|
||||
fun inject(activity: ConversationsActivity)
|
||||
fun inject(activity: MessagesActivity)
|
||||
|
||||
fun inject(adapter: MessageAdapter)
|
||||
fun inject(adapter: ConversationAdapter)
|
||||
fun inject(adapter: ConversationsAdapter)
|
||||
fun inject(adapter: MessagesAdapter)
|
||||
|
||||
fun inject(manager: NotificationManager)
|
||||
|
||||
@@ -31,7 +33,7 @@ interface AppComponent {
|
||||
|
||||
fun inject(view: AvatarView)
|
||||
|
||||
fun inject(viewModel: ConversationListViewModel)
|
||||
fun inject(viewModel: MessageListViewModel)
|
||||
fun inject(viewModel: ConversationsViewModel)
|
||||
fun inject(viewModel: MessagesViewModel)
|
||||
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import com.moez.QKSMS.data.repository.MessageRepository
|
||||
import com.moez.QKSMS.receiver.MarkReadReceiver
|
||||
import com.moez.QKSMS.receiver.MarkSeenReceiver
|
||||
import com.moez.QKSMS.receiver.RemoteMessagingReceiver
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationListActivity
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsActivity
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@@ -60,7 +60,7 @@ class NotificationManager @Inject constructor(
|
||||
style.addMessage(message.body, message.date, name)
|
||||
}
|
||||
|
||||
val contentIntent = Intent(context, ConversationListActivity::class.java).putExtra("threadId", threadId)
|
||||
val contentIntent = Intent(context, ConversationsActivity::class.java).putExtra("threadId", threadId)
|
||||
val contentPI = PendingIntent.getActivity(context, threadId.toInt() + 10000, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
|
||||
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.moez.QKSMS.presentation
|
||||
|
||||
import android.arch.lifecycle.ViewModel
|
||||
import android.arch.lifecycle.ViewModelProvider
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import com.moez.QKSMS.presentation.messages.MessagesActivity
|
||||
import com.moez.QKSMS.presentation.messages.MessagesViewModel
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class Navigator @Inject constructor(val context: Context) {
|
||||
|
||||
private fun startActivity(intent: Intent) {
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||
context.startActivity(intent)
|
||||
}
|
||||
|
||||
fun showConversation(threadId: Long) {
|
||||
val intent = Intent(context, MessagesActivity::class.java)
|
||||
intent.putExtra("threadId", threadId)
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory {
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T : ViewModel?> create(modelClass: Class<T>): 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
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.moez.QKSMS.presentation.base
|
||||
|
||||
interface QkView<in State> {
|
||||
|
||||
fun render(state: State)
|
||||
|
||||
}
|
||||
@@ -4,9 +4,14 @@ import android.arch.lifecycle.MutableLiveData
|
||||
import android.arch.lifecycle.ViewModel
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
|
||||
abstract class QkViewModel<State>(initialState: State) : ViewModel() {
|
||||
abstract class QkViewModel<View : QkView<State>, State>(initialState: State) : ViewModel() {
|
||||
|
||||
val state = MutableLiveData<State>()
|
||||
var view: View? = null
|
||||
set(value) {
|
||||
field = value
|
||||
bindIntents()
|
||||
}
|
||||
|
||||
private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create()
|
||||
|
||||
@@ -16,6 +21,8 @@ abstract class QkViewModel<State>(initialState: State) : ViewModel() {
|
||||
.subscribe { newState -> state.value = newState }
|
||||
}
|
||||
|
||||
fun bindIntents() {}
|
||||
|
||||
protected fun newState(reducer: (State) -> State) {
|
||||
stateReducer.onNext(reducer)
|
||||
}
|
||||
|
||||
+19
-15
@@ -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<ConversationListViewState> {
|
||||
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<ConversationListViewStat
|
||||
|
||||
override fun onNewIntent(intent: Intent?) {
|
||||
super.onNewIntent(intent)
|
||||
intent?.getLongExtra("threadId", 0)?.takeIf { threadId -> 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() {
|
||||
+4
-7
@@ -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<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
|
||||
class ConversationsAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(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<Message>?) : 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()
|
||||
+1
-1
@@ -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<Message>? = null,
|
||||
val refreshing: Boolean = false
|
||||
)
|
||||
@@ -0,0 +1,5 @@
|
||||
package com.moez.QKSMS.presentation.conversations
|
||||
|
||||
import com.moez.QKSMS.presentation.base.QkView
|
||||
|
||||
interface ConversationsView : QkView<ConversationsState>
|
||||
+1
-1
@@ -9,7 +9,7 @@ import com.moez.QKSMS.presentation.base.QkViewModel
|
||||
import io.realm.RealmResults
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationListViewModel : QkViewModel<ConversationListViewState>(ConversationListViewState()) {
|
||||
class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState>(ConversationsState()) {
|
||||
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
@Inject lateinit var syncConversations: SyncConversations
|
||||
+17
-18
@@ -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<MessageListViewState> {
|
||||
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<MessageListViewState> {
|
||||
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<MessageListViewState> {
|
||||
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<Message>): MessageAdapter {
|
||||
val adapter = MessageAdapter(messages)
|
||||
private fun createAdapter(messages: RealmResults<Message>): MessagesAdapter {
|
||||
val adapter = MessagesAdapter(messages)
|
||||
adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
|
||||
super.onItemRangeInserted(positionStart, itemCount)
|
||||
+1
-1
@@ -22,7 +22,7 @@ import timber.log.Timber
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
|
||||
class MessagesAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
|
||||
|
||||
companion object {
|
||||
private val VIEWTYPE_ME = -1
|
||||
+1
-1
@@ -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<Message>? = null,
|
||||
val draft: String = "",
|
||||
@@ -0,0 +1,5 @@
|
||||
package com.moez.QKSMS.presentation.messages
|
||||
|
||||
import com.moez.QKSMS.presentation.base.QkView
|
||||
|
||||
interface MessagesView : QkView<MessagesState>
|
||||
+5
-14
@@ -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>(MessageListViewState()) {
|
||||
class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, MessagesState>(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<MessageListViewState>(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<MessageListViewState>(MessageListViewSt
|
||||
super.onCleared()
|
||||
sendMessage.dispose()
|
||||
markRead.dispose()
|
||||
conversation?.removeAllChangeListeners()
|
||||
conversation.removeAllChangeListeners()
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user