migrate from mosby mvp to viewmodel + repository

This commit is contained in:
Moez Bhatti
2017-08-27 17:58:50 -07:00
parent edba4eadbe
commit a7222a220f
18 changed files with 87 additions and 116 deletions
+4 -3
View File
@@ -33,17 +33,18 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "android.arch.lifecycle:extensions:1.0.0-alpha9"
compile "android.arch.lifecycle:runtime:1.0.0-alpha9"
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.bugsnag:bugsnag-android:3.9.0'
compile 'com.karumi:dexter:4.1.0'
compile 'com.hannesdorfmann.mosby:mvp:2.0.1'
compile 'com.hannesdorfmann.mosby:viewstate:2.0.1'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile "io.reactivex.rxjava2:rxjava:2.1.0"
compile 'io.reactivex.rxjava2:rxkotlin:2.0.3'
compile 'io.realm:android-adapters:1.3.0'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
kapt "android.arch.lifecycle:compiler:1.0.0-alpha9"
kapt 'io.realm:realm-annotations:3.3.1'
kapt 'io.realm:realm-annotations-processor:3.3.1'
}
@@ -1,4 +1,4 @@
package com.moez.QKSMS.model
package com.moez.QKSMS.data.model
import android.database.Cursor
import com.moez.QKSMS.data.sync.ConversationColumns
@@ -1,4 +1,4 @@
package com.moez.QKSMS.model
package com.moez.QKSMS.data.model
import android.database.Cursor
import android.provider.Telephony
@@ -1,4 +1,4 @@
package com.moez.QKSMS.model
package com.moez.QKSMS.data.model
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
@@ -0,0 +1,13 @@
package com.moez.QKSMS.data.repository
import com.moez.QKSMS.data.model.Conversation
import io.realm.Realm
import io.realm.RealmResults
class ConversationRepository {
fun getConversations(): RealmResults<Conversation> {
return Realm.getDefaultInstance().where(Conversation::class.java).findAllAsync()
}
}
@@ -0,0 +1,16 @@
package com.moez.QKSMS.data.repository
import com.moez.QKSMS.data.model.Message
import io.realm.Realm
import io.realm.RealmResults
class MessageRepository(val threadId: Long) {
fun getMessages(): RealmResults<Message> {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
.findAllSortedAsync("date")
}
}
@@ -2,8 +2,8 @@ package com.moez.QKSMS.data.sync
import android.content.Context
import android.net.Uri
import com.moez.QKSMS.model.Conversation
import com.moez.QKSMS.model.Message
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.util.asFlowable
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -1,10 +1,8 @@
package com.moez.QKSMS.ui.base
import com.hannesdorfmann.mosby.mvp.MvpFragment
import com.hannesdorfmann.mosby.mvp.MvpPresenter
import com.hannesdorfmann.mosby.mvp.MvpView
import android.arch.lifecycle.LifecycleFragment
abstract class QkFragment<V : MvpView, P : MvpPresenter<V>> : MvpFragment<V, P>() {
abstract class QkFragment : LifecycleFragment() {
override fun getContext(): QkActivity {
return super.getContext() as QkActivity
@@ -5,12 +5,12 @@ import android.content.Intent
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
import com.moez.QKSMS.model.Conversation
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.ui.messages.MessageListActivity
import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter
class ConversationAdapter(context: Context, data: OrderedRealmCollection<Conversation>) :
class ConversationAdapter(context: Context, data: OrderedRealmCollection<Conversation>?) :
RealmRecyclerViewAdapter<Conversation, ConversationViewHolder>(context, data, true) {
val mContext = context
@@ -7,18 +7,19 @@ import android.view.*
import android.widget.ProgressBar
import com.moez.QKSMS.R
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.model.Conversation
import com.moez.QKSMS.ui.base.QkFragment
import io.realm.RealmResults
class ConversationListFragment : QkFragment<ConversationListView, ConversationListPresenter>(), ConversationListView {
class ConversationListFragment : QkFragment() {
var progress: ProgressBar? = null
var conversationList: RecyclerView? = null
private var progress: ProgressBar? = null
private var conversationList: RecyclerView? = null
private var viewModel: ConversationListViewModel? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setHasOptionsMenu(true)
viewModel = ConversationListViewModel()
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -28,32 +29,27 @@ class ConversationListFragment : QkFragment<ConversationListView, ConversationLi
conversationList = view.findViewById(R.id.conversation_list)
conversationList?.layoutManager = LinearLayoutManager(context)
conversationList?.adapter = ConversationAdapter(context, viewModel?.conversations)
return view
}
override fun createPresenter(): ConversationListPresenter = ConversationListPresenter()
override fun setConversations(conversations: RealmResults<Conversation>) {
conversationList?.adapter = ConversationAdapter(context, conversations)
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.conversations, menu)
super.onCreateOptionsMenu(menu, inflater)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
return when (item.itemId) {
R.id.load_conversations -> { // TODO: This is for testing, remove this
progress?.visibility = View.VISIBLE
SyncManager.copyToRealm(context) {
progress?.visibility = View.GONE
}
return true
true
}
else -> return super.onOptionsItemSelected(item)
else -> super.onOptionsItemSelected(item)
}
}
@@ -1,18 +0,0 @@
package com.moez.QKSMS.ui.conversations
import com.hannesdorfmann.mosby.mvp.MvpBasePresenter
import com.moez.QKSMS.model.Conversation
import io.realm.Realm
class ConversationListPresenter : MvpBasePresenter<ConversationListView>() {
override fun attachView(view: ConversationListView) {
super.attachView(view)
val realm = Realm.getDefaultInstance()
val realmResults = realm.where(Conversation::class.java).findAll()
view.setConversations(realmResults)
}
}
@@ -1,11 +0,0 @@
package com.moez.QKSMS.ui.conversations
import com.hannesdorfmann.mosby.mvp.MvpView
import com.moez.QKSMS.model.Conversation
import io.realm.RealmResults
interface ConversationListView : MvpView {
fun setConversations(conversations: RealmResults<Conversation>)
}
@@ -0,0 +1,12 @@
package com.moez.QKSMS.ui.conversations
import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.data.repository.ConversationRepository
class ConversationListViewModel : ViewModel() {
private val repository = ConversationRepository()
var conversations = repository.getConversations()
}
@@ -5,7 +5,7 @@ import android.util.Log
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
import com.moez.QKSMS.model.Message
import com.moez.QKSMS.data.model.Message
import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter
@@ -5,14 +5,13 @@ import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.view.*
import com.moez.QKSMS.R
import com.moez.QKSMS.model.Message
import com.moez.QKSMS.ui.base.QkFragment
import io.realm.RealmResults
class MessageListFragment : QkFragment<MessageListView, MessageListPresenter>(), MessageListView {
class MessageListFragment : QkFragment() {
var threadId: Long = 0
var messageList: RecyclerView? = null
private var threadId: Long = 0
private var messageList: RecyclerView? = null
private var viewModel: MessageListViewModel? = null
companion object {
fun newInstance(threadId: Long): MessageListFragment {
@@ -31,7 +30,7 @@ class MessageListFragment : QkFragment<MessageListView, MessageListPresenter>(),
setHasOptionsMenu(true)
threadId = arguments.getLong("thread_id", 0)
presenter?.threadId = threadId
viewModel = MessageListViewModel(threadId)
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -42,32 +41,19 @@ class MessageListFragment : QkFragment<MessageListView, MessageListPresenter>(),
val layoutManager = LinearLayoutManager(context)
layoutManager.stackFromEnd = true
messageList?.layoutManager = layoutManager
messageList?.adapter = MessageAdapter(context, viewModel?.messages)
return view
}
override fun createPresenter(): MessageListPresenter {
val presenter = MessageListPresenter()
if (threadId != 0L) {
presenter.threadId = threadId
}
return presenter
}
override fun setMessages(messages: RealmResults<Message>) {
messageList?.adapter = MessageAdapter(context, messages)
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.messages, menu)
super.onCreateOptionsMenu(menu, inflater)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
else -> return super.onOptionsItemSelected(item)
return when (item.itemId) {
else -> super.onOptionsItemSelected(item)
}
}
@@ -1,25 +0,0 @@
package com.moez.QKSMS.ui.messages
import com.hannesdorfmann.mosby.mvp.MvpBasePresenter
import com.moez.QKSMS.model.Message
import io.realm.Realm
class MessageListPresenter : MvpBasePresenter<MessageListView>() {
var threadId: Long? = null
set(value) {
field = value
}
override fun attachView(view: MessageListView?) {
super.attachView(view)
val realmResults = Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
.findAllSorted("date")
view?.setMessages(realmResults)
}
}
@@ -1,11 +0,0 @@
package com.moez.QKSMS.ui.messages
import com.hannesdorfmann.mosby.mvp.MvpView
import com.moez.QKSMS.model.Message
import io.realm.RealmResults
interface MessageListView : MvpView {
fun setMessages(messages: RealmResults<Message>)
}
@@ -0,0 +1,14 @@
package com.moez.QKSMS.ui.messages
import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import io.realm.RealmResults
class MessageListViewModel(threadId: Long) : ViewModel() {
private val repository = MessageRepository(threadId)
val messages: RealmResults<Message> = repository.getMessages()
}