diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index 147f5236..0115410f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.ui.conversations import android.Manifest +import android.arch.lifecycle.Observer import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v7.widget.LinearLayoutManager @@ -11,27 +12,33 @@ import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkActivity +import com.moez.QKSMS.util.observe import kotlinx.android.synthetic.main.conversation_list_activity.* import timber.log.Timber -class ConversationListActivity : QkActivity() { +class ConversationListActivity : QkActivity(), Observer { - lateinit var viewModel: ConversationListViewModel + private lateinit var viewModel: ConversationListViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.conversation_list_activity) + requestPermissions() viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java] + viewModel.state.observe(this) conversationList.layoutManager = LinearLayoutManager(this) - conversationList.adapter = ConversationAdapter(this, viewModel.conversations) - swipeRefresh.setOnRefreshListener { - viewModel.onRefresh { swipeRefresh.isRefreshing = false } + swipeRefresh.setOnRefreshListener { viewModel.onRefresh() } + } + + override fun onChanged(state: ConversationListViewState?) { + state?.let { + if (conversationList.adapter == null) conversationList.adapter = ConversationAdapter(this, state.conversations) + + swipeRefresh.isRefreshing = state.refreshing } - - requestPermissions() } private fun requestPermissions() { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt index fbfdd88c..2b7b52fa 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt @@ -1,10 +1,12 @@ package com.moez.QKSMS.ui.conversations +import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.ViewModel import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.sync.SyncManager +import io.reactivex.subjects.PublishSubject import io.realm.RealmResults import javax.inject.Inject @@ -13,21 +15,25 @@ class ConversationListViewModel : ViewModel() { @Inject lateinit var syncManager: SyncManager @Inject lateinit var conversationRepo: ConversationRepository - val conversations: RealmResults + val state: MutableLiveData = MutableLiveData() + + private val partialStates: PublishSubject = PublishSubject.create() + private val conversations: RealmResults init { AppComponentManager.appComponent.inject(this) + partialStates + .scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) }) + .subscribe { newState -> state.value = newState } + conversations = conversationRepo.getConversations() + partialStates.onNext(PartialState.ConversationsLoaded(conversations)) } - fun onRefresh(completionListener: () -> Unit) { - syncManager.copyToRealm(completionListener::invoke) - } - - override fun onCleared() { - super.onCleared() - conversations.removeAllChangeListeners() + fun onRefresh() { + partialStates.onNext(PartialState.Refreshing(true)) + syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt new file mode 100644 index 00000000..9da92b7c --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt @@ -0,0 +1,27 @@ +package com.moez.QKSMS.ui.conversations + +import com.moez.QKSMS.data.model.Conversation +import io.realm.OrderedRealmCollection + +data class ConversationListViewState( + val conversations: OrderedRealmCollection? = null, + val refreshing: Boolean = false +) + +sealed class PartialState { + + abstract fun reduce(previousState: ConversationListViewState): ConversationListViewState + + data class ConversationsLoaded(val conversations: OrderedRealmCollection) : PartialState() { + override fun reduce(previousState: ConversationListViewState): ConversationListViewState { + return previousState.copy(conversations = conversations) + } + } + + data class Refreshing(val refreshing: Boolean) : PartialState (){ + override fun reduce(previousState: ConversationListViewState): ConversationListViewState { + return previousState.copy(refreshing = refreshing) + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index 6c98be51..3859a58c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.message_list_activity.* class MessageListActivity : QkActivity(), Observer { - lateinit var viewModel: MessageListViewModel + private lateinit var viewModel: MessageListViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState)