From a7222a220facc023df985a5ea98e76d4a0566d67 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 27 Aug 2017 17:58:50 -0700 Subject: [PATCH] migrate from mosby mvp to viewmodel + repository --- qksms/build.gradle | 7 +++-- .../QKSMS/{ => data}/model/Conversation.kt | 2 +- .../moez/QKSMS/{ => data}/model/Message.kt | 2 +- .../moez/QKSMS/{ => data}/model/Recipient.kt | 2 +- .../data/repository/ConversationRepository.kt | 13 ++++++++ .../data/repository/MessageRepository.kt | 16 ++++++++++ .../com/moez/QKSMS/data/sync/SyncManager.kt | 4 +-- .../java/com/moez/QKSMS/ui/base/QkFragment.kt | 6 ++-- .../ui/conversations/ConversationAdapter.kt | 4 +-- .../conversations/ConversationListFragment.kt | 24 +++++++-------- .../ConversationListPresenter.kt | 18 ----------- .../ui/conversations/ConversationListView.kt | 11 ------- .../ConversationListViewModel.kt | 12 ++++++++ .../moez/QKSMS/ui/messages/MessageAdapter.kt | 2 +- .../QKSMS/ui/messages/MessageListFragment.kt | 30 +++++-------------- .../QKSMS/ui/messages/MessageListPresenter.kt | 25 ---------------- .../moez/QKSMS/ui/messages/MessageListView.kt | 11 ------- .../QKSMS/ui/messages/MessageListViewModel.kt | 14 +++++++++ 18 files changed, 87 insertions(+), 116 deletions(-) rename qksms/src/main/java/com/moez/QKSMS/{ => data}/model/Conversation.kt (97%) rename qksms/src/main/java/com/moez/QKSMS/{ => data}/model/Message.kt (98%) rename qksms/src/main/java/com/moez/QKSMS/{ => data}/model/Recipient.kt (89%) create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListView.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt diff --git a/qksms/build.gradle b/qksms/build.gradle index dad7d6ef..08a7671e 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -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' } diff --git a/qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt rename to qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt index 8498bbef..ef524946 100644 --- a/qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/model/Message.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt similarity index 98% rename from qksms/src/main/java/com/moez/QKSMS/model/Message.kt rename to qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt index 3a81f77e..9409aaf8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.model +package com.moez.QKSMS.data.model import android.database.Cursor import android.provider.Telephony diff --git a/qksms/src/main/java/com/moez/QKSMS/model/Recipient.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt similarity index 89% rename from qksms/src/main/java/com/moez/QKSMS/model/Recipient.kt rename to qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt index ae7fde2e..6b526ec5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/model/Recipient.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.model +package com.moez.QKSMS.data.model import io.realm.RealmObject import io.realm.annotations.PrimaryKey diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt new file mode 100644 index 00000000..ae895cbb --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt @@ -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 { + return Realm.getDefaultInstance().where(Conversation::class.java).findAllAsync() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt new file mode 100644 index 00000000..b18c3a1d --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -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 { + return Realm.getDefaultInstance() + .where(Message::class.java) + .equalTo("threadId", threadId) + .findAllSortedAsync("date") + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index a6e693b2..92595b46 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt index cf437e3e..38a9f6a5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt @@ -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> : MvpFragment() { +abstract class QkFragment : LifecycleFragment() { override fun getContext(): QkActivity { return super.getContext() as QkActivity diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt index cdc6a43e..e4889ba1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt @@ -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) : +class ConversationAdapter(context: Context, data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(context, data, true) { val mContext = context diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt index 89a6a491..e3f570f4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt @@ -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 { +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) { - 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) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt deleted file mode 100644 index 26e1f634..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt +++ /dev/null @@ -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() { - - override fun attachView(view: ConversationListView) { - super.attachView(view) - - val realm = Realm.getDefaultInstance() - val realmResults = realm.where(Conversation::class.java).findAll() - - view.setConversations(realmResults) - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt deleted file mode 100644 index ee71d6e8..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt +++ /dev/null @@ -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) - -} \ No newline at end of file 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 new file mode 100644 index 00000000..f66cea04 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt @@ -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() + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index af180415..df2c0a95 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt index 6fe4b027..a856d76b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt @@ -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 { +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(), 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(), 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) { - 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) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt deleted file mode 100644 index f6576f8a..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt +++ /dev/null @@ -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() { - - 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) - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListView.kt deleted file mode 100644 index af1688e3..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListView.kt +++ /dev/null @@ -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) - -} diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt new file mode 100644 index 00000000..b7571866 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt @@ -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 = repository.getMessages() + +} \ No newline at end of file