diff --git a/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt b/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt index 3d2ff34b..5723544a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt +++ b/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt @@ -4,7 +4,7 @@ import android.app.Application import com.bugsnag.android.Bugsnag import com.moez.QKSMS.dagger.AppComponent import com.moez.QKSMS.dagger.AppModule -import com.moez.QKSMS.dagger.ConversationModule +import com.moez.QKSMS.dagger.ConversationsModule import com.moez.QKSMS.dagger.DaggerAppComponent import io.realm.Realm import io.realm.RealmConfiguration @@ -27,7 +27,7 @@ class QKApplication : Application() { appComponent = DaggerAppComponent.builder() .appModule(AppModule(this)) - .conversationModule(ConversationModule()) + .conversationsModule(ConversationsModule()) .build() } diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt new file mode 100644 index 00000000..f3bfa585 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt @@ -0,0 +1,6 @@ +package com.moez.QKSMS.dagger + +import javax.inject.Scope + +@Scope +annotation class ActivityScope \ No newline at end of file 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 0a0285a9..15912b2a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -1,13 +1,16 @@ package com.moez.QKSMS.dagger +import android.content.Context import com.moez.QKSMS.ui.conversations.ConversationListFragment import dagger.Component import javax.inject.Singleton @Singleton -@Component(modules = arrayOf(AppModule::class, ConversationModule::class)) +@Component(modules = arrayOf(AppModule::class, ConversationsModule::class)) interface AppComponent { fun inject(fragment: ConversationListFragment) + fun provideContext(): Context + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt similarity index 95% rename from qksms/src/main/java/com/moez/QKSMS/dagger/ConversationModule.kt rename to qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt index 7eca1cd3..d65286f7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt @@ -7,7 +7,7 @@ import dagger.Provides import javax.inject.Singleton @Module -class ConversationModule { +class ConversationsModule { @Provides @Singleton diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt new file mode 100644 index 00000000..6da6d897 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt @@ -0,0 +1,12 @@ +package com.moez.QKSMS.dagger + +import com.moez.QKSMS.ui.messages.MessageListFragment +import dagger.Component + +@ActivityScope +@Component(dependencies = arrayOf(AppComponent::class), modules = arrayOf(MessagesModule::class)) +interface MessagesComponent { + + fun inject(fragment: MessageListFragment) + +} \ 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 new file mode 100644 index 00000000..d37e3288 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt @@ -0,0 +1,30 @@ +package com.moez.QKSMS.dagger + +import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.ui.messages.MessageListViewModel +import dagger.Module +import dagger.Provides +import javax.inject.Named + +@Module +class MessagesModule(val threadId: Long) { + + @Provides + @Named("thread_id") + fun provideThreadId(): Long { + return threadId + } + + @ActivityScope + @Provides + fun provideRepository(): MessageRepository { + return MessageRepository(threadId) + } + + @ActivityScope + @Provides + fun provideViewModel(repository: MessageRepository): MessageListViewModel { + return MessageListViewModel(threadId, repository) + } + +} \ No newline at end of file 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 59c79374..d11a5aa0 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,5 +1,13 @@ package com.moez.QKSMS.ui.base import android.support.v7.app.AppCompatActivity +import com.moez.QKSMS.QKApplication +import com.moez.QKSMS.dagger.AppComponent -abstract class QkActivity : AppCompatActivity() +abstract class QkActivity : AppCompatActivity() { + + fun getAppComponent(): AppComponent? { + return (application as QKApplication).appComponent + } + +} \ 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 62bde82c..76c383c0 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,6 +2,8 @@ package com.moez.QKSMS.ui.messages import android.os.Bundle import com.moez.QKSMS.R +import com.moez.QKSMS.dagger.DaggerMessagesComponent +import com.moez.QKSMS.dagger.MessagesModule import com.moez.QKSMS.ui.base.QkActivity class MessageListActivity : QkActivity() { @@ -11,7 +13,16 @@ class MessageListActivity : QkActivity() { setContentView(R.layout.base_activity) val threadId = intent.getLongExtra("thread_id", 0) - supportFragmentManager.beginTransaction().replace(R.id.content_frame, MessageListFragment.newInstance(threadId)).commit() + + val messagesComponent = DaggerMessagesComponent.builder() + .appComponent(getAppComponent()) + .messagesModule(MessagesModule(threadId)) + .build() + + val fragment = MessageListFragment() + messagesComponent.inject(fragment) + + supportFragmentManager.beginTransaction().replace(R.id.content_frame, fragment).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 index a856d76b..5da99055 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 @@ -6,31 +6,17 @@ import android.support.v7.widget.RecyclerView import android.view.* import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkFragment +import javax.inject.Inject class MessageListFragment : QkFragment() { - private var threadId: Long = 0 + @Inject lateinit var viewModel: MessageListViewModel + private var messageList: RecyclerView? = null - private var viewModel: MessageListViewModel? = 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) - viewModel = MessageListViewModel(threadId) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { @@ -41,7 +27,7 @@ class MessageListFragment : QkFragment() { val layoutManager = LinearLayoutManager(context) layoutManager.stackFromEnd = true messageList?.layoutManager = layoutManager - messageList?.adapter = MessageAdapter(context, viewModel?.messages) + messageList?.adapter = MessageAdapter(context, viewModel.messages) return view } 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 b7571866..7d6abb2b 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 @@ -5,9 +5,7 @@ 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) +class MessageListViewModel(val threadId: Long, repository: MessageRepository) : ViewModel() { val messages: RealmResults = repository.getMessages()