From 98f5e80dccca84c0ae9b70260ce963739ab42c00 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 28 Aug 2017 11:17:35 -0700 Subject: [PATCH] use dependency injection for conversation viewmodel --- qksms/build.gradle | 7 ++++++ .../main/java/com/moez/QKSMS/QKApplication.kt | 13 ++++++++++ .../com/moez/QKSMS/dagger/AppComponent.kt | 14 ++++++++--- .../java/com/moez/QKSMS/dagger/AppModule.kt | 19 +++++++++++--- .../moez/QKSMS/dagger/ConversationModule.kt | 25 ++++++++++++++++--- .../java/com/moez/QKSMS/ui/base/QkFragment.kt | 6 +++++ .../conversations/ConversationListFragment.kt | 9 ++++--- .../ConversationListViewModel.kt | 6 ++--- 8 files changed, 82 insertions(+), 17 deletions(-) diff --git a/qksms/build.gradle b/qksms/build.gradle index 08a7671e..a71503fc 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -38,6 +38,7 @@ dependencies { compile 'com.android.support:appcompat-v7:26.0.0' compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.bugsnag:bugsnag-android:3.9.0' + compile "com.google.dagger:dagger:2.9" compile 'com.karumi:dexter:4.1.0' compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile "io.reactivex.rxjava2:rxjava:2.1.0" @@ -45,6 +46,12 @@ dependencies { compile 'io.realm:android-adapters:1.3.0' compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" kapt "android.arch.lifecycle:compiler:1.0.0-alpha9" + kapt "com.google.dagger:dagger-compiler:2.9" kapt 'io.realm:realm-annotations:3.3.1' kapt 'io.realm:realm-annotations-processor:3.3.1' + provided 'javax.annotation:jsr250-api:1.0' +} + +kapt { + generateStubs = true } diff --git a/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt b/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt index d4369bc2..3d2ff34b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt +++ b/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt @@ -2,11 +2,19 @@ package com.moez.QKSMS 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.DaggerAppComponent import io.realm.Realm import io.realm.RealmConfiguration + class QKApplication : Application() { + var appComponent: AppComponent? = null + private set + override fun onCreate() { super.onCreate() @@ -16,6 +24,11 @@ class QKApplication : Application() { Realm.setDefaultConfiguration(RealmConfiguration.Builder() .deleteRealmIfMigrationNeeded() .build()) + + appComponent = DaggerAppComponent.builder() + .appModule(AppModule(this)) + .conversationModule(ConversationModule()) + .build() } } \ 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 edabfcb5..0a0285a9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -1,5 +1,13 @@ package com.moez.QKSMS.dagger -/** - * Created by moez on 2017-08-28. - */ +import com.moez.QKSMS.ui.conversations.ConversationListFragment +import dagger.Component +import javax.inject.Singleton + +@Singleton +@Component(modules = arrayOf(AppModule::class, ConversationModule::class)) +interface AppComponent { + + fun inject(fragment: ConversationListFragment) + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt index edabfcb5..64946761 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt @@ -1,5 +1,18 @@ package com.moez.QKSMS.dagger -/** - * Created by moez on 2017-08-28. - */ +import android.app.Application +import android.content.Context +import dagger.Module +import dagger.Provides +import javax.inject.Singleton + +@Module +class AppModule(var application: Application) { + + @Provides + @Singleton + fun provideContext(): Context { + return application + } + +} \ 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/ConversationModule.kt index edabfcb5..7eca1cd3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationModule.kt @@ -1,5 +1,24 @@ package com.moez.QKSMS.dagger -/** - * Created by moez on 2017-08-28. - */ +import com.moez.QKSMS.data.repository.ConversationRepository +import com.moez.QKSMS.ui.conversations.ConversationListViewModel +import dagger.Module +import dagger.Provides +import javax.inject.Singleton + +@Module +class ConversationModule { + + @Provides + @Singleton + fun provideRepository(): ConversationRepository { + return ConversationRepository() + } + + @Provides + @Singleton + fun provideViewModel(repository: ConversationRepository): ConversationListViewModel { + return ConversationListViewModel(repository) + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt index 38a9f6a5..a18dd054 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt @@ -1,6 +1,8 @@ package com.moez.QKSMS.ui.base import android.arch.lifecycle.LifecycleFragment +import com.moez.QKSMS.QKApplication +import com.moez.QKSMS.dagger.AppComponent abstract class QkFragment : LifecycleFragment() { @@ -8,4 +10,8 @@ abstract class QkFragment : LifecycleFragment() { return super.getContext() as QkActivity } + fun getAppComponent(): AppComponent? { + return (context.application as QKApplication).appComponent + } + } \ No newline at end of file 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 e3f570f4..e66f035e 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 @@ -8,18 +8,19 @@ import android.widget.ProgressBar import com.moez.QKSMS.R import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.ui.base.QkFragment +import javax.inject.Inject class ConversationListFragment : QkFragment() { + @Inject lateinit var viewModel: ConversationListViewModel + private var progress: ProgressBar? = null private var conversationList: RecyclerView? = null - private var viewModel: ConversationListViewModel? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + getAppComponent()?.inject(this) setHasOptionsMenu(true) - - viewModel = ConversationListViewModel() } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { @@ -29,7 +30,7 @@ class ConversationListFragment : QkFragment() { conversationList = view.findViewById(R.id.conversation_list) conversationList?.layoutManager = LinearLayoutManager(context) - conversationList?.adapter = ConversationAdapter(context, viewModel?.conversations) + conversationList?.adapter = ConversationAdapter(context, viewModel.conversations) return view } 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 f66cea04..7d70971c 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 @@ -3,10 +3,8 @@ package com.moez.QKSMS.ui.conversations import android.arch.lifecycle.ViewModel import com.moez.QKSMS.data.repository.ConversationRepository -class ConversationListViewModel : ViewModel() { +class ConversationListViewModel(repository: ConversationRepository) : ViewModel() { - private val repository = ConversationRepository() - - var conversations = repository.getConversations() + val conversations = repository.getConversations() } \ No newline at end of file