From afe8f0806565769c20a955973136b60a4d4d3f77 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 31 Jul 2017 21:08:27 -0400 Subject: [PATCH] migrate messagelist to fragment, use mvp --- .../main/java/com/moez/QKSMS/MainActivity.kt | 4 +- .../conversations/ConversationListFragment.kt | 6 +- ...senter.kt => ConversationListPresenter.kt} | 11 +-- ...rsationView.kt => ConversationListView.kt} | 2 +- .../QKSMS/ui/messages/MessageListActivity.kt | 23 +----- .../QKSMS/ui/messages/MessageListFragment.kt | 80 +++++++++++++++++++ .../QKSMS/ui/messages/MessageListPresenter.kt | 25 ++++++ .../moez/QKSMS/ui/messages/MessageListView.kt | 11 +++ .../{activity_main.xml => base_activity.xml} | 0 ...ent.xml => conversation_list_fragment.xml} | 0 ...fragment.xml => message_list_fragment.xml} | 0 qksms/src/main/res/menu/conversations.xml | 2 +- qksms/src/main/res/menu/messages.xml | 2 +- 13 files changed, 129 insertions(+), 37 deletions(-) rename qksms/src/main/java/com/moez/QKSMS/ui/conversations/{ConversationPresenter.kt => ConversationListPresenter.kt} (57%) rename qksms/src/main/java/com/moez/QKSMS/ui/conversations/{ConversationView.kt => ConversationListView.kt} (84%) create mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListView.kt rename qksms/src/main/res/layout/{activity_main.xml => base_activity.xml} (100%) rename qksms/src/main/res/layout/{conversations_fragment.xml => conversation_list_fragment.xml} (100%) rename qksms/src/main/res/layout/{messages_fragment.xml => message_list_fragment.xml} (100%) diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt index a9705fcb..a410a188 100644 --- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt @@ -17,7 +17,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.base_activity) Dexter.withActivity(this) .withPermission(Manifest.permission.READ_SMS) @@ -35,6 +35,6 @@ class MainActivity : AppCompatActivity() { }) .check() - supportFragmentManager.beginTransaction().add(R.id.content_frame, ConversationListFragment()).commit() + supportFragmentManager.beginTransaction().replace(R.id.content_frame, ConversationListFragment()).commit() } } 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 35fc27c8..c9b0b355 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 @@ -10,7 +10,7 @@ import com.moez.QKSMS.model.Conversation import com.moez.QKSMS.ui.base.QkFragment import io.realm.RealmResults -class ConversationListFragment : QkFragment(), ConversationView { +class ConversationListFragment : QkFragment(), ConversationListView { var conversationList: RecyclerView? = null @@ -20,7 +20,7 @@ class ConversationListFragment : QkFragment) { conversationList?.adapter = ConversationAdapter(context, conversations) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationPresenter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt similarity index 57% rename from qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationPresenter.kt rename to qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt index 3c35fca3..26e1f634 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationPresenter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListPresenter.kt @@ -4,20 +4,15 @@ import com.hannesdorfmann.mosby.mvp.MvpBasePresenter import com.moez.QKSMS.model.Conversation import io.realm.Realm -class ConversationPresenter : MvpBasePresenter() { +class ConversationListPresenter : MvpBasePresenter() { - override fun attachView(view: ConversationView?) { + override fun attachView(view: ConversationListView) { super.attachView(view) - loadConversations() - } - - fun loadConversations() { val realm = Realm.getDefaultInstance() val realmResults = realm.where(Conversation::class.java).findAll() - view?.setConversations(realmResults) + view.setConversations(realmResults) } - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt similarity index 84% rename from qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationView.kt rename to qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt index e32e37e4..ee71d6e8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListView.kt @@ -4,7 +4,7 @@ import com.hannesdorfmann.mosby.mvp.MvpView import com.moez.QKSMS.model.Conversation import io.realm.RealmResults -interface ConversationView : MvpView { +interface ConversationListView : MvpView { fun setConversations(conversations: RealmResults) 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 25f36a6a..1ffae5c7 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 @@ -2,35 +2,16 @@ package com.moez.QKSMS.ui.messages import android.os.Bundle import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import com.moez.QKSMS.R -import com.moez.QKSMS.data.sync.MessageSyncManager -import com.moez.QKSMS.model.Message -import io.realm.Realm class MessageListActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.messages_fragment) + setContentView(R.layout.base_activity) val threadId = intent.getLongExtra("thread_id", 0) - - MessageSyncManager.copyToRealm(this, threadId) - - val realmResults = Realm.getDefaultInstance() - .where(Message::class.java) - .equalTo("threadId", threadId) - .findAll() - - - val layoutManager = LinearLayoutManager(this) - layoutManager.stackFromEnd = true - - val messages = findViewById(R.id.message_list) as RecyclerView - messages.layoutManager = layoutManager - messages.adapter = MessageAdapter(this, realmResults) + supportFragmentManager.beginTransaction().replace(R.id.content_frame, MessageListFragment.newInstance(threadId)).commit() } } \ No newline at end of file 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 new file mode 100644 index 00000000..29571643 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt @@ -0,0 +1,80 @@ +package com.moez.QKSMS.ui.messages + +import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.* +import com.moez.QKSMS.R +import com.moez.QKSMS.data.sync.MessageSyncManager +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.ui.base.QkFragment +import io.realm.RealmResults + +class MessageListFragment : QkFragment(), MessageListView { + + var threadId: Long = 0 + var messageList: RecyclerView? = null + + companion object { + fun newInstance(threadId: Long): MessageListFragment { + val myFragment = MessageListFragment() + + val args = Bundle() + args.putLong("thread_id", threadId) + myFragment.arguments = args + + return myFragment + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(true) + + threadId = arguments.getLong("thread_id", 0) + presenter?.threadId = threadId + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { + val view = inflater.inflate(R.layout.message_list_fragment, container, false) + + messageList = view.findViewById(R.id.message_list) as RecyclerView + + val layoutManager = LinearLayoutManager(context) + layoutManager.stackFromEnd = true + messageList?.layoutManager = layoutManager + + 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) { + R.id.load_messages -> { // TODO: This is for testing, remove this + MessageSyncManager.copyToRealm(context, threadId) + return true + } + + else -> return super.onOptionsItemSelected(item) + } + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..3e84f3b5 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt @@ -0,0 +1,25 @@ +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) + .findAll() + + 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 new file mode 100644 index 00000000..af1688e3 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListView.kt @@ -0,0 +1,11 @@ +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/res/layout/activity_main.xml b/qksms/src/main/res/layout/base_activity.xml similarity index 100% rename from qksms/src/main/res/layout/activity_main.xml rename to qksms/src/main/res/layout/base_activity.xml diff --git a/qksms/src/main/res/layout/conversations_fragment.xml b/qksms/src/main/res/layout/conversation_list_fragment.xml similarity index 100% rename from qksms/src/main/res/layout/conversations_fragment.xml rename to qksms/src/main/res/layout/conversation_list_fragment.xml diff --git a/qksms/src/main/res/layout/messages_fragment.xml b/qksms/src/main/res/layout/message_list_fragment.xml similarity index 100% rename from qksms/src/main/res/layout/messages_fragment.xml rename to qksms/src/main/res/layout/message_list_fragment.xml diff --git a/qksms/src/main/res/menu/conversations.xml b/qksms/src/main/res/menu/conversations.xml index 019069da..6d44e238 100644 --- a/qksms/src/main/res/menu/conversations.xml +++ b/qksms/src/main/res/menu/conversations.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/qksms/src/main/res/menu/messages.xml b/qksms/src/main/res/menu/messages.xml index ef64a0a5..597d3e9b 100644 --- a/qksms/src/main/res/menu/messages.xml +++ b/qksms/src/main/res/menu/messages.xml @@ -4,7 +4,7 @@ \ No newline at end of file