From 42cfd87a2b8f3e55a9de209a21264ce5e27fdb8c Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 30 Apr 2020 00:37:58 +0200 Subject: [PATCH] injection cleanup --- .../dependencyInjection/APSModule.kt | 28 +++ .../dependencyInjection/AppComponent.kt | 162 ++--------------- .../dependencyInjection/AppModule.kt | 171 ------------------ .../dependencyInjection/AutomationModule.kt | 71 ++++++++ .../dependencyInjection/CommandQueueModule.kt | 32 ++++ .../dependencyInjection/DataClassesModule.kt | 32 ++++ .../dependencyInjection/MedtronicModule.kt | 40 ++++ .../dependencyInjection/ObjectivesModule.kt | 24 +++ .../dependencyInjection/OverviewModule.kt | 22 +++ .../dependencyInjection/PreferencesModule.kt | 18 ++ .../dependencyInjection/SMSModule.kt | 12 ++ .../dependencyInjection/WizardModule.kt | 27 +++ 12 files changed, 317 insertions(+), 322 deletions(-) create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/AutomationModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/SMSModule.kt create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt new file mode 100644 index 0000000000..d3fef14166 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt @@ -0,0 +1,28 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback +import info.nightscout.androidaps.plugins.aps.loop.APSResult +import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalAdapterAMAJS +import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA +import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS +import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread + +@Module +@Suppress("unused") +abstract class APSModule { + + @ContributesAndroidInjector abstract fun loggerCallbackInjector(): LoggerCallback + @ContributesAndroidInjector abstract fun apsResultInjector(): APSResult + @ContributesAndroidInjector abstract fun determineBasalResultSMBInjector(): DetermineBasalResultSMB + @ContributesAndroidInjector abstract fun determineBasalResultAMAInjector(): DetermineBasalResultAMA + @ContributesAndroidInjector abstract fun determineBasalAdapterAMAJSInjector(): DetermineBasalAdapterAMAJS + @ContributesAndroidInjector abstract fun determineBasalAdapterSMBJSInjector(): DetermineBasalAdapterSMBJS + @ContributesAndroidInjector abstract fun autosensDataInjector(): AutosensData + @ContributesAndroidInjector abstract fun iobCobThreadInjector(): IobCobThread + @ContributesAndroidInjector abstract fun iobCobOref1ThreadInjector(): IobCobOref1Thread +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt index 7d9dcac987..91153bd867 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt @@ -57,161 +57,21 @@ import javax.inject.Singleton FragmentsModule::class, AppModule::class, ReceiversModule::class, - ServicesModule::class + ServicesModule::class, + AutomationModule::class, + CommandQueueModule::class, + ObjectivesModule::class, + WizardModule::class, + MedtronicModule::class, + APSModule::class, + PreferencesModule::class, + OverviewModule::class, + DataClassesModule::class, + SMSModule::class ] ) interface AppComponent : AndroidInjector { - fun injectProfileStore(profileStore: ProfileStore) - fun injectPumpEnactResult(pumpEnactResult: PumpEnactResult) - fun injectAPSResult(apsResult: APSResult) - fun injectDetermineBasalResultSMB(determineBasalResultSMB: DetermineBasalResultSMB) - fun injectDetermineBasalResultAMA(determineBasalResultAMA: DetermineBasalResultAMA) - fun injectDetermineBasalAdapterSMBJS(determineBasalAdapterSMBJS: DetermineBasalAdapterSMBJS) - - fun injectCommandQueue(commandQueue: CommandQueue) - fun injectCommandBolus(commandBolus: CommandBolus) - fun injectCommandCancelExtendedBolus(commandCancelExtendedBolus: CommandCancelExtendedBolus) - fun injectCommandCancelTempBasal(commandCancelTempBasal: CommandCancelTempBasal) - fun injectCommandExtendedBolus(commandExtendedBolus: CommandExtendedBolus) - fun injectCommandInsightSetTBROverNotification(commandInsightSetTBROverNotification: CommandInsightSetTBROverNotification) - fun injectCommandLoadEvents(commandLoadEvents: CommandLoadEvents) - fun injectCommandLoadHistory(commandLoadHistory: CommandLoadHistory) - fun injectCommandLoadTDDs(commandLoadTDDs: CommandLoadTDDs) - fun injectCommandReadStatus(commandReadStatus: CommandReadStatus) - fun injectCommandSetProfile(commandSetProfile: CommandSetProfile) - fun injectCommandCommandSMBBolus(commandSMBBolus: CommandSMBBolus) - fun injectCommandStartPump(commandStartPump: CommandStartPump) - fun injectCommandStopPump(commandStopPump: CommandStopPump) - fun injectCommandTempBasalAbsolute(commandTempBasalAbsolute: CommandTempBasalAbsolute) - fun injectCommandTempBasalPercent(commandTempBasalPercent: CommandTempBasalPercent) - fun injectCommandSetUserSettings(commandSetUserSettings: CommandSetUserSettings) - - fun injectObjective(objective: Objective) - fun injectObjective0(objective0: Objective0) - fun injectObjective1(objective1: Objective1) - fun injectObjective2(objective2: Objective2) - fun injectObjective3(objective3: Objective3) - fun injectObjective4(objective4: Objective4) - fun injectObjective5(objective5: Objective5) - fun injectObjective6(objective6: Objective6) - fun injectObjective7(objective7: Objective7) - fun injectObjective8(objective8: Objective8) - fun injectObjective9(objective9: Objective9) - fun injectObjective10(objective10: Objective10) - - fun injectAutomationEvent(automationEvent: AutomationEvent) - - fun injectTrigger(trigger: Trigger) - fun injectTrigger(triggerAutosensValue: TriggerAutosensValue) - fun injectTrigger(triggerBg: TriggerBg) - fun injectTrigger(triggerBolusAgo: TriggerBolusAgo) - fun injectTrigger(triggerBTDevice: TriggerBTDevice) - fun injectTrigger(triggerCOB: TriggerCOB) - fun injectTrigger(triggerConnector: TriggerConnector) - fun injectTrigger(triggerDelta: TriggerDelta) - fun injectTrigger(triggerDummy: TriggerDummy) - fun injectTrigger(triggerIob: TriggerIob) - fun injectTrigger(triggerLocation: TriggerLocation) - fun injectTrigger(triggerProfilePercent: TriggerProfilePercent) - fun injectTrigger(triggerPumpLastConnection: TriggerPumpLastConnection) - fun injectTrigger(triggerRecurringTime: TriggerRecurringTime) - fun injectTrigger(triggerTempTarget: TriggerTempTarget) - fun injectTrigger(triggerTime: TriggerTime) - fun injectTrigger(triggerTimeRange: TriggerTimeRange) - fun injectTrigger(triggerWifiSsid: TriggerWifiSsid) - - fun injectAction(action: Action) - fun injectActionDummy(action: ActionDummy) - fun injectActionLoopDisable(action: ActionLoopDisable) - fun injectActionLoopEnable(action: ActionLoopEnable) - fun injectActionLoopResume(action: ActionLoopResume) - fun injectAction(action: ActionLoopSuspend) - fun injectActionLoopSuspend(action: ActionNotification) - fun injectActionProfileSwitch(action: ActionProfileSwitch) - fun injectAction(action: ActionProfileSwitchPercent) - fun injectActionProfileSwitchPercent(action: ActionSendSMS) - fun injectActionStartTempTarget(action: ActionStartTempTarget) - fun injectActionStopTempTarget(action: ActionStopTempTarget) - - fun injectElement(element: Element) - fun injectElement(inputBg: InputBg) - fun injectElement(inputButton: InputButton) - fun injectElement(comparator: Comparator) - fun injectElement(comparatorExists: ComparatorExists) - fun injectElement(comparatorConnect: ComparatorConnect) - fun injectElement(inputDateTime: InputDateTime) - fun injectElement(inputDelta: InputDelta) - fun injectElement(inputDropdownMenu: InputDropdownMenu) - fun injectElement(inputDouble: InputDouble) - fun injectElement(inputDuration: InputDuration) - fun injectElement(inputInsulin: InputInsulin) - fun injectElement(inputLocationMode: InputLocationMode) - fun injectElement(inputPercent: InputPercent) - fun injectElement(inputProfileName: InputProfileName) - fun injectElement(inputString: InputString) - fun injectElement(inputTempTarget: InputTempTarget) - fun injectElement(inputTimeRange: InputTimeRange) - fun injectElement(inputTime: InputTime) - fun injectElement(inputWeekDay: InputWeekDay) - fun injectElement(labelWithElement: LabelWithElement) - fun injectElement(staticLabel: StaticLabel) - - fun injectAutosensDate(autosensData: AutosensData) - fun injectIobCobThread(iobCobThread: IobCobThread) - fun injectIobCobOref1Thread(iobCobOref1Thread: IobCobOref1Thread) - - fun injectTreatment(treatment: Treatment) - fun injectBgReading(bgReading: BgReading) - fun injectProfileSwitch(profileSwitch: ProfileSwitch) - fun injectTemporaryBasal(temporaryBasal: TemporaryBasal) - fun injectCareportalEvent(careportalEvent: CareportalEvent) - - fun injectNotification(notificationWithAction: NotificationWithAction) - - fun injectLoggerCallback(loggerCallback: LoggerCallback) - fun injectBolusWizard(bolusWizard: BolusWizard) - fun injectQuickWizardEntry(quickWizardEntry: QuickWizardEntry) - - fun injectAuthRequest(authRequest: AuthRequest) - - fun injectSWBreak(swBreak: SWBreak) - fun injectSWButton(swButton: SWButton) - fun injectSWEditNumberWithUnits(swEditNumberWithUnits: SWEditNumberWithUnits) - fun injectSWEditString(swEditString: SWEditString) - fun injectSWEditEncryptedPassword(swSWEditEncryptedPassword: SWEditEncryptedPassword) - fun injectSWEditUrl(swEditUrl: SWEditUrl) - fun injectSWFragment(swFragment: SWFragment) - fun injectSSWHtmlLink(swHtmlLink: SWHtmlLink) - fun injectSWInfotext(swInfotext: SWInfotext) - fun injectSWItem(swItem: SWItem) - fun injectSWPlugin(swPlugin: SWPlugin) - fun injectSWRadioButton(swRadioButton: SWRadioButton) - fun injectSWScreen(swScreen: SWScreen) - fun injectSWEventListener(swEventListener: SWEventListener) - - fun injectProfile(profile: Profile) - fun injectGlucoseStatus(glucoseStatus: GlucoseStatus) - - fun injectGraphData(graphData: GraphData) - - //Medtronic - fun injectRileyLinkCommunicationManager(rileyLinkCommunicationManager: RileyLinkCommunicationManager) - fun injectMedtronicCommunicationManager(medtronicCommunicationManager: MedtronicCommunicationManager) - fun injectMedtronicUITask(medtronicUITask: MedtronicUITask) - fun injectServiceTask(serviceTask: ServiceTask) - fun injectPumpTask(pumpTask: PumpTask) - fun injectDiscoverGattServicesTask(discoverGattServicesTask: DiscoverGattServicesTask) - fun injectInitializePumpManagerTask(initializePumpManagerTask: InitializePumpManagerTask) - fun injectResetRileyLinkConfigurationTask(resetRileyLinkConfigurationTask: ResetRileyLinkConfigurationTask) - fun injectWakeAndTuneTask(wakeAndTuneTask: WakeAndTuneTask) - fun injectRadioResponse(radioResponse: RadioResponse) - fun injectRileyLinkBLE(rileyLinkBLE: RileyLinkBLE) - fun injectRFSpy(rfSpy: RFSpy) - fun injectSendAndListen(sendAndListen: SendAndListen) - fun injectSetPreamble(setPreamble: SetPreamble) - fun injectRadioPacket(radioPacket: RadioPacket) - @Component.Builder interface Builder { diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt index 6d334aa3d4..871f88a503 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt @@ -131,180 +131,9 @@ open class AppModule { @Module interface AppBindings { - @ContributesAndroidInjector fun profileStoreInjector(): ProfileStore - - @ContributesAndroidInjector fun pumpEnactResultInjector(): PumpEnactResult - - @ContributesAndroidInjector fun apsResultInjector(): APSResult - @ContributesAndroidInjector fun determineBasalResultSMBInjector(): DetermineBasalResultSMB - @ContributesAndroidInjector fun determineBasalResultAMAInjector(): DetermineBasalResultAMA - - @ContributesAndroidInjector - fun determineBasalAdapterSMBJSInjector(): DetermineBasalAdapterSMBJS - - @ContributesAndroidInjector fun commandQueueInjector(): CommandQueue - @ContributesAndroidInjector fun commandBolusInjector(): CommandBolus - - @ContributesAndroidInjector - fun commandCancelExtendedBolusInjector(): CommandCancelExtendedBolus - - @ContributesAndroidInjector fun commandCancelTempBasalInjector(): CommandCancelTempBasal - @ContributesAndroidInjector fun commandExtendedBolusInjector(): CommandExtendedBolus - - @ContributesAndroidInjector - fun commandInsightSetTBROverNotificationInjector(): CommandInsightSetTBROverNotification - - @ContributesAndroidInjector fun commandLoadEventsInjector(): CommandLoadEvents - @ContributesAndroidInjector fun commandLoadHistoryInjector(): CommandLoadHistory - @ContributesAndroidInjector fun commandLoadTDDsInjector(): CommandLoadTDDs - @ContributesAndroidInjector fun commandReadStatusInjector(): CommandReadStatus - @ContributesAndroidInjector fun commandSetProfileInjector(): CommandSetProfile - @ContributesAndroidInjector fun commandCommandSMBBolusInjector(): CommandSMBBolus - @ContributesAndroidInjector fun commandStartPumpInjector(): CommandStartPump - @ContributesAndroidInjector fun commandStopPumpInjector(): CommandStopPump - @ContributesAndroidInjector fun commandTempBasalAbsoluteInjector(): CommandTempBasalAbsolute - @ContributesAndroidInjector fun commandTempBasalPercentInjector(): CommandTempBasalPercent - @ContributesAndroidInjector fun commandSetUserSettingsInjector(): CommandSetUserSettings - - @ContributesAndroidInjector fun objectiveInjector(): Objective - @ContributesAndroidInjector fun objective0Injector(): Objective0 - @ContributesAndroidInjector fun objective1Injector(): Objective1 - @ContributesAndroidInjector fun objective2Injector(): Objective2 - @ContributesAndroidInjector fun objective3Injector(): Objective3 - @ContributesAndroidInjector fun objective4Injector(): Objective4 - @ContributesAndroidInjector fun objective5Injector(): Objective5 - @ContributesAndroidInjector fun objective6Injector(): Objective6 - @ContributesAndroidInjector fun objective7Injector(): Objective7 - @ContributesAndroidInjector fun objective8Injector(): Objective8 - @ContributesAndroidInjector fun objective9Injector(): Objective9 - @ContributesAndroidInjector fun objective10Injector(): Objective10 - - @ContributesAndroidInjector fun automationEventInjector(): AutomationEvent - - @ContributesAndroidInjector fun triggerInjector(): Trigger - @ContributesAndroidInjector fun triggerAutosensValueInjector(): TriggerAutosensValue - @ContributesAndroidInjector fun triggerBgInjector(): TriggerBg - @ContributesAndroidInjector fun triggerBolusAgoInjector(): TriggerBolusAgo - @ContributesAndroidInjector fun triggerCOBInjector(): TriggerCOB - @ContributesAndroidInjector fun triggerConnectorInjector(): TriggerConnector - @ContributesAndroidInjector fun triggerDeltaInjector(): TriggerDelta - @ContributesAndroidInjector fun triggerDummyInjector(): TriggerDummy - @ContributesAndroidInjector fun triggerIobInjector(): TriggerIob - @ContributesAndroidInjector fun triggerLocationInjector(): TriggerLocation - @ContributesAndroidInjector fun triggerProfilePercentInjector(): TriggerProfilePercent - - @ContributesAndroidInjector - fun triggerPumpLastConnectionInjector(): TriggerPumpLastConnection - - @ContributesAndroidInjector fun triggerBTDeviceInjector(): TriggerBTDevice - @ContributesAndroidInjector fun triggerRecurringTimeInjector(): TriggerRecurringTime - @ContributesAndroidInjector fun triggerTempTargetInjector(): TriggerTempTarget - @ContributesAndroidInjector fun triggerTime(): TriggerTime - @ContributesAndroidInjector fun triggerTimeRangeInjector(): TriggerTimeRange - @ContributesAndroidInjector fun triggerWifiSsidInjector(): TriggerWifiSsid - - @ContributesAndroidInjector fun actionInjector(): Action - @ContributesAndroidInjector fun actionLoopDisableInjector(): ActionLoopDisable - @ContributesAndroidInjector fun actionLoopEnableInjector(): ActionLoopEnable - @ContributesAndroidInjector fun actionLoopResumeInjector(): ActionLoopResume - @ContributesAndroidInjector fun actionLoopSuspendInjector(): ActionLoopSuspend - @ContributesAndroidInjector fun actionNotificationInjector(): ActionNotification - @ContributesAndroidInjector fun actionProfileSwitchInjector(): ActionProfileSwitch - - @ContributesAndroidInjector - fun actionProfileSwitchPercentInjector(): ActionProfileSwitchPercent - - @ContributesAndroidInjector fun actionSendSMSInjector(): ActionSendSMS - @ContributesAndroidInjector fun actionStartTempTargetInjector(): ActionStartTempTarget - @ContributesAndroidInjector fun actionStopTempTargetInjector(): ActionStopTempTarget - @ContributesAndroidInjector fun actionDummyInjector(): ActionDummy - - @ContributesAndroidInjector fun elementInjector(): Element - @ContributesAndroidInjector fun inputBgInjector(): InputBg - @ContributesAndroidInjector fun inputButtonInjector(): InputButton - @ContributesAndroidInjector fun comparatorInjector(): Comparator - @ContributesAndroidInjector fun comparatorConnectInjector(): ComparatorConnect - @ContributesAndroidInjector fun comparatorExistsInjector(): ComparatorExists - @ContributesAndroidInjector fun inputDateTimeInjector(): InputDateTime - @ContributesAndroidInjector fun inputDeltaInjector(): InputDelta - @ContributesAndroidInjector fun inputDoubleInjector(): InputDouble - @ContributesAndroidInjector fun inputDropdownMenuInjector(): InputDropdownMenu - @ContributesAndroidInjector fun inputDurationInjector(): InputDuration - @ContributesAndroidInjector fun inputInsulinInjector(): InputInsulin - @ContributesAndroidInjector fun inputLocationModeInjector(): InputLocationMode - @ContributesAndroidInjector fun inputPercentInjector(): InputPercent - @ContributesAndroidInjector fun inputProfileNameInjector(): InputProfileName - @ContributesAndroidInjector fun inputStringInjector(): InputString - @ContributesAndroidInjector fun inputTempTargetInjector(): InputTempTarget - @ContributesAndroidInjector fun inputTimeRangeInjector(): InputTimeRange - @ContributesAndroidInjector fun inputTimeInjector(): InputTime - @ContributesAndroidInjector fun inputWeekDayInjector(): InputWeekDay - @ContributesAndroidInjector fun labelWithElementInjector(): LabelWithElement - @ContributesAndroidInjector fun staticLabelInjector(): StaticLabel - - @ContributesAndroidInjector fun autosensDataInjector(): AutosensData - @ContributesAndroidInjector fun iobCobThreadInjector(): IobCobThread - @ContributesAndroidInjector fun iobCobOref1ThreadInjector(): IobCobOref1Thread - - @ContributesAndroidInjector fun bgReadingInjector(): BgReading - @ContributesAndroidInjector fun treatmentInjector(): Treatment - @ContributesAndroidInjector fun profileSwitchInjector(): ProfileSwitch - @ContributesAndroidInjector fun temporaryBasalInjector(): TemporaryBasal - @ContributesAndroidInjector fun careportalEventInjector(): CareportalEvent - - @ContributesAndroidInjector fun notificationWithActionInjector(): NotificationWithAction - - @ContributesAndroidInjector fun loggerCallbackInjector(): LoggerCallback - @ContributesAndroidInjector fun loggerBolusWizard(): BolusWizard - @ContributesAndroidInjector fun loggerQuickWizardEntry(): QuickWizardEntry - - @ContributesAndroidInjector fun authRequestInjector(): AuthRequest - - @ContributesAndroidInjector fun swBreakInjector(): SWBreak - @ContributesAndroidInjector fun swButtonInjector(): SWButton - @ContributesAndroidInjector fun swEditNumberWithUnitsInjector(): SWEditNumberWithUnits - @ContributesAndroidInjector fun swEditStringInjector(): SWEditString - @ContributesAndroidInjector fun swEditEncryptedPasswordInjector(): SWEditEncryptedPassword - @ContributesAndroidInjector fun swEditUrlInjector(): SWEditUrl - @ContributesAndroidInjector fun swFragmentInjector(): SWFragment - @ContributesAndroidInjector fun swHtmlLinkInjector(): SWHtmlLink - @ContributesAndroidInjector fun swInfotextInjector(): SWInfotext - @ContributesAndroidInjector fun swItemInjector(): SWItem - @ContributesAndroidInjector fun swPluginInjector(): SWPlugin - @ContributesAndroidInjector fun swRadioButtonInjector(): SWRadioButton - @ContributesAndroidInjector fun swScreenInjector(): SWScreen - @ContributesAndroidInjector fun swEventListenerInjector(): SWEventListener - - @ContributesAndroidInjector fun profileInjector(): Profile - @ContributesAndroidInjector fun glucoseStatusInjector(): GlucoseStatus - - @ContributesAndroidInjector fun graphDataInjector(): GraphData - - @ContributesAndroidInjector fun cryptoUtilInjector(): CryptoUtil - @ContributesAndroidInjector fun importExportPrefsInjector(): ImportExportPrefs - @ContributesAndroidInjector fun encryptedPrefsFormatInjector(): EncryptedPrefsFormat - @ContributesAndroidInjector fun classicPrefsFormatInjector(): ClassicPrefsFormat - @Binds fun bindContext(mainApp: MainApp): Context @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector - // Medtronic - @ContributesAndroidInjector fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager - @ContributesAndroidInjector fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager - @ContributesAndroidInjector fun medtronicUITaskProvider(): MedtronicUITask - @ContributesAndroidInjector fun serviceTaskProvider(): ServiceTask - @ContributesAndroidInjector fun pumpTaskProvider(): PumpTask - @ContributesAndroidInjector fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask - @ContributesAndroidInjector fun initializePumpManagerTaskProvider(): InitializePumpManagerTask - @ContributesAndroidInjector fun resetRileyLinkConfigurationTaskProvider(): ResetRileyLinkConfigurationTask - @ContributesAndroidInjector fun wakeAndTuneTaskProvider(): WakeAndTuneTask - @ContributesAndroidInjector fun radioResponseProvider(): RadioResponse - @ContributesAndroidInjector fun rileyLinkBLEProvider(): RileyLinkBLE - @ContributesAndroidInjector fun rfSpyProvider(): RFSpy - @ContributesAndroidInjector fun sendAndListenProvider(): SendAndListen - @ContributesAndroidInjector fun setPreambleProvider(): SetPreamble - @ContributesAndroidInjector fun radioPacketProvider(): RadioPacket - @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AutomationModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AutomationModule.kt new file mode 100644 index 0000000000..bf54732d93 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AutomationModule.kt @@ -0,0 +1,71 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.general.automation.AutomationEvent +import info.nightscout.androidaps.plugins.general.automation.actions.* +import info.nightscout.androidaps.plugins.general.automation.elements.* +import info.nightscout.androidaps.plugins.general.automation.triggers.* +import info.nightscout.androidaps.queue.CommandQueue +import info.nightscout.androidaps.queue.commands.* + +@Module +@Suppress("unused") +abstract class AutomationModule { + @ContributesAndroidInjector abstract fun automationEventInjector(): AutomationEvent + + @ContributesAndroidInjector abstract fun triggerInjector(): Trigger + @ContributesAndroidInjector abstract fun triggerAutosensValueInjector(): TriggerAutosensValue + @ContributesAndroidInjector abstract fun triggerBgInjector(): TriggerBg + @ContributesAndroidInjector abstract fun triggerBolusAgoInjector(): TriggerBolusAgo + @ContributesAndroidInjector abstract fun triggerCOBInjector(): TriggerCOB + @ContributesAndroidInjector abstract fun triggerConnectorInjector(): TriggerConnector + @ContributesAndroidInjector abstract fun triggerDeltaInjector(): TriggerDelta + @ContributesAndroidInjector abstract fun triggerDummyInjector(): TriggerDummy + @ContributesAndroidInjector abstract fun triggerIobInjector(): TriggerIob + @ContributesAndroidInjector abstract fun triggerLocationInjector(): TriggerLocation + @ContributesAndroidInjector abstract fun triggerProfilePercentInjector(): TriggerProfilePercent + @ContributesAndroidInjector abstract fun triggerPumpLastConnectionInjector(): TriggerPumpLastConnection + @ContributesAndroidInjector abstract fun triggerBTDeviceInjector(): TriggerBTDevice + @ContributesAndroidInjector abstract fun triggerRecurringTimeInjector(): TriggerRecurringTime + @ContributesAndroidInjector abstract fun triggerTempTargetInjector(): TriggerTempTarget + @ContributesAndroidInjector abstract fun triggerTime(): TriggerTime + @ContributesAndroidInjector abstract fun triggerTimeRangeInjector(): TriggerTimeRange + @ContributesAndroidInjector abstract fun triggerWifiSsidInjector(): TriggerWifiSsid + + @ContributesAndroidInjector abstract fun actionInjector(): Action + @ContributesAndroidInjector abstract fun actionLoopDisableInjector(): ActionLoopDisable + @ContributesAndroidInjector abstract fun actionLoopEnableInjector(): ActionLoopEnable + @ContributesAndroidInjector abstract fun actionLoopResumeInjector(): ActionLoopResume + @ContributesAndroidInjector abstract fun actionLoopSuspendInjector(): ActionLoopSuspend + @ContributesAndroidInjector abstract fun actionNotificationInjector(): ActionNotification + @ContributesAndroidInjector abstract fun actionProfileSwitchInjector(): ActionProfileSwitch + @ContributesAndroidInjector abstract fun actionProfileSwitchPercentInjector(): ActionProfileSwitchPercent + @ContributesAndroidInjector abstract fun actionSendSMSInjector(): ActionSendSMS + @ContributesAndroidInjector abstract fun actionStartTempTargetInjector(): ActionStartTempTarget + @ContributesAndroidInjector abstract fun actionStopTempTargetInjector(): ActionStopTempTarget + @ContributesAndroidInjector abstract fun actionDummyInjector(): ActionDummy + + @ContributesAndroidInjector abstract fun elementInjector(): Element + @ContributesAndroidInjector abstract fun inputBgInjector(): InputBg + @ContributesAndroidInjector abstract fun inputButtonInjector(): InputButton + @ContributesAndroidInjector abstract fun comparatorInjector(): Comparator + @ContributesAndroidInjector abstract fun comparatorConnectInjector(): ComparatorConnect + @ContributesAndroidInjector abstract fun comparatorExistsInjector(): ComparatorExists + @ContributesAndroidInjector abstract fun inputDateTimeInjector(): InputDateTime + @ContributesAndroidInjector abstract fun inputDeltaInjector(): InputDelta + @ContributesAndroidInjector abstract fun inputDoubleInjector(): InputDouble + @ContributesAndroidInjector abstract fun inputDropdownMenuInjector(): InputDropdownMenu + @ContributesAndroidInjector abstract fun inputDurationInjector(): InputDuration + @ContributesAndroidInjector abstract fun inputInsulinInjector(): InputInsulin + @ContributesAndroidInjector abstract fun inputLocationModeInjector(): InputLocationMode + @ContributesAndroidInjector abstract fun inputPercentInjector(): InputPercent + @ContributesAndroidInjector abstract fun inputProfileNameInjector(): InputProfileName + @ContributesAndroidInjector abstract fun inputStringInjector(): InputString + @ContributesAndroidInjector abstract fun inputTempTargetInjector(): InputTempTarget + @ContributesAndroidInjector abstract fun inputTimeRangeInjector(): InputTimeRange + @ContributesAndroidInjector abstract fun inputTimeInjector(): InputTime + @ContributesAndroidInjector abstract fun inputWeekDayInjector(): InputWeekDay + @ContributesAndroidInjector abstract fun labelWithElementInjector(): LabelWithElement + @ContributesAndroidInjector abstract fun staticLabelInjector(): StaticLabel +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt new file mode 100644 index 0000000000..b0850bacc2 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt @@ -0,0 +1,32 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.data.PumpEnactResult +import info.nightscout.androidaps.queue.CommandQueue +import info.nightscout.androidaps.queue.commands.* + +@Module +@Suppress("unused") +abstract class CommandQueueModule { + + @ContributesAndroidInjector abstract fun pumpEnactResultInjector(): PumpEnactResult + + @ContributesAndroidInjector abstract fun commandQueueInjector(): CommandQueue + @ContributesAndroidInjector abstract fun commandBolusInjector(): CommandBolus + @ContributesAndroidInjector abstract fun commandCancelExtendedBolusInjector(): CommandCancelExtendedBolus + @ContributesAndroidInjector abstract fun commandCancelTempBasalInjector(): CommandCancelTempBasal + @ContributesAndroidInjector abstract fun commandExtendedBolusInjector(): CommandExtendedBolus + @ContributesAndroidInjector abstract fun commandInsightSetTBROverNotificationInjector(): CommandInsightSetTBROverNotification + @ContributesAndroidInjector abstract fun commandLoadEventsInjector(): CommandLoadEvents + @ContributesAndroidInjector abstract fun commandLoadHistoryInjector(): CommandLoadHistory + @ContributesAndroidInjector abstract fun commandLoadTDDsInjector(): CommandLoadTDDs + @ContributesAndroidInjector abstract fun commandReadStatusInjector(): CommandReadStatus + @ContributesAndroidInjector abstract fun commandSetProfileInjector(): CommandSetProfile + @ContributesAndroidInjector abstract fun commandCommandSMBBolusInjector(): CommandSMBBolus + @ContributesAndroidInjector abstract fun commandStartPumpInjector(): CommandStartPump + @ContributesAndroidInjector abstract fun commandStopPumpInjector(): CommandStopPump + @ContributesAndroidInjector abstract fun commandTempBasalAbsoluteInjector(): CommandTempBasalAbsolute + @ContributesAndroidInjector abstract fun commandTempBasalPercentInjector(): CommandTempBasalPercent + @ContributesAndroidInjector abstract fun commandSetUserSettingsInjector(): CommandSetUserSettings +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt new file mode 100644 index 0000000000..7a3f5ee5e3 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt @@ -0,0 +1,32 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.data.Profile +import info.nightscout.androidaps.data.ProfileStore +import info.nightscout.androidaps.db.BgReading +import info.nightscout.androidaps.db.CareportalEvent +import info.nightscout.androidaps.db.ProfileSwitch +import info.nightscout.androidaps.db.TemporaryBasal +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus +import info.nightscout.androidaps.plugins.treatments.Treatment +import info.nightscout.androidaps.utils.wizard.BolusWizard +import info.nightscout.androidaps.utils.wizard.QuickWizardEntry + +@Module +@Suppress("unused") +abstract class DataClassesModule { + + @ContributesAndroidInjector abstract fun profileInjector(): Profile + @ContributesAndroidInjector abstract fun glucoseStatusInjector(): GlucoseStatus + @ContributesAndroidInjector abstract fun profileStoreInjector(): ProfileStore + + @ContributesAndroidInjector abstract fun bgReadingInjector(): BgReading + @ContributesAndroidInjector abstract fun treatmentInjector(): Treatment + @ContributesAndroidInjector abstract fun profileSwitchInjector(): ProfileSwitch + @ContributesAndroidInjector abstract fun temporaryBasalInjector(): TemporaryBasal + @ContributesAndroidInjector abstract fun careportalEventInjector(): CareportalEvent + + @ContributesAndroidInjector abstract fun bolusWizardInjector(): BolusWizard + @ContributesAndroidInjector abstract fun quickWizardEntryInjector(): QuickWizardEntry +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt new file mode 100644 index 0000000000..7166906611 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt @@ -0,0 +1,40 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.general.automation.AutomationEvent +import info.nightscout.androidaps.plugins.general.automation.actions.* +import info.nightscout.androidaps.plugins.general.automation.elements.* +import info.nightscout.androidaps.plugins.general.automation.triggers.* +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse +import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.* +import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager +import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask +import info.nightscout.androidaps.queue.CommandQueue +import info.nightscout.androidaps.queue.commands.* + +@Module +@Suppress("unused") +abstract class MedtronicModule { + @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager + @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager + @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask + @ContributesAndroidInjector abstract fun serviceTaskProvider(): ServiceTask + @ContributesAndroidInjector abstract fun pumpTaskProvider(): PumpTask + @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask + @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): InitializePumpManagerTask + @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): ResetRileyLinkConfigurationTask + @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): WakeAndTuneTask + @ContributesAndroidInjector abstract fun radioResponseProvider(): RadioResponse + @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): RileyLinkBLE + @ContributesAndroidInjector abstract fun rfSpyProvider(): RFSpy + @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen + @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble + @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt new file mode 100644 index 0000000000..d9524092dc --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt @@ -0,0 +1,24 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.constraints.objectives.objectives.* + +@Module +@Suppress("unused") +abstract class ObjectivesModule { + + @ContributesAndroidInjector abstract fun objectiveInjector(): Objective + @ContributesAndroidInjector abstract fun objective0Injector(): Objective0 + @ContributesAndroidInjector abstract fun objective1Injector(): Objective1 + @ContributesAndroidInjector abstract fun objective2Injector(): Objective2 + @ContributesAndroidInjector abstract fun objective3Injector(): Objective3 + @ContributesAndroidInjector abstract fun objective4Injector(): Objective4 + @ContributesAndroidInjector abstract fun objective5Injector(): Objective5 + @ContributesAndroidInjector abstract fun objective6Injector(): Objective6 + @ContributesAndroidInjector abstract fun objective7Injector(): Objective7 + @ContributesAndroidInjector abstract fun objective8Injector(): Objective8 + @ContributesAndroidInjector abstract fun objective9Injector(): Objective9 + @ContributesAndroidInjector abstract fun objective10Injector(): Objective10 + +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt new file mode 100644 index 0000000000..d022d3a726 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt @@ -0,0 +1,22 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.aps.loop.APSResult +import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA +import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS +import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB +import info.nightscout.androidaps.plugins.constraints.objectives.objectives.* +import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData +import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread +import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread + +@Module +@Suppress("unused") +abstract class OverviewModule { + @ContributesAndroidInjector abstract fun notificationWithActionInjector(): NotificationWithAction + + @ContributesAndroidInjector abstract fun graphDataInjector(): GraphData +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt new file mode 100644 index 0000000000..fa2df68ef0 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt @@ -0,0 +1,18 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs +import info.nightscout.androidaps.plugins.general.maintenance.formats.ClassicPrefsFormat +import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat +import info.nightscout.androidaps.utils.CryptoUtil + +@Module +@Suppress("unused") +abstract class PreferencesModule { + + @ContributesAndroidInjector abstract fun cryptoUtilInjector(): CryptoUtil + @ContributesAndroidInjector abstract fun importExportPrefsInjector(): ImportExportPrefs + @ContributesAndroidInjector abstract fun encryptedPrefsFormatInjector(): EncryptedPrefsFormat + @ContributesAndroidInjector abstract fun classicPrefsFormatInjector(): ClassicPrefsFormat +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SMSModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SMSModule.kt new file mode 100644 index 0000000000..155015ea63 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SMSModule.kt @@ -0,0 +1,12 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.plugins.general.smsCommunicator.AuthRequest + +@Module +@Suppress("unused") +abstract class SMSModule { + + @ContributesAndroidInjector abstract fun authRequestInjector(): AuthRequest +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt new file mode 100644 index 0000000000..66c99d5e17 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt @@ -0,0 +1,27 @@ +package info.nightscout.androidaps.dependencyInjection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import info.nightscout.androidaps.setupwizard.SWEventListener +import info.nightscout.androidaps.setupwizard.SWScreen +import info.nightscout.androidaps.setupwizard.elements.* + +@Module +@Suppress("unused") +abstract class WizardModule { + + @ContributesAndroidInjector abstract fun swBreakInjector(): SWBreak + @ContributesAndroidInjector abstract fun swButtonInjector(): SWButton + @ContributesAndroidInjector abstract fun swEditNumberWithUnitsInjector(): SWEditNumberWithUnits + @ContributesAndroidInjector abstract fun swEditStringInjector(): SWEditString + @ContributesAndroidInjector abstract fun swEditEncryptedPasswordInjector(): SWEditEncryptedPassword + @ContributesAndroidInjector abstract fun swEditUrlInjector(): SWEditUrl + @ContributesAndroidInjector abstract fun swFragmentInjector(): SWFragment + @ContributesAndroidInjector abstract fun swHtmlLinkInjector(): SWHtmlLink + @ContributesAndroidInjector abstract fun swInfotextInjector(): SWInfotext + @ContributesAndroidInjector abstract fun swItemInjector(): SWItem + @ContributesAndroidInjector abstract fun swPluginInjector(): SWPlugin + @ContributesAndroidInjector abstract fun swRadioButtonInjector(): SWRadioButton + @ContributesAndroidInjector abstract fun swScreenInjector(): SWScreen + @ContributesAndroidInjector abstract fun swEventListenerInjector(): SWEventListener +} \ No newline at end of file