From f7aba7c5bdf6cf3ce03d3b323dc1202ee16f859d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 28 Aug 2017 15:45:41 -0700 Subject: [PATCH] correctly bind actionbar in messagelist activity --- .../main/java/com/moez/QKSMS/dagger/AppComponent.kt | 2 ++ .../java/com/moez/QKSMS/dagger/MessagesModule.kt | 5 +++-- .../java/com/moez/QKSMS/data/model/Conversation.kt | 12 ++++++++++++ .../QKSMS/data/repository/ConversationRepository.kt | 7 +++++++ .../main/java/com/moez/QKSMS/ui/base/QkActivity.kt | 11 +++++++++++ .../QKSMS/ui/conversations/ConversationAdapter.kt | 10 +--------- .../moez/QKSMS/ui/messages/MessageListActivity.kt | 1 + .../moez/QKSMS/ui/messages/MessageListFragment.kt | 7 +++++++ .../moez/QKSMS/ui/messages/MessageListViewModel.kt | 10 +++++++++- 9 files changed, 53 insertions(+), 12 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt index 952e49b7..e25d23ea 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.dagger import android.content.Context +import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.ui.conversations.ConversationListFragment import dagger.Component import javax.inject.Singleton @@ -12,5 +13,6 @@ interface AppComponent { fun inject(fragment: ConversationListFragment) fun provideContext(): Context + fun provideConversationRepository(): ConversationRepository } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt index d37e3288..84b3a678 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt @@ -1,5 +1,6 @@ package com.moez.QKSMS.dagger +import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.ui.messages.MessageListViewModel import dagger.Module @@ -23,8 +24,8 @@ class MessagesModule(val threadId: Long) { @ActivityScope @Provides - fun provideViewModel(repository: MessageRepository): MessageListViewModel { - return MessageListViewModel(threadId, repository) + fun provideViewModel(conversations: ConversationRepository, repository: MessageRepository): MessageListViewModel { + return MessageListViewModel(threadId, conversations, repository) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt index 2ce6ee89..31a2f94d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt @@ -40,4 +40,16 @@ open class Conversation() : RealmObject() { error = cursor.getInt(ConversationColumns.ERROR) hasAttachment = cursor.getInt(ConversationColumns.HAS_ATTACHMENT) } + + fun getTitle(): String { + var title = "" + contacts.forEachIndexed { index, recipient -> + title += recipient.address + if (index < contacts.size - 1) { + title += ", " + } + } + + return title + } } 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 index ae895cbb..0ada43ad 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt @@ -6,6 +6,13 @@ import io.realm.RealmResults class ConversationRepository { + fun getConversation(threadId: Long): RealmResults { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("id", threadId) + .findAllAsync() + } + fun getConversations(): RealmResults { return Realm.getDefaultInstance().where(Conversation::class.java).findAllAsync() } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt index d11a5aa0..4cb16720 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.ui.base import android.support.v7.app.AppCompatActivity +import android.view.MenuItem import com.moez.QKSMS.QKApplication import com.moez.QKSMS.dagger.AppComponent @@ -10,4 +11,14 @@ abstract class QkActivity : AppCompatActivity() { return (application as QKApplication).appComponent } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when(item.itemId) { + android.R.id.home -> { + onBackPressed() + true + } + else -> super.onOptionsItemSelected(item) + } + } + } \ No newline at end of file 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 256b8e8f..2a80765a 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 @@ -30,15 +30,7 @@ class ConversationAdapter(context: Context, data: OrderedRealmCollection - title += recipient.address - if (index < conversation.contacts.size - 1) { - title += ", " - } - } - - viewHolder.title.text = title + viewHolder.title.text = conversation?.getTitle() viewHolder.snippet.text = conversation?.snippet } } \ 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 f4474ebe..19548330 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 @@ -11,6 +11,7 @@ class MessageListActivity : QkActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.base_activity) + supportActionBar?.setDisplayHomeAsUpEnabled(true) val threadId = intent.getLongExtra("thread_id", 0) 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 430d9704..b23bab21 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 @@ -15,6 +15,13 @@ class MessageListFragment : QkFragment() { override fun provideLayoutRes(): Int = R.layout.message_list_fragment override fun provideMenuRes(): Int = R.menu.messages + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + viewModel.conversation.addChangeListener { realmResults -> + context.title = realmResults[0]?.getTitle() + } + } + override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { val layoutManager = LinearLayoutManager(context) layoutManager.stackFromEnd = true 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 index 7d6abb2b..c98b35de 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt @@ -2,11 +2,19 @@ package com.moez.QKSMS.ui.messages import android.arch.lifecycle.ViewModel import com.moez.QKSMS.data.model.Message +import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.repository.MessageRepository import io.realm.RealmResults -class MessageListViewModel(val threadId: Long, repository: MessageRepository) : ViewModel() { +class MessageListViewModel(val threadId: Long, conversations: ConversationRepository, repository: MessageRepository) : ViewModel() { + val conversation = conversations.getConversation(threadId) val messages: RealmResults = repository.getMessages() + override fun onCleared() { + super.onCleared() + conversation.removeAllChangeListeners() + messages.removeAllChangeListeners() + } + } \ No newline at end of file