migrate messagelist to fragment, use mvp

This commit is contained in:
Moez Bhatti
2017-07-31 21:08:27 -04:00
parent c5c07ef4d0
commit afe8f08065
13 changed files with 129 additions and 37 deletions
@@ -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()
}
}
@@ -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, ConversationPresenter>(), ConversationView {
class ConversationListFragment : QkFragment<ConversationListView, ConversationListPresenter>(), ConversationListView {
var conversationList: RecyclerView? = null
@@ -20,7 +20,7 @@ class ConversationListFragment : QkFragment<ConversationView, ConversationPresen
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val view = inflater.inflate(R.layout.conversations_fragment, container, false)
val view = inflater.inflate(R.layout.conversation_list_fragment, container, false)
conversationList = view.findViewById(R.id.conversation_list) as RecyclerView
conversationList?.layoutManager = LinearLayoutManager(context)
@@ -28,7 +28,7 @@ class ConversationListFragment : QkFragment<ConversationView, ConversationPresen
return view
}
override fun createPresenter(): ConversationPresenter = ConversationPresenter()
override fun createPresenter(): ConversationListPresenter = ConversationListPresenter()
override fun setConversations(conversations: RealmResults<Conversation>) {
conversationList?.adapter = ConversationAdapter(context, conversations)
@@ -4,20 +4,15 @@ import com.hannesdorfmann.mosby.mvp.MvpBasePresenter
import com.moez.QKSMS.model.Conversation
import io.realm.Realm
class ConversationPresenter : MvpBasePresenter<ConversationView>() {
class ConversationListPresenter : MvpBasePresenter<ConversationListView>() {
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)
}
}
@@ -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<Conversation>)
@@ -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()
}
}
@@ -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, MessageListPresenter>(), 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<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) {
R.id.load_messages -> { // TODO: This is for testing, remove this
MessageSyncManager.copyToRealm(context, threadId)
return true
}
else -> return super.onOptionsItemSelected(item)
}
}
}
@@ -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<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)
.findAll()
view?.setMessages(realmResults)
}
}
@@ -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<Message>)
}
+1 -1
View File
@@ -4,7 +4,7 @@
<item
android:id="@+id/load_conversations"
android:title="Load conversations"
android:title="Sync conversations"
tools:ignore="HardcodedText" />
</menu>
+1 -1
View File
@@ -4,7 +4,7 @@
<item
android:id="@+id/load_messages"
android:title="Load messages"
android:title="Sync messages"
tools:ignore="HardcodedText" />
</menu>