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 6de0ea4d..3d830b9a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -1,22 +1,20 @@ package com.moez.QKSMS.dagger -import android.content.Context import com.moez.QKSMS.data.model.Message -import com.moez.QKSMS.data.repository.ConversationRepository -import com.moez.QKSMS.ui.conversations.ConversationListActivity +import com.moez.QKSMS.ui.conversations.ConversationListViewModel import com.moez.QKSMS.ui.messages.MessageAdapter +import com.moez.QKSMS.ui.messages.MessageListViewModel import dagger.Component import javax.inject.Singleton @Singleton -@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class)) +@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class, MessagesModule::class)) interface AppComponent { - fun inject(activity: ConversationListActivity) + fun inject(viewModel: ConversationListViewModel) + fun inject(viewModel: MessageListViewModel) + fun inject(message: Message) fun inject(adapter: MessageAdapter) - fun provideContext(): Context - fun provideConversationRepository(): ConversationRepository - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt index b9142b82..55fb76f0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt @@ -1,8 +1,6 @@ package com.moez.QKSMS.dagger import com.moez.QKSMS.data.repository.ConversationRepository -import com.moez.QKSMS.data.sync.SyncManager -import com.moez.QKSMS.ui.conversations.ConversationListViewModel import dagger.Module import dagger.Provides import javax.inject.Singleton @@ -16,10 +14,4 @@ class ConversationsModule { return ConversationRepository() } - @Provides - @Singleton - fun provideViewModel(syncManager: SyncManager, repository: ConversationRepository): ConversationListViewModel { - return ConversationListViewModel(syncManager, repository) - } - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt deleted file mode 100644 index c1b80de4..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.moez.QKSMS.dagger - -import com.moez.QKSMS.ui.messages.MessageListActivity -import dagger.Component - -@ActivityScope -@Component(dependencies = arrayOf(AppComponent::class), modules = arrayOf(MessagesModule::class)) -interface MessagesComponent { - - fun inject(activity: MessageListActivity) - -} \ 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 84b3a678..348f7587 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt @@ -1,31 +1,17 @@ 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 import dagger.Provides -import javax.inject.Named +import javax.inject.Singleton @Module -class MessagesModule(val threadId: Long) { +class MessagesModule { - @Provides - @Named("thread_id") - fun provideThreadId(): Long { - return threadId - } - - @ActivityScope + @Singleton @Provides fun provideRepository(): MessageRepository { - return MessageRepository(threadId) - } - - @ActivityScope - @Provides - fun provideViewModel(conversations: ConversationRepository, repository: MessageRepository): MessageListViewModel { - return MessageListViewModel(threadId, conversations, repository) + return MessageRepository() } } \ 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 index b18c3a1d..f134e6b3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -4,9 +4,9 @@ import com.moez.QKSMS.data.model.Message import io.realm.Realm import io.realm.RealmResults -class MessageRepository(val threadId: Long) { +class MessageRepository { - fun getMessages(): RealmResults { + fun getMessages(threadId: Long): RealmResults { return Realm.getDefaultInstance() .where(Message::class.java) .equalTo("threadId", threadId) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index 3f2f5496..b29b730d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.ui.conversations import android.Manifest +import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.util.Log @@ -10,20 +11,19 @@ import com.karumi.dexter.PermissionToken import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R -import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.ui.base.QkActivity import kotlinx.android.synthetic.main.conversation_list_activity.* -import javax.inject.Inject class ConversationListActivity : QkActivity() { val TAG = "MainActivity" - @Inject lateinit var viewModel: ConversationListViewModel + lateinit var viewModel: ConversationListViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.conversation_list_activity) - AppComponentManager.appComponent.inject(this) + + viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java] conversationList.layoutManager = LinearLayoutManager(this) conversationList.adapter = ConversationAdapter(this, viewModel.conversations) 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 index a1665694..fbfdd88c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt @@ -1,12 +1,25 @@ package com.moez.QKSMS.ui.conversations import android.arch.lifecycle.ViewModel +import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.ConversationRepository import com.moez.QKSMS.data.sync.SyncManager +import io.realm.RealmResults +import javax.inject.Inject -class ConversationListViewModel(val syncManager: SyncManager, repository: ConversationRepository) : ViewModel() { +class ConversationListViewModel : ViewModel() { - val conversations = repository.getConversations() + @Inject lateinit var syncManager: SyncManager + @Inject lateinit var conversationRepo: ConversationRepository + + val conversations: RealmResults + + init { + AppComponentManager.appComponent.inject(this) + + conversations = conversationRepo.getConversations() + } fun onRefresh(completionListener: () -> Unit) { syncManager.copyToRealm(completionListener::invoke) 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 2bd59fa6..54d032cc 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 @@ -1,32 +1,25 @@ package com.moez.QKSMS.ui.messages import android.arch.lifecycle.Observer +import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import com.moez.QKSMS.R -import com.moez.QKSMS.dagger.AppComponentManager -import com.moez.QKSMS.dagger.DaggerMessagesComponent -import com.moez.QKSMS.dagger.MessagesModule import com.moez.QKSMS.ui.base.QkActivity import com.moez.QKSMS.util.observe import kotlinx.android.synthetic.main.message_list_activity.* -import javax.inject.Inject class MessageListActivity : QkActivity(), Observer { - @Inject lateinit var viewModel: MessageListViewModel + lateinit var viewModel: MessageListViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.message_list_activity) supportActionBar?.setDisplayHomeAsUpEnabled(true) - val threadId = intent.getLongExtra("thread_id", 0) - DaggerMessagesComponent.builder() - .appComponent(AppComponentManager.appComponent) - .messagesModule(MessagesModule(threadId)) - .build() - .inject(this) + viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java] + viewModel.setThreadId(intent.getLongExtra("thread_id", 0)) val layoutManager = LinearLayoutManager(this) 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 d549ea8e..0130966b 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,33 +2,51 @@ package com.moez.QKSMS.ui.messages import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.ViewModel +import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.data.model.Conversation 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 +import javax.inject.Inject -class MessageListViewModel(val threadId: Long, conversations: ConversationRepository, repository: MessageRepository) : ViewModel() { +class MessageListViewModel : ViewModel() { + + @Inject lateinit var conversationRepo: ConversationRepository + @Inject lateinit var messageRepo: MessageRepository val state: MutableLiveData = MutableLiveData() - private val conversation = conversations.getConversation(threadId) - private val messages: RealmResults = repository.getMessages() + private var conversation: RealmResults? = null + private var messages: RealmResults? = null init { - state.value = MessageListViewState.MessagesLoaded(messages) + AppComponentManager.appComponent.inject(this) + } - conversation.addChangeListener { realmResults -> - when (realmResults.size) { - 0 -> state.value = MessageListViewState.ConversationError(0) - else -> state.value = MessageListViewState.ConversationLoaded(realmResults[0]) + fun setThreadId(threadId: Long) { + onCleared() + + messageRepo.getMessages(threadId).let { + messages = it + state.value = MessageListViewState.MessagesLoaded(messages!!) + } + + conversationRepo.getConversation(threadId).let { + conversation = it + it.addChangeListener { realmResults -> + when (realmResults.size) { + 0 -> state.value = MessageListViewState.ConversationError(0) + else -> state.value = MessageListViewState.ConversationLoaded(realmResults[0]) + } } } } override fun onCleared() { super.onCleared() - conversation.removeAllChangeListeners() - messages.removeAllChangeListeners() + conversation?.removeAllChangeListeners() + messages?.removeAllChangeListeners() } } \ No newline at end of file