File tree Expand file tree Collapse file tree 4 files changed +9
-31
lines changed
app/src/main/java/com/example/githubfirebaseissue Expand file tree Collapse file tree 4 files changed +9
-31
lines changed Original file line number Diff line number Diff line change @@ -4,24 +4,15 @@ import android.app.Activity
4
4
import android.app.Application
5
5
import com.example.githubfirebaseissue.di.component.DaggerApplicationComponent
6
6
import dagger.android.AndroidInjector
7
+ import dagger.android.DaggerApplication
7
8
import dagger.android.DispatchingAndroidInjector
8
9
import dagger.android.HasActivityInjector
9
10
import javax.inject.Inject
10
11
11
12
12
- class GithubApplication : Application (), HasActivityInjector {
13
+ class GithubApplication : DaggerApplication () {
13
14
14
- @Inject
15
- lateinit var activityInjector: DispatchingAndroidInjector <Activity >
16
-
17
- override fun activityInjector (): AndroidInjector <Activity > = activityInjector
18
-
19
- override fun onCreate () {
20
- super .onCreate()
21
- DaggerApplicationComponent
22
- .builder()
23
- .application(this )
24
- .build()
25
- .inject(this )
15
+ override fun applicationInjector (): AndroidInjector <out DaggerApplication > {
16
+ return DaggerApplicationComponent .factory().create(this )
26
17
}
27
18
}
Original file line number Diff line number Diff line change @@ -8,23 +8,17 @@ import dagger.android.support.HasSupportFragmentInjector
8
8
import dagger.android.DispatchingAndroidInjector
9
9
import javax.inject.Inject
10
10
import dagger.android.AndroidInjector
11
+ import dagger.android.support.DaggerAppCompatActivity
11
12
12
13
13
- abstract class BaseActivity : AppCompatActivity (), HasSupportFragmentInjector {
14
-
15
- @Inject
16
- lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector <Fragment >
14
+ abstract class BaseActivity : DaggerAppCompatActivity () {
17
15
18
16
override fun onCreate (savedInstanceState : Bundle ? ) {
19
17
AndroidInjection .inject(this )
20
18
super .onCreate(savedInstanceState)
21
19
setContentView(getLayoutRes())
22
20
}
23
21
24
- override fun supportFragmentInjector (): AndroidInjector <Fragment > {
25
- return fragmentDispatchingAndroidInjector
26
- }
27
-
28
22
fun replaceFragment (
29
23
container : Int ,
30
24
fragment : Fragment ,
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ abstract class BaseFragment : Fragment() {
39
39
}
40
40
41
41
protected fun showErrorDialog (message : String , actionText : String ) {
42
- val dialog = Dialog (context !! )
42
+ val dialog = Dialog (requireContext() )
43
43
with (dialog) {
44
44
requestWindowFeature(Window .FEATURE_NO_TITLE )
45
45
setCancelable(false )
Original file line number Diff line number Diff line change @@ -20,13 +20,6 @@ import dagger.android.support.AndroidSupportInjectionModule
20
20
)
21
21
interface ApplicationComponent : AndroidInjector <GithubApplication > {
22
22
23
- @Component.Builder
24
- interface Builder {
25
- @BindsInstance
26
- fun application (application : GithubApplication ): Builder
27
-
28
- fun build (): ApplicationComponent
29
- }
30
-
31
- override fun inject (app : GithubApplication )
23
+ @Component.Factory
24
+ abstract class Builder : AndroidInjector .Factory <GithubApplication >
32
25
}
You can’t perform that action at this time.
0 commit comments