Rename duplicated names
This commit is contained in:
parent
1a8f00c5e7
commit
52fda97582
|
@ -7,7 +7,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import dagger.android.AndroidInjector
|
import dagger.android.AndroidInjector
|
||||||
import dagger.android.DaggerApplication
|
import dagger.android.DaggerApplication
|
||||||
import info.nightscout.androidaps.di.DaggerAppComponent
|
import info.nightscout.androidaps.di.DaggerWearComponent
|
||||||
|
|
||||||
class Aaps : DaggerApplication(), OnSharedPreferenceChangeListener {
|
class Aaps : DaggerApplication(), OnSharedPreferenceChangeListener {
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ class Aaps : DaggerApplication(), OnSharedPreferenceChangeListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun applicationInjector(): AndroidInjector<out DaggerApplication> =
|
override fun applicationInjector(): AndroidInjector<out DaggerApplication> =
|
||||||
DaggerAppComponent
|
DaggerWearComponent
|
||||||
.builder()
|
.builder()
|
||||||
.application(this)
|
.application(this)
|
||||||
.build()
|
.build()
|
||||||
|
|
|
@ -12,10 +12,10 @@ import javax.inject.Singleton
|
||||||
modules = [
|
modules = [
|
||||||
AndroidInjectionModule::class,
|
AndroidInjectionModule::class,
|
||||||
WearModule::class,
|
WearModule::class,
|
||||||
ServicesModule::class
|
WearServicesModule::class
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
interface AppComponent : AndroidInjector<Aaps> {
|
interface WearComponent : AndroidInjector<Aaps> {
|
||||||
|
|
||||||
@Component.Builder
|
@Component.Builder
|
||||||
interface Builder {
|
interface Builder {
|
||||||
|
@ -23,6 +23,6 @@ interface AppComponent : AndroidInjector<Aaps> {
|
||||||
@BindsInstance
|
@BindsInstance
|
||||||
fun application(aaps: Aaps): Builder
|
fun application(aaps: Aaps): Builder
|
||||||
|
|
||||||
fun build(): AppComponent
|
fun build(): WearComponent
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -8,7 +8,7 @@ import info.nightscout.androidaps.watchfaces.*
|
||||||
|
|
||||||
@Module
|
@Module
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
abstract class ServicesModule {
|
abstract class WearServicesModule {
|
||||||
|
|
||||||
@ContributesAndroidInjector abstract fun contributesListenerService(): ListenerService
|
@ContributesAndroidInjector abstract fun contributesListenerService(): ListenerService
|
||||||
|
|
Loading…
Reference in a new issue