caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

reorder pumps in ConfigBuilder

Browse source
This commit is contained in:
Milos Kozak 2022-01-06 17:45:00 +01:00
parent 54257ef6f0
commit a1bc758596
20 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/MainApp.kt
View file

@ -15,7 +15,7 @@ import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.androidaps.database.transactions.VersionChangeTransaction import info.nightscout.androidaps.database.transactions.VersionChangeTransaction
import info.nightscout.androidaps.db.CompatDBHelper import info.nightscout.androidaps.db.CompatDBHelper
import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent import info.nightscout.androidaps.di.DaggerAppComponent
import info.nightscout.androidaps.di.StaticInjector import info.nightscout.androidaps.di.StaticInjector
import info.nightscout.androidaps.interfaces.Config import info.nightscout.androidaps.interfaces.Config
import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.ConfigBuilder

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt → app/src/main/java/info/nightscout/androidaps/di/APSModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt → app/src/main/java/info/nightscout/androidaps/di/ActivitiesModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

3
app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt → app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
@ -12,7 +12,6 @@ import info.nightscout.androidaps.dana.di.DanaModule
import info.nightscout.androidaps.danar.di.DanaRModule import info.nightscout.androidaps.danar.di.DanaRModule
import info.nightscout.androidaps.danars.di.DanaRSModule import info.nightscout.androidaps.danars.di.DanaRSModule
import info.nightscout.androidaps.database.DatabaseModule import info.nightscout.androidaps.database.DatabaseModule
import info.nightscout.androidaps.di.CoreModule
import info.nightscout.androidaps.diaconn.di.DiaconnG8Module import info.nightscout.androidaps.diaconn.di.DiaconnG8Module
import info.nightscout.androidaps.insight.di.InsightDatabaseModule import info.nightscout.androidaps.insight.di.InsightDatabaseModule
import info.nightscout.androidaps.insight.di.InsightModule import info.nightscout.androidaps.insight.di.InsightModule

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt → app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import android.content.Context import android.content.Context
import dagger.Binds import dagger.Binds

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt → app/src/main/java/info/nightscout/androidaps/di/CommandQueueModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt → app/src/main/java/info/nightscout/androidaps/di/DataClassesModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt → app/src/main/java/info/nightscout/androidaps/di/FragmentsModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt → app/src/main/java/info/nightscout/androidaps/di/ObjectivesModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

4
app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt → app/src/main/java/info/nightscout/androidaps/di/OverviewModule.kt
View file

@ -1,10 +1,8 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.TherapyEventDataPoint
import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
@Module @Module

13
app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt → app/src/main/java/info/nightscout/androidaps/di/PluginsModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
@ -52,6 +52,7 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAverage
import info.nightscout.androidaps.plugins.source.* import info.nightscout.androidaps.plugins.source.*
import javax.inject.Qualifier import javax.inject.Qualifier
@Suppress("unused")
@Module @Module
abstract class PluginsModule { abstract class PluginsModule {
@ -160,20 +161,20 @@ abstract class PluginsModule {
@Binds @Binds
@PumpDriver @PumpDriver
@IntoMap @IntoMap
@IntKey(150) @IntKey(145)
abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase abstract fun bindOmnipodErosPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase
@Binds @Binds
@PumpDriver @PumpDriver
@IntoMap @IntoMap
@IntKey(156) @IntKey(148)
abstract fun bindOmnipodDashPumpPlugin(plugin: OmnipodDashPumpPlugin): PluginBase abstract fun bindOmnipodDashPumpPlugin(plugin: OmnipodDashPumpPlugin): PluginBase
@Binds @Binds
@PumpDriver @PumpDriver
@IntoMap @IntoMap
@IntKey(135) @IntKey(150)
abstract fun bindOmnipodErosPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
@Binds @Binds
@PumpDriver @PumpDriver

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt → app/src/main/java/info/nightscout/androidaps/di/PreferencesModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt → app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/SMSModule.kt → app/src/main/java/info/nightscout/androidaps/di/SMSModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt → app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

3
app/src/main/java/info/nightscout/androidaps/dependencyInjection/SkinsModule.kt → app/src/main/java/info/nightscout/androidaps/di/SkinsModule.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Binds
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.multibindings.IntKey import dagger.multibindings.IntKey

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/UIModule.kt → app/src/main/java/info/nightscout/androidaps/di/UIModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt → app/src/main/java/info/nightscout/androidaps/di/WizardModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/dependencyInjection/WorkersModule.kt → app/src/main/java/info/nightscout/androidaps/di/WorkersModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.dependencyInjection package info.nightscout.androidaps.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

2
app/src/main/java/info/nightscout/androidaps/skins/SkinProvider.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.skins package info.nightscout.androidaps.skins
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.dependencyInjection.SkinsModule import info.nightscout.androidaps.di.SkinsModule
import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.sharedPreferences.SP
import okhttp3.internal.toImmutableMap import okhttp3.internal.toImmutableMap
import javax.inject.Inject import javax.inject.Inject