From 43f5ed27f04b865e244c59919f674eea648bf9b4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 22 Sep 2017 03:02:38 -0400 Subject: [PATCH] Update Dagger and remove unnecessary Modules --- qksms/build.gradle | 4 ++-- .../com/moez/QKSMS/dagger/ActivityScope.kt | 6 ------ .../com/moez/QKSMS/dagger/AppComponent.kt | 2 +- .../moez/QKSMS/dagger/AppComponentManager.kt | 2 -- .../java/com/moez/QKSMS/dagger/AppModule.kt | 20 +++++++++++++++++++ .../com/moez/QKSMS/dagger/ContactModule.kt | 18 ----------------- .../moez/QKSMS/dagger/ConversationsModule.kt | 17 ---------------- .../com/moez/QKSMS/dagger/MessagesModule.kt | 18 ----------------- 8 files changed, 23 insertions(+), 64 deletions(-) delete mode 100644 qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/dagger/ContactModule.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt diff --git a/qksms/build.gradle b/qksms/build.gradle index 504329a8..ae215a3e 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -39,7 +39,7 @@ dependencies { compile 'com.android.support:appcompat-v7:26.1.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.google.dagger:dagger:2.11" compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0' compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.karumi:dexter:4.1.0' @@ -49,7 +49,7 @@ 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-1" - kapt "com.google.dagger:dagger-compiler:2.9" + kapt "com.google.dagger:dagger-compiler:2.11" kapt 'io.realm:realm-annotations:3.7.0' kapt 'io.realm:realm-annotations-processor:3.7.0' provided 'javax.annotation:jsr250-api:1.0' diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt deleted file mode 100644 index f3bfa585..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ActivityScope.kt +++ /dev/null @@ -1,6 +0,0 @@ -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 407c4ff6..b5a6fba1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -9,7 +9,7 @@ import dagger.Component import javax.inject.Singleton @Singleton -@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class, MessagesModule::class)) +@Component(modules = arrayOf(AppModule::class)) interface AppComponent { fun inject(receiver: SmsReceiver) diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponentManager.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponentManager.kt index ae9418fb..42093a0b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponentManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponentManager.kt @@ -10,8 +10,6 @@ internal object AppComponentManager { fun init(application: QKApplication) { appComponent = DaggerAppComponent.builder() .appModule(AppModule(application)) - .contactModule(ContactModule()) - .conversationsModule(ConversationsModule()) .build() } 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 b8c886d2..d3043b8d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt @@ -3,6 +3,8 @@ package com.moez.QKSMS.dagger import android.app.Application import android.content.Context import com.moez.QKSMS.data.repository.ContactRepository +import com.moez.QKSMS.data.repository.ConversationRepository +import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.util.DateFormatter import com.moez.QKSMS.util.NotificationHelper @@ -37,4 +39,22 @@ class AppModule(var application: Application) { return NotificationHelper(context) } + @Provides + @Singleton + fun provideConversationRepository(): ConversationRepository { + return ConversationRepository() + } + + @Singleton + @Provides + fun provideMessageRepository(context: Context): MessageRepository { + return MessageRepository(context) + } + + @Provides + @Singleton + fun provideContactRepository(context: Context): ContactRepository { + return ContactRepository(context) + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/ContactModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/ContactModule.kt deleted file mode 100644 index 18b6bb5f..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ContactModule.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.moez.QKSMS.dagger - -import android.content.Context -import com.moez.QKSMS.data.repository.ContactRepository -import dagger.Module -import dagger.Provides -import javax.inject.Singleton - -@Module -class ContactModule { - - @Provides - @Singleton - fun provideContactRepository(context: Context): ContactRepository { - return ContactRepository(context) - } - -} \ 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 deleted file mode 100644 index 55fb76f0..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.moez.QKSMS.dagger - -import com.moez.QKSMS.data.repository.ConversationRepository -import dagger.Module -import dagger.Provides -import javax.inject.Singleton - -@Module -class ConversationsModule { - - @Provides - @Singleton - fun provideRepository(): ConversationRepository { - return 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 deleted file mode 100644 index 8ab3b9c4..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesModule.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.moez.QKSMS.dagger - -import android.content.Context -import com.moez.QKSMS.data.repository.MessageRepository -import dagger.Module -import dagger.Provides -import javax.inject.Singleton - -@Module -class MessagesModule { - - @Singleton - @Provides - fun provideRepository(context: Context): MessageRepository { - return MessageRepository(context) - } - -} \ No newline at end of file