Skip to content

dagger 2 injection migrated to hilt #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ozanturcan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dagger 2 injection migrated to hilt #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: Plugins.androidApplication
apply plugin: Plugins.kotlinAndroid
apply plugin: Plugins.kotlinKapt
apply plugin: Plugins.kotlinAndroidExtensions
apply plugin: Plugins.hilt

android {
compileSdkVersion Configs.compileSdkVersion
Expand Down Expand Up @@ -34,10 +35,8 @@ dependencies {
implementation Dependencies.material

// dagger
implementation Dependencies.dagger
implementation Dependencies.daggerAndroid
kapt Dependencies.daggerCompiler
kapt Dependencies.daggerProcessor
implementation Dependencies.hiltAndroid
kapt Dependencies.hiltAndroidCompiler

// Retrofit & Gson.
implementation Dependencies.retrofit
Expand Down
27 changes: 3 additions & 24 deletions app/src/main/java/co/icanteach/projectx/InterviewApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,7 @@
package co.icanteach.projectx

import android.app.Activity
import android.app.Application
import co.icanteach.projectx.common.di.component.DaggerAppComponent
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasActivityInjector
import javax.inject.Inject
import dagger.hilt.android.HiltAndroidApp

class InterviewApplication : Application(), HasActivityInjector {

@Inject
internal lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>

override fun activityInjector(): AndroidInjector<Activity> {
return dispatchingAndroidInjector
}

override fun onCreate() {
super.onCreate()

DaggerAppComponent
.factory()
.create(this)
.inject(this)
}
}
@HiltAndroidApp
class InterviewApplication : Application()
5 changes: 2 additions & 3 deletions app/src/main/java/co/icanteach/projectx/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import co.icanteach.projectx.ui.populartvshows.PopularTVShowsFeedAdapter
import co.icanteach.projectx.ui.populartvshows.PopularTVShowsStatusViewState
import co.icanteach.projectx.ui.populartvshows.PopularTVShowsViewModel
import co.icanteach.projectx.ui.populartvshows.model.PopularTvShowItem
import dagger.android.AndroidInjection
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject


@AndroidEntryPoint
class MainActivity : AppCompatActivity() {

@Inject
Expand All @@ -29,7 +29,6 @@ class MainActivity : AppCompatActivity() {
private lateinit var binding: ActivityMainBinding

override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)

binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
Expand Down
28 changes: 0 additions & 28 deletions app/src/main/java/co/icanteach/projectx/common/di/component/AppComponent.kt
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions app/src/main/java/co/icanteach/projectx/common/di/module/ActivityBuilderModule.kt
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions app/src/main/java/co/icanteach/projectx/common/di/module/DataModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ package co.icanteach.projectx.common.di.module

import co.icanteach.projectx.data.NetworkModule
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ApplicationComponent

@Module(
includes = [NetworkModule::class]
)
class DataModule {
}

@InstallIn(ApplicationComponent::class)
class DataModule
Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DataModule is not needed and can be deleted.

3 changes: 3 additions & 0 deletions app/src/main/java/co/icanteach/projectx/common/di/module/ViewModelModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import co.icanteach.projectx.common.di.key.ViewModelKey
import co.icanteach.projectx.ui.populartvshows.PopularTVShowsViewModel
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ApplicationComponent
import dagger.multibindings.IntoMap

@Module
@InstallIn(ApplicationComponent::class)
interface ViewModelModule {
Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would be nice if ViewModel is also migrated to Hilt?

https://developer.android.com/training/dependency-injection/hilt-jetpack


@get:IntoMap
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/co/icanteach/projectx/data/NetworkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package co.icanteach.projectx.data

import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ApplicationComponent
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit
Expand All @@ -11,6 +13,7 @@ import retrofit2.create
import javax.inject.Singleton

@Module
@InstallIn(ApplicationComponent::class)
class NetworkModule {
Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of class, using object is better for here from the performance point of view.

@Provides
@Singleton
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/co/icanteach/projectx/ui/populartvshows/PopularTvShowActivityModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ package co.icanteach.projectx.ui.populartvshows
import co.icanteach.projectx.common.di.scope.ActivityScope
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityComponent

@Module
@InstallIn(ActivityComponent::class)
class PopularTvShowActivityModule {
Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can delete this Module by

@ActivityScoped
class PopularTVShowsFeedAdapter @Inject constructor() :
    RecyclerView.Adapter<PopularTVShowsFeedAdapter.PopularTVShowsFeedItemViewHolder>() {


@ActivityScope
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ buildscript {
classpath Classpaths.gradleClasspath
classpath Classpaths.kotlinGradleClasspath
classpath Classpaths.gradleVersionPlugin
classpath Classpaths.hilt
}
}

Expand Down
8 changes: 6 additions & 2 deletions buildSrc/src/main/java/co/icanteach/projectx/buildsrc/Classpaths.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
object Classpaths {
val gradleClasspath = "com.android.tools.build:gradle:${Versions.gradleVersion}"
val kotlinGradleClasspath = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}"
val gradleVersionPlugin = "com.github.ben-manes:gradle-versions-plugin:${Versions.gradleVersionPluginVersion}"
val kotlinGradleClasspath =
"org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}"
Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting of kotlinGradleClasspath and gradleVersionPlugin is different from previous commits. These may be fit 1 line as other dependencies.

val gradleVersionPlugin =
"com.github.ben-manes:gradle-versions-plugin:${Versions.gradleVersionPluginVersion}"
val hilt = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hiltVersion}"

Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: needless empty space

Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also in:

  • buildSrc/src/main/java/co/icanteach/projectx/buildsrc/Plugins.kt
  • buildSrc/src/main/java/co/icanteach/projectx/buildsrc/Versions.kt

}
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/co/icanteach/projectx/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ object Dependencies {
val mockK = "io.mockk:mockk:${Versions.mockKVersion}"
val coreTesting = "androidx.arch.core:core-testing:${Versions.coreTestingVersion}"
val material = "com.google.android.material:material:${Versions.materialVersion}"
val hiltAndroid = "com.google.dagger:hilt-android:${Versions.hiltVersion}"
val hiltAndroidCompiler = "com.google.dagger:hilt-android-compiler:${Versions.hiltVersion}"
}
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/co/icanteach/projectx/buildsrc/Plugins.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ object Plugins {
val kotlinKapt = "kotlin-kapt"
val kotlinAndroidExtensions = "kotlin-android-extensions"
val gradleVersionPlugin = "com.github.ben-manes.versions"
val hilt = "dagger.hilt.android.plugin"

}
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/co/icanteach/projectx/buildsrc/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ object Versions {
val coreTestingVersion = "2.0.0"
val materialVersion = "1.2.0-alpha01"
val gradleVersionPluginVersion = "0.27.0"
val hiltVersion = "2.28.1-alpha"

}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
Copy link
Copy Markdown

@ibrahimyilmaz ibrahimyilmaz Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I strongly recommend you to open another PR for that change as it effects all of project.