forked from upstream-mirrors/quik
Create Navigator to allow custom ViewModel constructors
This commit is contained in:
+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
|
||||
Reference in New Issue
Block a user