From e5f3545cd321520a0479b108185a58ec97c98c6f Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 24 Sep 2023 22:55:31 +0200 Subject: [PATCH] :core:interfaces unify package --- app/src/main/kotlin/app/aaps/MainActivity.kt | 38 +++---- app/src/main/kotlin/app/aaps/MainApp.kt | 28 ++--- .../aaps/activities/HistoryBrowseActivity.kt | 36 +++--- .../app/aaps/activities/HistoryBrowserData.kt | 20 ++-- .../aaps/activities/MyPreferenceFragment.kt | 30 ++--- app/src/main/kotlin/app/aaps/di/AppModule.kt | 8 +- .../kotlin/app/aaps/di/PluginsListModule.kt | 2 +- .../app/aaps/implementations/ConfigImpl.kt | 4 +- .../aaps/implementations/InstantiatorImpl.kt | 10 +- .../aaps/implementations/UiInteractionImpl.kt | 8 +- .../kotlin/app/aaps/receivers/BTReceiver.kt | 4 +- .../aaps/receivers/ChargingStateReceiver.kt | 10 +- .../kotlin/app/aaps/receivers/DataReceiver.kt | 6 +- .../app/aaps/receivers/KeepAliveWorker.kt | 30 ++--- .../receivers/TimeDateOrTZChangeReceiver.kt | 10 +- .../aaps/workflow/CalculationWorkflowImpl.kt | 28 ++--- .../maintenance/MaintenancePluginTest.kt | 12 +- core/interfaces/build.gradle | 2 +- .../aaps/core/interfaces/actions/Actions.kt | 3 + .../interfaces/alerts/LocalAlertUtils.kt | 2 +- .../androidPermissions/AndroidPermission.kt | 4 +- .../app/aaps/{ => core}/interfaces/aps/APS.kt | 2 +- .../{ => core}/interfaces/aps/APSResult.kt | 6 +- .../aaps/{ => core}/interfaces/aps/ApsMode.kt | 2 +- .../{ => core}/interfaces/aps/AutosensData.kt | 2 +- .../interfaces/aps/AutosensDataStore.kt | 8 +- .../interfaces/aps/AutosensResult.kt | 2 +- .../{ => core}/interfaces/aps/BasalData.kt | 2 +- .../interfaces/aps/DetermineBasalAdapter.kt | 10 +- .../aaps/{ => core}/interfaces/aps/Loop.kt | 8 +- .../{ => core}/interfaces/aps/SMBDefaults.kt | 2 +- .../{ => core}/interfaces/aps/Sensitivity.kt | 4 +- .../aps/VariableSensitivityResult.kt | 2 +- .../interfaces/automation/Automation.kt | 2 +- .../interfaces/automation/AutomationEvent.kt | 2 +- .../interfaces/autotune/Autotune.kt | 2 +- .../bgQualityCheck/BgQualityCheck.kt | 2 +- .../interfaces/configuration/Config.kt | 2 +- .../interfaces/configuration/ConfigBuilder.kt | 6 +- .../configuration/ConfigExportImport.kt | 2 +- .../interfaces/configuration/Constants.kt | 2 +- .../interfaces/constraints/Constraint.kt | 2 +- .../constraints/ConstraintsChecker.kt | 4 +- .../interfaces/constraints/Objectives.kt | 2 +- .../constraints/PluginConstraints.kt | 4 +- .../core/interfaces/constraints/Safety.kt | 5 + .../{ => core}/interfaces/db/GlucoseUnit.kt | 2 +- .../interfaces/db/PersistenceLayer.kt | 4 +- .../interfaces/extensions/UIUtils.kt | 2 +- .../{ => core}/interfaces/insulin/Insulin.kt | 6 +- .../aaps/{ => core}/interfaces/iob/CobInfo.kt | 2 +- .../interfaces/iob/GlucoseStatus.kt | 2 +- .../interfaces/iob/GlucoseStatusProvider.kt | 2 +- .../interfaces/iob/InMemoryGlucoseValue.kt | 2 +- .../app/aaps/{ => core}/interfaces/iob/Iob.kt | 2 +- .../interfaces/iob/IobCobCalculator.kt | 12 +- .../{ => core}/interfaces/iob/IobTotal.kt | 2 +- .../{ => core}/interfaces/iob/MealData.kt | 2 +- .../interfaces/logging/AAPSLogger.kt | 2 +- .../aaps/{ => core}/interfaces/logging/L.kt | 2 +- .../{ => core}/interfaces/logging/LTag.kt | 2 +- .../interfaces/logging/LogElement.kt | 2 +- .../interfaces/logging/LoggerUtils.kt | 2 +- .../interfaces/logging/UserEntryLogger.kt | 6 +- .../maintenance/ImportExportPrefs.kt | 4 +- .../maintenance/PrefFileListProvider.kt | 4 +- .../interfaces/maintenance/PrefMetadata.kt | 2 +- .../interfaces/maintenance/PrefsFile.kt | 2 +- .../interfaces/maintenance/PrefsImportDir.kt | 2 +- .../maintenance/PrefsMetadataKey.kt | 2 +- .../interfaces/maintenance/PrefsStatus.kt | 2 +- .../interfaces/notifications/Notification.kt | 2 +- .../notifications/NotificationHolder.kt | 2 +- .../notifications/NotificationUserMessage.kt | 2 +- .../{ => core}/interfaces/nsclient/NSAlarm.kt | 2 +- .../interfaces/nsclient/NSSettingsStatus.kt | 2 +- .../{ => core}/interfaces/nsclient/NSSgv.kt | 2 +- .../nsclient/ProcessedDeviceStatusData.kt | 4 +- .../interfaces/nsclient/StoreDataForDb.kt | 2 +- .../interfaces/objects/Instantiator.kt | 8 +- .../interfaces/overview/Overview.kt | 6 +- .../interfaces/overview/OverviewMenus.kt | 2 +- .../interfaces/plugin/ActivePlugin.kt | 28 ++--- .../interfaces/plugin/OwnDatabasePlugin.kt | 2 +- .../interfaces/plugin/PluginBase.kt | 8 +- .../interfaces/plugin/PluginDescription.kt | 2 +- .../interfaces/plugin/PluginFragment.kt | 2 +- .../interfaces/plugin/PluginType.kt | 2 +- .../interfaces/profile/DefaultValueHelper.kt | 2 +- .../{ => core}/interfaces/profile/Profile.kt | 18 +-- .../interfaces/profile/ProfileFunction.kt | 4 +- .../interfaces/profile/ProfileSource.kt | 2 +- .../interfaces/profile/ProfileStore.kt | 2 +- .../interfaces/profile/ProfileUtil.kt | 6 +- .../interfaces/profile/PureProfile.kt | 4 +- .../core/interfaces/profiling/Profiler.kt | 8 ++ .../interfaces/protection/PasswordCheck.kt | 2 +- .../interfaces/protection/ProtectionCheck.kt | 2 +- .../{ => core}/interfaces/pump/BlePreCheck.kt | 2 +- .../interfaces/pump/BolusProgressData.kt | 2 +- .../aaps/{ => core}/interfaces/pump/Dana.kt | 2 +- .../interfaces/pump/DetailedBolusInfo.kt | 4 +- .../pump/DetailedBolusInfoStorage.kt | 2 +- .../{ => core}/interfaces/pump/Diaconn.kt | 2 +- .../{ => core}/interfaces/pump/Insight.kt | 2 +- .../{ => core}/interfaces/pump/Medtrum.kt | 2 +- .../aaps/core/interfaces/pump/OmnipodDash.kt | 3 + .../{ => core}/interfaces/pump/OmnipodEros.kt | 2 +- .../aaps/{ => core}/interfaces/pump/Pump.kt | 18 +-- .../interfaces/pump/PumpEnactResult.kt | 2 +- .../interfaces/pump/PumpPluginBase.kt | 16 +-- .../{ => core}/interfaces/pump/PumpSync.kt | 12 +- .../interfaces/pump/TemporaryBasalStorage.kt | 2 +- .../{ => core}/interfaces/pump/VirtualPump.kt | 2 +- .../{ => core}/interfaces/pump/WarnColors.kt | 2 +- .../interfaces/pump/actions/CustomAction.kt | 2 +- .../pump/actions/CustomActionType.kt | 2 +- .../interfaces/pump/defs/DoseSettings.kt | 2 +- .../interfaces/pump/defs/DoseStepSize.kt | 2 +- .../interfaces/pump/defs/ManufacturerType.kt | 2 +- .../interfaces/pump/defs/PumpCapability.kt | 2 +- .../interfaces/pump/defs/PumpDescription.kt | 2 +- .../interfaces/pump/defs/PumpTempBasalType.kt | 2 +- .../interfaces/pump/defs/PumpType.kt | 4 +- .../{ => core}/interfaces/queue/Callback.kt | 4 +- .../{ => core}/interfaces/queue/Command.kt | 6 +- .../interfaces/queue/CommandQueue.kt | 8 +- .../interfaces/queue/CustomCommand.kt | 6 +- .../interfaces/receivers/Intents.kt | 2 +- .../receivers/ReceiverStatusStore.kt | 6 +- .../interfaces/resources/ResourceHelper.kt | 2 +- .../interfaces/rx/AapsSchedulers.kt | 2 +- .../{ => core}/interfaces/rx/bus/RxBus.kt | 4 +- .../{ => core}/interfaces/rx/events/Event.kt | 2 +- .../rx/events/EventAcceptOpenLoopChange.kt | 3 + .../core/interfaces/rx/events/EventAppExit.kt | 3 + .../rx/events/EventAppInitialized.kt | 3 + .../EventAutosensCalculationFinished.kt | 2 +- .../interfaces/rx/events/EventBTChange.kt | 2 +- .../rx/events/EventBucketedDataCreated.kt | 3 + .../rx/events/EventChargingState.kt | 2 +- .../rx/events/EventConfigBuilderChange.kt | 3 + .../rx/events/EventCustomActionsChanged.kt | 3 + .../events/EventCustomCalculationFinished.kt | 2 +- .../rx/events/EventDanaRSyncStatus.kt | 2 +- .../rx/events/EventDeviceStatusChange.kt | 3 + .../rx/events/EventDiaconnG8PumpLogReset.kt | 2 +- .../EventDismissBolusProgressIfRunning.kt | 2 +- .../rx/events/EventDismissNotification.kt | 2 +- .../EventEffectiveProfileSwitchChanged.kt | 2 +- .../rx/events/EventExtendedBolusChange.kt | 2 +- .../rx/events/EventFoodDatabaseChanged.kt | 3 + .../rx/events/EventInitializationChanged.kt | 2 +- .../rx/events/EventLocalProfileChanged.kt | 3 + .../interfaces/rx/events/EventLoop.kt | 2 +- .../rx/events/EventLoopUpdateGui.kt | 2 +- .../rx/events/EventMobileDataToWear.kt | 5 + .../interfaces/rx/events/EventMobileToWear.kt | 5 + .../rx/events/EventNSClientNewLog.kt | 2 +- .../rx/events/EventNSClientRestart.kt | 3 + .../rx/events/EventNetworkChange.kt | 2 +- .../interfaces/rx/events/EventNewBG.kt | 2 +- .../rx/events/EventNewHistoryData.kt | 2 +- .../rx/events/EventNewOpenLoopNotification.kt | 2 +- .../interfaces/rx/events/EventNtpStatus.kt | 2 +- .../rx/events/EventOfflineChange.kt | 3 + .../rx/events/EventOverviewBolusProgress.kt | 2 +- .../rx/events/EventPreferenceChange.kt | 2 +- .../rx/events/EventProfileStoreChanged.kt | 3 + .../rx/events/EventProfileSwitchChanged.kt | 3 + .../rx/events/EventPumpStatusChanged.kt | 4 +- .../interfaces/rx/events/EventQueueChanged.kt | 3 + .../interfaces/rx/events/EventRebuildTabs.kt | 2 +- .../rx/events/EventRefreshButtonState.kt | 2 +- .../rx/events/EventRefreshOverview.kt | 2 +- .../interfaces/rx/events/EventSWRLStatus.kt | 2 +- .../interfaces/rx/events/EventSWSyncStatus.kt | 2 +- .../interfaces/rx/events/EventSWUpdate.kt | 2 +- .../interfaces/rx/events/EventScale.kt | 2 +- .../interfaces/rx/events/EventStatus.kt | 2 +- .../rx/events/EventTempBasalChange.kt | 3 + .../rx/events/EventTempTargetChange.kt | 3 + .../interfaces/rx/events/EventThemeSwitch.kt | 3 + .../rx/events/EventTherapyEventChange.kt | 3 + .../rx/events/EventTreatmentChange.kt | 3 + .../interfaces/rx/events/EventUpdateGui.kt | 2 +- .../events/EventUpdateOverviewCalcProgress.kt | 2 +- .../rx/events/EventUpdateOverviewGraph.kt | 2 +- .../rx/events/EventUpdateOverviewIobCob.kt | 2 +- .../events/EventUpdateOverviewSensitivity.kt | 2 +- .../rx/events/EventWearCwfExported.kt | 5 + .../rx/events/EventWearDataToMobile.kt | 5 + .../interfaces/rx/events/EventWearToMobile.kt | 5 + .../rx/events/EventWearUpdateGui.kt | 4 +- .../interfaces/rx/events/EventXdripNewLog.kt | 2 +- .../rx/weardata/CustomWatchfaceFormat.kt | 4 +- .../interfaces/rx/weardata/EventData.kt | 4 +- .../interfaces/sharedPreferences/SP.kt | 2 +- .../interfaces/smoothing/Smoothing.kt | 4 +- .../interfaces/smsCommunicator/Sms.kt | 2 +- .../smsCommunicator/SmsCommunicator.kt | 2 +- .../{ => core}/interfaces/source/BgSource.kt | 2 +- .../interfaces/source/DexcomBoyda.kt | 2 +- .../interfaces/source/NSClientSource.kt | 2 +- .../interfaces/source/XDripSource.kt | 2 +- .../{ => core}/interfaces/stats/DexcomTIR.kt | 4 +- .../interfaces/stats/DexcomTirCalculator.kt | 2 +- .../aaps/{ => core}/interfaces/stats/TIR.kt | 6 +- .../interfaces/stats/TddCalculator.kt | 2 +- .../interfaces/stats/TirCalculator.kt | 2 +- .../{ => core}/interfaces/storage/Storage.kt | 2 +- .../interfaces/sync/DataSyncSelector.kt | 2 +- .../interfaces/sync/DataSyncSelectorXdrip.kt | 2 +- .../{ => core}/interfaces/sync/NsClient.kt | 8 +- .../aaps/{ => core}/interfaces/sync/Sync.kt | 2 +- .../app/aaps/core/interfaces/sync/Tidepool.kt | 3 + .../interfaces/sync/XDripBroadcast.kt | 2 +- .../{ => core}/interfaces/ui/IconsProvider.kt | 2 +- .../{ => core}/interfaces/ui/UiInteraction.kt | 4 +- .../interfaces/userEntry/UserEntryMapper.kt | 2 +- .../userEntry/UserEntryPresentationHelper.kt | 2 +- .../userEntry/ValueWithUnitMapper.kt | 4 +- .../{ => core}/interfaces/utils/DateUtil.kt | 4 +- .../interfaces/utils/DecimalFormatter.kt | 2 +- .../{ => core}/interfaces/utils/HardLimits.kt | 2 +- .../interfaces/utils/MidnightTime.kt | 2 +- .../aaps/{ => core}/interfaces/utils/Round.kt | 2 +- .../{ => core}/interfaces/utils/SafeParse.kt | 2 +- .../app/aaps/{ => core}/interfaces/utils/T.kt | 2 +- .../interfaces/utils/TimeChangeType.kt | 2 +- .../{ => core}/interfaces/utils/Translator.kt | 2 +- .../interfaces/utils/TrendCalculator.kt | 6 +- .../versionChecker/VersionCheckerUtils.kt | 2 +- .../app/aaps/interfaces/actions/Actions.kt | 3 - .../app/aaps/interfaces/constraints/Safety.kt | 5 - .../app/aaps/interfaces/profiling/Profiler.kt | 8 -- .../app/aaps/interfaces/pump/OmnipodDash.kt | 3 - .../rx/events/EventAcceptOpenLoopChange.kt | 3 - .../aaps/interfaces/rx/events/EventAppExit.kt | 3 - .../rx/events/EventAppInitialized.kt | 3 - .../rx/events/EventBucketedDataCreated.kt | 3 - .../rx/events/EventConfigBuilderChange.kt | 3 - .../rx/events/EventCustomActionsChanged.kt | 3 - .../rx/events/EventDeviceStatusChange.kt | 3 - .../rx/events/EventFoodDatabaseChanged.kt | 3 - .../rx/events/EventLocalProfileChanged.kt | 3 - .../rx/events/EventMobileDataToWear.kt | 5 - .../interfaces/rx/events/EventMobileToWear.kt | 5 - .../rx/events/EventNSClientRestart.kt | 3 - .../rx/events/EventOfflineChange.kt | 3 - .../rx/events/EventProfileStoreChanged.kt | 3 - .../rx/events/EventProfileSwitchChanged.kt | 3 - .../interfaces/rx/events/EventQueueChanged.kt | 3 - .../rx/events/EventTempBasalChange.kt | 3 - .../rx/events/EventTempTargetChange.kt | 3 - .../interfaces/rx/events/EventThemeSwitch.kt | 3 - .../rx/events/EventTherapyEventChange.kt | 3 - .../rx/events/EventTreatmentChange.kt | 3 - .../rx/events/EventWearCwfExported.kt | 5 - .../rx/events/EventWearDataToMobile.kt | 5 - .../interfaces/rx/events/EventWearToMobile.kt | 5 - .../app/aaps/interfaces/sync/Tidepool.kt | 3 - .../interfaces/rx/RxSchedulerRule.kt | 2 +- .../interfaces/rx/weardata/EventDataTest.kt | 2 +- .../interfaces/utils/SafeParseTest.kt | 2 +- .../core/main/constraints/ConstraintObject.kt | 6 +- .../core/main/di/CoreDataClassesModule.kt | 2 +- .../events/EventIobCalculationProgress.kt | 2 +- .../core/main/events/EventNewNotification.kt | 4 +- .../core/main/extensions/BlockExtension.kt | 4 +- .../core/main/extensions/BolusExtension.kt | 6 +- .../main/extensions/ExtendedBolusExtension.kt | 14 +-- .../main/extensions/GlucoseValueExtension.kt | 8 +- .../main/extensions/ProfileSwitchExtension.kt | 12 +- .../extensions/TemporaryBasalExtension.kt | 14 +-- .../extensions/TemporaryTargetExtension.kt | 10 +- .../main/extensions/TherapyEventExtension.kt | 4 +- .../app/aaps/core/main/graph/ActivityGraph.kt | 4 +- .../aaps/core/main/graph/BasalProfileGraph.kt | 4 +- .../aaps/core/main/graph/IcProfileGraph.kt | 4 +- .../aaps/core/main/graph/IsfProfileGraph.kt | 8 +- .../app/aaps/core/main/graph/OverviewData.kt | 12 +- .../core/main/graph/TargetBgProfileGraph.kt | 8 +- .../core/main/graph/data/BolusDataPoint.kt | 8 +- .../core/main/graph/data/CarbsDataPoint.kt | 2 +- .../data/EffectiveProfileSwitchDataPoint.kt | 6 +- .../main/graph/data/ExtendedBolusDataPoint.kt | 4 +- .../main/graph/data/GlucoseValueDataPoint.kt | 8 +- .../main/graph/data/HeartRateDataPoint.kt | 2 +- .../data/InMemoryGlucoseValueDataPoint.kt | 12 +- .../main/graph/data/TherapyEventDataPoint.kt | 8 +- .../aaps/core/main/iob/CobInfoExtension.kt | 6 +- .../core/main/iob/GlucoseStatusExtension.kt | 6 +- .../aaps/core/main/iob/IobTotalExtension.kt | 6 +- .../aaps/core/main/profile/ProfileSealed.kt | 24 ++-- .../main/pump/PumpEnactResultExtension.kt | 6 +- .../aaps/core/main/pump/PumpTypeExtension.kt | 2 +- .../aaps/core/main/utils/ActionModeHelper.kt | 2 +- .../app/aaps/core/main/utils/CryptoUtil.kt | 2 +- .../core/main/utils/extensions/HtmlString.kt | 2 +- .../main/utils/extensions/JSONObjectExt.kt | 4 +- .../core/main/utils/fabric/FabricPrivacy.kt | 8 +- .../core/main/utils/worker/LoggingWorker.kt | 4 +- .../app/aaps/core/main/wizard/BolusWizard.kt | 58 +++++----- .../app/aaps/core/main/wizard/QuickWizard.kt | 2 +- .../aaps/core/main/wizard/QuickWizardEntry.kt | 20 ++-- .../core/main/workflow/CalculationWorkflow.kt | 4 +- .../main/extensions/BlockExtensionKtTest.kt | 2 +- .../aaps/core/main/utils/DateUtilImplTest.kt | 6 +- .../aaps/core/main/wizard/QuickWizardTest.kt | 6 +- .../iob/InMemoryGlucoseValueDataPointTest.kt | 10 +- .../kotlin/app/aaps/interfaces/iob/IobTest.kt | 2 +- .../app/aaps/interfaces/iob/IobTotalTest.kt | 4 +- .../app/aaps/interfaces/iob/MealDataTest.kt | 2 +- .../plugin/PluginDescriptionTest.kt | 2 +- .../interfaces/profile/ProfileSealedTest.kt | 14 +-- .../interfaces/pump/DetailedBolusInfoTest.kt | 2 +- .../pump/defs/PumpDescriptionTest.kt | 2 +- .../aaps/interfaces/utils/MidnightTimeTest.kt | 2 +- .../app/aaps/interfaces/utils/RoundTest.kt | 2 +- .../kotlin/app/aaps/interfaces/utils/TTest.kt | 2 +- .../validators/DefaultEditTextValidator.kt | 2 +- .../ValidatingEditTextPreference.kt | 4 +- .../validators/validators/BgRangeValidator.kt | 2 +- .../validators/FloatNumericRangeValidator.kt | 2 +- .../implementation/DefaultValueHelperImpl.kt | 10 +- .../implementation/HardLimitsImpl.kt | 10 +- .../implementation/LocalAlertUtilsImpl.kt | 32 +++--- .../implementation/TranslatorImpl.kt | 8 +- .../implementation/TrendCalculatorImpl.kt | 10 +- .../implementation/UserEntryLoggerImpl.kt | 12 +- .../NotificationHolderImpl.kt | 8 +- .../implementation/db/CompatDBHelper.kt | 32 +++--- .../implementation/db/PersistenceLayerImpl.kt | 10 +- .../implementation/di/ImplementationModule.kt | 62 +++++------ .../iob/GlucoseStatusProviderImpl.kt | 14 +-- .../lifecycle/ProcessLifecycleListener.kt | 2 +- .../implementation/logging/LoggerUtilsImpl.kt | 4 +- .../overview/OverviewDataImpl.kt | 30 ++--- .../implementation/plugin/PluginStore.kt | 40 +++---- .../profile/ProfileFunctionImpl.kt | 34 +++--- .../profile/ProfileStoreObject.kt | 18 +-- .../implementation/profile/ProfileUtilImpl.kt | 8 +- .../implementation/profiling/ProfilerImpl.kt | 6 +- .../protection/BiometricCheck.kt | 4 +- .../protection/PasswordCheckImpl.kt | 4 +- .../protection/ProtectionCheckImpl.kt | 8 +- .../implementation/pump/BlePreCheckImpl.kt | 4 +- .../pump/DetailedBolusInfoStorageImpl.kt | 14 +-- .../pump/PumpSyncImplementation.kt | 30 ++--- .../pump/TemporaryBasalStorageImpl.kt | 10 +- .../implementation/pump/WarnColorsImpl.kt | 6 +- .../queue/CommandQueueImplementation.kt | 60 +++++----- .../implementation/queue/QueueThread.kt | 28 ++--- .../queue/commands/CommandBolus.kt | 18 +-- .../commands/CommandCancelExtendedBolus.kt | 10 +- .../queue/commands/CommandCancelTempBasal.kt | 10 +- .../queue/commands/CommandClearAlarms.kt | 12 +- .../queue/commands/CommandCustomCommand.kt | 12 +- .../queue/commands/CommandDeactivate.kt | 12 +- .../queue/commands/CommandExtendedBolus.kt | 10 +- .../CommandInsightSetTBROverNotification.kt | 12 +- .../queue/commands/CommandLoadEvents.kt | 16 +-- .../queue/commands/CommandLoadHistory.kt | 14 +-- .../queue/commands/CommandLoadTDDs.kt | 10 +- .../queue/commands/CommandReadStatus.kt | 14 +-- .../queue/commands/CommandSMBBolus.kt | 16 +-- .../queue/commands/CommandSetProfile.kt | 20 ++-- .../queue/commands/CommandSetUserSettings.kt | 16 +-- .../queue/commands/CommandStartPump.kt | 12 +- .../queue/commands/CommandStopPump.kt | 12 +- .../commands/CommandTempBasalAbsolute.kt | 14 +-- .../queue/commands/CommandTempBasalPercent.kt | 14 +-- .../queue/commands/CommandUpdateTime.kt | 12 +- .../receivers/NetworkChangeReceiver.kt | 10 +- .../receivers/ReceiverStatusStoreImpl.kt | 8 +- .../resources/IconsProviderImplementation.kt | 4 +- .../resources/ResourceHelperImpl.kt | 2 +- .../stats/DexcomTirCalculatorImpl.kt | 12 +- .../implementation/stats/DexcomTirImpl.kt | 6 +- .../implementation/stats/TddCalculatorImpl.kt | 22 ++-- .../implementation/stats/TirCalculatorImpl.kt | 16 +-- .../implementation/stats/TirImpl.kt | 8 +- .../stats/TotalDailyDoseExtension.kt | 6 +- .../implementation/storage/FileStorage.kt | 2 +- .../UserEntryPresentationHelperImpl.kt | 20 ++-- .../utils/DecimalFormatterImpl.kt | 4 +- .../implementation/iob/GlucoseStatusTest.kt | 10 +- .../overview/OverviewDataImplTest.kt | 10 +- .../profile/ProfileStoreTest.kt | 2 +- .../profile/ProfileUtilImplTest.kt | 6 +- .../pump/DetailedBolusInfoStorageTest.kt | 6 +- .../pump/TemporaryBasalStorageTest.kt | 2 +- .../queue/CommandQueueImplementationTest.kt | 40 +++---- .../implementation/queue/QueueThreadTest.kt | 14 +-- .../utils/DecimalFormatterTest.kt | 4 +- .../implementation/wizard/BolusWizardTest.kt | 16 +-- .../interfaces/pump/PumpEnactResultTest.kt | 2 +- .../pump/insight/InsightAlertService.java | 6 +- .../pump/insight/LocalInsightFragment.java | 16 +-- .../pump/insight/LocalInsightPlugin.java | 62 +++++------ .../activities/InsightPairingActivity.java | 4 +- .../InsightConnectionService.java | 6 +- .../events/EventLocalInsightUpdateGUI.kt | 2 +- .../plugins/pump/insight/utils/AlertUtils.kt | 2 +- .../nightscout/plugins/aps/APSResultObject.kt | 28 ++--- .../nightscout/plugins/aps/OpenAPSFragment.kt | 16 +-- .../nightscout/plugins/aps/di/ApsModule.kt | 4 +- .../aps/events/EventOpenAPSUpdateGui.kt | 2 +- .../aps/events/EventResetOpenAPSGui.kt | 2 +- .../plugins/aps/logger/LoggerCallback.kt | 4 +- .../aps/loop/CarbSuggestionReceiver.kt | 2 +- .../plugins/aps/loop/LoopFragment.kt | 18 +-- .../nightscout/plugins/aps/loop/LoopPlugin.kt | 84 +++++++------- .../aps/loop/events/EventLoopSetLastRunGui.kt | 2 +- .../extensions/PumpEnactResultExtension.kt | 4 +- .../openAPSAMA/DetermineBasalAdapterAMAJS.kt | 26 ++--- .../aps/openAPSAMA/DetermineBasalResultAMA.kt | 2 +- .../aps/openAPSAMA/OpenAPSAMAPlugin.kt | 46 ++++---- .../openAPSSMB/DetermineBasalAdapterSMBJS.kt | 30 ++--- .../aps/openAPSSMB/DetermineBasalResultSMB.kt | 4 +- .../aps/openAPSSMB/OpenAPSSMBPlugin.kt | 52 ++++----- .../DetermineBasalAdapterSMBDynamicISFJS.kt | 32 +++--- .../OpenAPSSMBDynamicISFPlugin.kt | 32 +++--- .../plugins/aps/utils/JSONFormatter.kt | 2 +- .../plugins/general/autotune/AutotuneCore.kt | 4 +- .../plugins/general/autotune/AutotuneFS.kt | 4 +- .../general/autotune/AutotuneFragment.kt | 40 +++---- .../plugins/general/autotune/AutotuneIob.kt | 22 ++-- .../general/autotune/AutotunePlugin.kt | 40 +++---- .../plugins/general/autotune/AutotunePrep.kt | 10 +- .../general/autotune/data/ATProfile.kt | 36 +++--- .../plugins/general/autotune/data/BGDatum.kt | 4 +- .../plugins/general/autotune/data/CRDatum.kt | 2 +- .../general/autotune/data/LocalInsulin.kt | 2 +- .../general/autotune/data/PreppedGlucose.kt | 2 +- .../autotune/events/EventAutotuneUpdateGui.kt | 2 +- .../plugins/aps/loop/LoopPluginTest.kt | 30 ++--- .../general/autotune/AutotuneCoreTest.kt | 8 +- .../general/autotune/AutotunePrepTest.kt | 16 +-- .../nightscout/automation/AutomationEvent.kt | 8 +- .../automation/AutomationFragment.kt | 10 +- .../nightscout/automation/AutomationPlugin.kt | 46 ++++---- .../nightscout/automation/actions/Action.kt | 6 +- .../automation/actions/ActionAlarm.kt | 10 +- .../actions/ActionCarePortalEvent.kt | 16 +-- .../automation/actions/ActionDummy.kt | 2 +- .../automation/actions/ActionLoopDisable.kt | 20 ++-- .../automation/actions/ActionLoopEnable.kt | 18 +-- .../automation/actions/ActionLoopResume.kt | 18 +-- .../automation/actions/ActionLoopSuspend.kt | 12 +- .../automation/actions/ActionNotification.kt | 10 +- .../automation/actions/ActionProfileSwitch.kt | 14 +-- .../actions/ActionProfileSwitchPercent.kt | 10 +- .../automation/actions/ActionRunAutotune.kt | 16 +-- .../automation/actions/ActionSendSMS.kt | 6 +- .../actions/ActionStartTempTarget.kt | 20 ++-- .../actions/ActionStopProcessing.kt | 4 +- .../actions/ActionStopTempTarget.kt | 10 +- .../automation/di/AutomationModule.kt | 2 +- .../automation/dialogs/BaseDialog.kt | 4 +- .../automation/dialogs/ChooseActionDialog.kt | 2 +- .../dialogs/ChooseOperationDialog.kt | 2 +- .../automation/dialogs/EditActionDialog.kt | 2 +- .../automation/dialogs/EditEventDialog.kt | 6 +- .../automation/dialogs/EditTriggerDialog.kt | 4 +- .../automation/elements/Comparator.kt | 2 +- .../automation/elements/ComparatorConnect.kt | 2 +- .../automation/elements/ComparatorExists.kt | 2 +- .../nightscout/automation/elements/InputBg.kt | 4 +- .../elements/InputCarePortalMenu.kt | 2 +- .../automation/elements/InputDateTime.kt | 4 +- .../automation/elements/InputDelta.kt | 2 +- .../automation/elements/InputDropdownMenu.kt | 2 +- .../automation/elements/InputLocationMode.kt | 2 +- .../automation/elements/InputProfileName.kt | 4 +- .../automation/elements/InputTempTarget.kt | 6 +- .../automation/elements/InputTime.kt | 6 +- .../automation/elements/InputTimeRange.kt | 6 +- .../automation/elements/LabelWithElement.kt | 2 +- .../automation/elements/StaticLabel.kt | 2 +- .../events/EventAutomationAddAction.kt | 2 +- .../events/EventAutomationDataChanged.kt | 2 +- .../events/EventAutomationUpdateAction.kt | 2 +- .../events/EventAutomationUpdateGui.kt | 2 +- .../events/EventAutomationUpdateTrigger.kt | 2 +- .../automation/events/EventLocationChange.kt | 2 +- .../automation/events/EventTriggerChanged.kt | 2 +- .../automation/events/EventTriggerClone.kt | 2 +- .../automation/events/EventTriggerRemove.kt | 2 +- .../automation/services/LocationService.kt | 16 +-- .../services/LocationServiceHelper.kt | 2 +- .../nightscout/automation/triggers/Trigger.kt | 22 ++-- .../triggers/TriggerAutosensValue.kt | 2 +- .../automation/triggers/TriggerBTDevice.kt | 4 +- .../automation/triggers/TriggerBg.kt | 4 +- .../automation/triggers/TriggerBolusAgo.kt | 4 +- .../automation/triggers/TriggerCOB.kt | 2 +- .../automation/triggers/TriggerConnector.kt | 4 +- .../automation/triggers/TriggerDelta.kt | 4 +- .../automation/triggers/TriggerHeartRate.kt | 2 +- .../automation/triggers/TriggerIob.kt | 2 +- .../automation/triggers/TriggerLocation.kt | 2 +- .../triggers/TriggerProfilePercent.kt | 2 +- .../triggers/TriggerPumpLastConnection.kt | 2 +- .../triggers/TriggerRecurringTime.kt | 4 +- .../automation/triggers/TriggerTempTarget.kt | 2 +- .../triggers/TriggerTempTargetValue.kt | 4 +- .../automation/triggers/TriggerTime.kt | 4 +- .../automation/triggers/TriggerTimeRange.kt | 4 +- .../automation/triggers/TriggerWifiSsid.kt | 4 +- .../automation/AutomationEventTest.kt | 6 +- .../automation/BolusTimerImplTest.kt | 18 +-- .../automation/CarbTimerImplTest.kt | 18 +-- .../automation/actions/ActionAlarmTest.kt | 10 +- .../actions/ActionCarePortalEventTest.kt | 4 +- .../actions/ActionLoopDisableTest.kt | 4 +- .../actions/ActionLoopEnableTest.kt | 4 +- .../actions/ActionLoopResumeTest.kt | 2 +- .../actions/ActionLoopSuspendTest.kt | 2 +- .../actions/ActionNotificationTest.kt | 8 +- .../actions/ActionProfileSwitchPercentTest.kt | 2 +- .../actions/ActionProfileSwitchTest.kt | 2 +- .../automation/actions/ActionSendSMSTest.kt | 2 +- .../actions/ActionStartTempTargetTest.kt | 4 +- .../actions/ActionStopProcessingTest.kt | 2 +- .../actions/ActionStopTempTargetTest.kt | 2 +- .../automation/actions/ActionsTestBase.kt | 30 ++--- .../automation/elements/InputBgTest.kt | 2 +- .../elements/InputTempTargetTest.kt | 2 +- .../automation/triggers/TriggerBgTest.kt | 4 +- .../automation/triggers/TriggerCOBTest.kt | 2 +- .../automation/triggers/TriggerDeltaTest.kt | 4 +- .../automation/triggers/TriggerIobTest.kt | 2 +- .../triggers/TriggerRecurringTimeTest.kt | 4 +- .../triggers/TriggerTempTargetValueTest.kt | 2 +- .../automation/triggers/TriggerTestBase.kt | 4 +- .../triggers/TriggerTimeRangeTest.kt | 2 +- .../automation/triggers/TriggerTimeTest.kt | 2 +- .../triggers/TriggerWifiSsidTest.kt | 2 +- .../configuration/AndroidPermissionImpl.kt | 12 +- .../DaggerAppCompatActivityWithResult.kt | 12 +- .../activities/SingleFragmentActivity.kt | 8 +- .../configBuilder/ConfigBuilderFragment.kt | 20 ++-- .../configBuilder/ConfigBuilderPlugin.kt | 52 ++++----- .../configBuilder/RunningConfigurationImpl.kt | 34 +++--- .../events/EventConfigBuilderUpdateGui.kt | 2 +- .../configuration/di/ConfigurationModule.kt | 8 +- .../maintenance/ImportExportPrefsImpl.kt | 52 ++++----- .../maintenance/MaintenanceFragment.kt | 38 +++---- .../maintenance/MaintenancePlugin.kt | 20 ++-- .../maintenance/PrefFileListProviderImpl.kt | 28 ++--- .../maintenance/PrefsFileContract.kt | 2 +- .../maintenance/PrefsMetadataKeyImpl.kt | 2 +- .../CustomWatchfaceImportListActivity.kt | 42 +++---- .../activities/LogSettingActivity.kt | 6 +- .../activities/PrefImportListActivity.kt | 6 +- .../maintenance/data/PrefsFormat.kt | 6 +- .../dialogs/PrefImportSummaryDialog.kt | 6 +- .../formats/EncryptedPrefsFormat.kt | 10 +- .../configuration/setupwizard/SWDefinition.kt | 48 ++++---- .../setupwizard/SWEventListener.kt | 4 +- .../configuration/setupwizard/SWScreen.kt | 2 +- .../setupwizard/SetupWizardActivity.kt | 18 +-- .../elements/SWEditEncryptedPassword.kt | 2 +- .../setupwizard/elements/SWEditIntNumber.kt | 2 +- .../setupwizard/elements/SWEditNumber.kt | 2 +- .../elements/SWEditNumberWithUnits.kt | 8 +- .../setupwizard/elements/SWItem.kt | 16 +-- .../setupwizard/elements/SWPlugin.kt | 10 +- .../setupwizard/elements/SWPreference.kt | 2 +- .../setupwizard/events/EventSWLabel.kt | 2 +- .../formats/EncryptedPrefsFormatTest.kt | 4 +- .../formats/SingleStringStorage.kt | 2 +- .../constraints/ConstraintsCheckerImpl.kt | 12 +- .../bgQualityCheck/BgQualityCheckPlugin.kt | 32 +++--- .../di/PluginsConstraintsModule.kt | 6 +- .../constraints/dstHelper/DstHelperPlugin.kt | 26 ++--- .../objectives/ObjectivesFragment.kt | 20 ++-- .../objectives/ObjectivesPlugin.kt | 36 +++--- .../constraints/objectives/SntpClient.kt | 4 +- .../activities/ObjectivesExamDialog.kt | 8 +- .../objectives/dialogs/NtpProgressDialog.kt | 12 +- .../events/EventObjectivesUpdateGui.kt | 2 +- .../objectives/objectives/Objective.kt | 8 +- .../objectives/objectives/Objective0.kt | 14 +-- .../objectives/objectives/Objective1.kt | 8 +- .../objectives/objectives/Objective10.kt | 2 +- .../objectives/objectives/Objective11.kt | 2 +- .../objectives/objectives/Objective3.kt | 4 +- .../objectives/objectives/Objective4.kt | 8 +- .../objectives/objectives/Objective5.kt | 4 +- .../objectives/objectives/Objective6.kt | 6 +- .../objectives/objectives/Objective7.kt | 2 +- .../objectives/objectives/Objective9.kt | 2 +- .../phoneChecker/PhoneCheckerPlugin.kt | 12 +- .../constraints/safety/SafetyPlugin.kt | 44 ++++---- .../SignatureVerifierPlugin.kt | 20 ++-- .../storage/StorageConstraintPlugin.kt | 22 ++-- .../versionChecker/VersionCheckerPlugin.kt | 28 ++--- .../versionChecker/VersionCheckerUtilsImpl.kt | 22 ++-- .../constraints/ConstraintsCheckerImplTest.kt | 34 +++--- .../BgQualityCheckPluginTest.kt | 16 +-- .../dstHelper/DstHelperPluginTest.kt | 8 +- .../objectives/ObjectivesPluginTest.kt | 12 +- .../constraints/objectives/SntpClientTest.kt | 2 +- .../constraints/safety/SafetyPluginTest.kt | 22 ++-- .../VersionCheckerUtilsKtTest.kt | 14 +-- .../storage/StorageConstraintPluginTest.kt | 6 +- .../nightscout/insulin/InsulinFragment.kt | 4 +- .../insulin/InsulinLyumjevPlugin.kt | 16 +-- .../insulin/InsulinOrefBasePlugin.kt | 28 ++--- .../insulin/InsulinOrefFreePeakPlugin.kt | 18 +-- .../insulin/InsulinOrefRapidActingPlugin.kt | 16 +-- .../InsulinOrefUltraRapidActingPlugin.kt | 16 +-- .../insulin/InsulinLyumjevPluginTest.kt | 16 +-- .../insulin/InsulinOrefBasePluginTest.kt | 18 +-- .../insulin/InsulinOrefFreePeakPluginTest.kt | 14 +-- .../InsulinOrefRapidActingPluginTest.kt | 16 +-- .../InsulinOrefUltraRapidActingPluginTest.kt | 16 +-- .../nightscout/plugins/di/OverviewModule.kt | 2 +- .../nightscout/plugins/di/PluginsModule.kt | 4 +- .../nightscout/plugins/di/ProfileModule.kt | 2 +- .../general/actions/ActionsFragment.kt | 48 ++++---- .../plugins/general/actions/ActionsPlugin.kt | 16 +-- .../plugins/general/food/FoodFragment.kt | 20 ++-- .../plugins/general/food/FoodPlugin.kt | 10 +- .../general/overview/OverviewFragment.kt | 104 +++++++++--------- .../general/overview/OverviewMenusImpl.kt | 18 +-- .../general/overview/OverviewPlugin.kt | 32 +++--- .../general/overview/graphData/GraphData.kt | 12 +- .../DismissNotificationService.kt | 4 +- .../notifications/NotificationStore.kt | 20 ++-- .../notifications/NotificationWithAction.kt | 16 +-- .../events/EventUpdateOverviewNotification.kt | 2 +- .../general/overview/ui/StatusLightHandler.kt | 28 ++--- .../persistentNotification/DummyService.kt | 12 +- .../DummyServiceHelper.kt | 2 +- .../PersistentNotificationPlugin.kt | 40 +++---- .../general/smsCommunicator/AuthRequest.kt | 18 +-- .../SmsCommunicatorFragment.kt | 10 +- .../smsCommunicator/SmsCommunicatorPlugin.kt | 72 ++++++------ .../activities/SmsCommunicatorOtpActivity.kt | 6 +- .../events/EventSmsCommunicatorUpdateGui.kt | 2 +- .../smsCommunicator/otp/OneTimePassword.kt | 8 +- .../general/themes/ThemeSwitcherPlugin.kt | 18 +-- .../plugins/general/wear/WearFragment.kt | 28 ++--- .../plugins/general/wear/WearPlugin.kt | 38 +++---- .../wear/activities/CwfInfosActivity.kt | 32 +++--- .../wear/wearintegration/DataHandlerMobile.kt | 78 ++++++------- .../DataLayerListenerServiceMobile.kt | 34 +++--- .../DataLayerListenerServiceMobileHelper.kt | 2 +- .../IobCobCalculatorPlugin.kt | 62 +++++------ .../data/AutosensDataObject.kt | 18 +-- .../data/AutosensDataStoreObject.kt | 14 +-- .../plugins/profile/ProfileFragment.kt | 36 +++--- .../plugins/profile/ProfilePlugin.kt | 50 ++++----- .../plugins/profile/ui/TimeListEdit.kt | 6 +- .../nightscout/plugins/skins/SkinButtonsOn.kt | 2 +- .../nightscout/plugins/skins/SkinClassic.kt | 2 +- .../plugins/skins/SkinLargeDisplay.kt | 2 +- .../nightscout/plugins/skins/SkinLowRes.kt | 2 +- .../nightscout/plugins/skins/SkinProvider.kt | 2 +- .../core/extensions/BolusExtensionKtTest.kt | 8 +- .../ExtendedBolusExtensionKtTest.kt | 12 +- .../extensions/GlucoseValueExtensionKtTest.kt | 4 +- .../TemporaryBasalExtensionKtTest.kt | 12 +- .../TemporaryTargetExtensionKtTest.kt | 2 +- .../extensions/TherapyEventExtensionKtTest.kt | 2 +- .../smsCommunicator/AuthRequestTest.kt | 12 +- .../SmsCommunicatorPluginTest.kt | 36 +++--- .../general/smsCommunicator/SmsTest.kt | 2 +- .../plugins/iob/AutosensDataStoreTest.kt | 12 +- .../sensitivity/AbstractSensitivityPlugin.kt | 22 ++-- .../sensitivity/SensitivityAAPSPlugin.kt | 24 ++-- .../sensitivity/SensitivityOref1Plugin.kt | 30 ++--- .../SensitivityWeightedAveragePlugin.kt | 24 ++-- .../extensions/ProfileSwitchExtensions.kt | 2 +- .../extensions/TherapyEventExtensions.kt | 2 +- .../AbstractSensitivityPluginTest.kt | 14 +-- .../smoothing/AvgSmoothingPlugin.kt | 18 +-- .../smoothing/ExponentialSmoothingPlugin.kt | 14 +-- .../nightscout/smoothing/NoSmoothingPlugin.kt | 14 +-- .../info/nightscout/source/AidexPlugin.kt | 20 ++-- .../nightscout/source/BGSourceFragment.kt | 30 ++--- .../info/nightscout/source/DexcomPlugin.kt | 28 ++--- .../info/nightscout/source/EversensePlugin.kt | 16 +-- .../info/nightscout/source/GlimpPlugin.kt | 14 +-- .../info/nightscout/source/GlunovoPlugin.kt | 24 ++-- .../info/nightscout/source/IntelligoPlugin.kt | 24 ++-- .../info/nightscout/source/MM640gPlugin.kt | 16 +-- .../nightscout/source/NSClientSourcePlugin.kt | 16 +-- .../info/nightscout/source/PoctechPlugin.kt | 18 +-- .../info/nightscout/source/RandomBgPlugin.kt | 20 ++-- .../info/nightscout/source/TomatoPlugin.kt | 16 +-- .../nightscout/source/XdripSourcePlugin.kt | 18 +-- .../info/nightscout/source/di/SourceModule.kt | 6 +- .../info/nightscout/source/GlimpPluginTest.kt | 2 +- .../nightscout/source/MM640GPluginTest.kt | 2 +- .../nightscout/source/NSClientPluginTest.kt | 4 +- .../source/XdripSourcePluginTest.kt | 2 +- .../dataBroadcaster/DataBroadcastPlugin.kt | 48 ++++---- .../nightscout/plugins/sync/di/SyncModule.kt | 10 +- .../plugins/sync/nsShared/NSAlarm.kt | 2 +- .../plugins/sync/nsShared/NSClientFragment.kt | 28 ++--- .../nightscout/plugins/sync/nsShared/NSSgv.kt | 2 +- .../sync/nsShared/NsIncomingDataProcessor.kt | 32 +++--- .../sync/nsShared/StoreDataForDbImpl.kt | 28 ++--- .../events/EventConnectivityOptionChanged.kt | 2 +- .../nsShared/events/EventNSClientStatus.kt | 2 +- .../events/EventNSClientUpdateGuiData.kt | 2 +- .../events/EventNSClientUpdateGuiQueue.kt | 2 +- .../events/EventNSClientUpdateGuiStatus.kt | 2 +- .../sync/nsclient/DataSyncSelectorV1.kt | 20 ++-- .../plugins/sync/nsclient/NSClientPlugin.kt | 48 ++++---- .../plugins/sync/nsclient/ReceiverDelegate.kt | 16 +-- .../plugins/sync/nsclient/acks/NSAddAck.kt | 12 +- .../plugins/sync/nsclient/acks/NSAuthAck.kt | 4 +- .../plugins/sync/nsclient/acks/NSUpdateAck.kt | 10 +- .../nsclient/data/NSDeviceStatusHandler.kt | 8 +- .../nsclient/data/NSSettingsStatusImpl.kt | 24 ++-- .../data/ProcessedDeviceStatusDataImpl.kt | 18 +-- .../BolusCalculatorResultExtension.kt | 4 +- .../nsclient/extensions/BolusExtension.kt | 2 +- .../nsclient/extensions/CarbsExtension.kt | 2 +- .../extensions/DeviceStatusExtension.kt | 2 +- .../EffectiveProfileSwitchExtension.kt | 4 +- .../extensions/ExtendedBolusExtension.kt | 6 +- .../extensions/OfflineEventExtension.kt | 4 +- .../extensions/ProfileSwitchExtension.kt | 8 +- .../extensions/TemporaryBasalExtension.kt | 6 +- .../extensions/TemporaryTargetExtension.kt | 10 +- .../extensions/TherapyEventExtension.kt | 6 +- .../sync/nsclient/services/NSClientService.kt | 28 ++--- .../nsclient/workers/NSClientAddAckWorker.kt | 38 +++---- .../workers/NSClientAddUpdateWorker.kt | 18 +-- .../nsclient/workers/NSClientMbgWorker.kt | 6 +- .../workers/NSClientUpdateRemoveAckWorker.kt | 30 ++--- .../sync/nsclientV3/DataSyncSelectorV3.kt | 22 ++-- .../sync/nsclientV3/NSClientV3Plugin.kt | 74 ++++++------- .../BolusCalculatorResultExtension.kt | 2 +- .../nsclientV3/extensions/BolusExtension.kt | 2 +- .../nsclientV3/extensions/CarbsExtension.kt | 2 +- .../EffectiveProfileSwitchExtension.kt | 4 +- .../extensions/ExtendedBolusExtension.kt | 4 +- .../extensions/GlucoseValueExtension.kt | 2 +- .../extensions/OfflineEventExtension.kt | 2 +- .../extensions/ProfileSwitchExtension.kt | 8 +- .../extensions/TemporaryBasalExtension.kt | 4 +- .../extensions/TemporaryTargetExtension.kt | 2 +- .../extensions/TherapyEventExtension.kt | 2 +- .../sync/nsclientV3/workers/DataSyncWorker.kt | 6 +- .../sync/nsclientV3/workers/LoadBgWorker.kt | 16 +-- .../workers/LoadDeviceStatusWorker.kt | 8 +- .../nsclientV3/workers/LoadFoodsWorker.kt | 10 +- .../workers/LoadLastModificationWorker.kt | 6 +- .../workers/LoadProfileStoreWorker.kt | 10 +- .../nsclientV3/workers/LoadStatusWorker.kt | 6 +- .../workers/LoadTreatmentsWorker.kt | 12 +- .../openhumans/OpenHumansUploaderPlugin.kt | 18 +-- .../sync/openhumans/OpenHumansWorker.kt | 4 +- .../openhumans/delegates/OHAppIDDelegate.kt | 2 +- .../openhumans/delegates/OHCounterDelegate.kt | 2 +- .../openhumans/delegates/OHStateDelegate.kt | 2 +- .../plugins/sync/tidepool/TidepoolFragment.kt | 8 +- .../plugins/sync/tidepool/TidepoolPlugin.kt | 36 +++--- .../sync/tidepool/comm/InfoInterceptor.kt | 4 +- .../sync/tidepool/comm/TidepoolCallback.kt | 6 +- .../sync/tidepool/comm/TidepoolUploader.kt | 16 +-- .../plugins/sync/tidepool/comm/UploadChunk.kt | 18 +-- .../sync/tidepool/elements/BasalElement.kt | 4 +- .../sync/tidepool/elements/BaseElement.kt | 2 +- .../tidepool/elements/BloodGlucoseElement.kt | 4 +- .../sync/tidepool/elements/BolusElement.kt | 2 +- .../sync/tidepool/elements/ProfileElement.kt | 6 +- .../tidepool/elements/SensorGlucoseElement.kt | 2 +- .../sync/tidepool/elements/WizardElement.kt | 2 +- .../tidepool/events/EventTidepoolDoUpload.kt | 2 +- .../tidepool/events/EventTidepoolResetData.kt | 2 +- .../tidepool/events/EventTidepoolStatus.kt | 2 +- .../tidepool/events/EventTidepoolUpdateGUI.kt | 2 +- .../tidepool/messages/AuthRequestMessage.kt | 2 +- .../messages/OpenDatasetRequestMessage.kt | 6 +- .../plugins/sync/tidepool/utils/RateLimit.kt | 6 +- .../sync/xdrip/DataSyncSelectorXdripImpl.kt | 20 ++-- .../plugins/sync/xdrip/XdripFragment.kt | 16 +-- .../plugins/sync/xdrip/XdripPlugin.kt | 58 +++++----- .../sync/xdrip/events/EventXdripUpdateGUI.kt | 2 +- .../sync/xdrip/workers/XdripDataSyncWorker.kt | 6 +- .../DataBroadcastPluginTest.kt | 26 ++--- .../sync/nsclient/ReceiverDelegateTest.kt | 10 +- .../sync/nsclientV3/NSClientV3PluginTest.kt | 16 +-- .../extensions/DeviceStatusExtensionKtTest.kt | 12 +- .../EffectiveProfileSwitchExtensionKtTest.kt | 2 +- .../ProfileSwitchExtensionKtTest.kt | 2 +- .../nsclientV3/workers/DataSyncWorkerTest.kt | 4 +- .../nsclientV3/workers/LoadBgWorkerTest.kt | 18 +-- .../nightscout/pump/combo/ComboFragment.kt | 14 +-- .../nightscout/pump/combo/ComboPlugin.java | 56 +++++----- .../pump/combo/data/ComboErrorUtil.kt | 2 +- .../combo/events/EventComboPumpUpdateGUI.kt | 2 +- .../combo/ruffyscripter/RuffyScripter.java | 4 +- .../ruffyscripter/commands/BolusCommand.java | 4 +- .../commands/CancelTbrCommand.java | 4 +- .../commands/ReadBasalProfileCommand.java | 4 +- .../commands/ReadHistoryCommand.java | 4 +- .../commands/ReadQuickInfoCommand.java | 4 +- .../commands/SetBasalProfileCommand.java | 4 +- .../ruffyscripter/commands/SetTbrCommand.java | 4 +- .../nightscout/pump/combo/ComboPluginTest.kt | 18 +-- .../pump/combov2/AAPSComboCtlLogger.kt | 4 +- .../pump/combov2/AAPSPumpStateStore.kt | 2 +- .../pump/combov2/ComboV2Fragment.kt | 8 +- .../nightscout/pump/combov2/ComboV2Plugin.kt | 66 +++++------ .../info/nightscout/pump/combov2/Delegates.kt | 2 +- .../nightscout/pump/combov2/InternalSP.kt | 4 +- .../info/nightscout/pump/combov2/Utility.kt | 10 +- .../activities/ComboV2PairingActivity.kt | 6 +- .../info/nightscout/pump/dana/DanaFragment.kt | 50 ++++----- .../info/nightscout/pump/dana/DanaPump.kt | 28 ++--- .../dana/activities/DanaHistoryActivity.kt | 32 +++--- .../activities/DanaUserOptionsActivity.kt | 24 ++-- .../pump/dana/events/EventDanaRNewStatus.kt | 2 +- .../info/nightscout/pump/dana/DanaPumpTest.kt | 2 +- .../danaRKorean/DanaRKoreanPlugin.kt | 44 ++++---- .../danaRKorean/comm/MsgCheckValue_k.kt | 2 +- .../comm/MsgInitConnStatusBasic_k.kt | 6 +- .../comm/MsgInitConnStatusBolus_k.kt | 6 +- .../comm/MsgInitConnStatusTime_k.kt | 8 +- .../comm/MsgSettingBasalProfileAll_k.kt | 2 +- .../danaRKorean/comm/MsgSettingBasal_k.kt | 2 +- .../danaRKorean/comm/MsgStatusBasic_k.kt | 2 +- .../danaRKorean/comm/MsgStatus_k.kt | 2 +- .../services/DanaRKoreanExecutionService.java | 44 ++++---- .../androidaps/danaRv2/DanaRv2Plugin.java | 46 ++++---- .../danaRv2/comm/MsgCheckValue_v2.kt | 8 +- .../danaRv2/comm/MsgHistoryEventsV2.kt | 8 +- .../comm/MsgSetAPSTempBasalStart_v2.kt | 2 +- .../danaRv2/comm/MsgSetHistoryEntry_v2.kt | 2 +- .../danaRv2/comm/MsgStatusAPS_v2.kt | 2 +- .../services/DanaRv2ExecutionService.java | 52 ++++----- .../androidaps/danar/AbstractDanaRPlugin.java | 60 +++++----- .../androidaps/danar/DanaRPlugin.java | 42 +++---- .../androidaps/danar/SerialIOThread.java | 4 +- .../androidaps/danar/comm/MessageBase.kt | 26 ++--- .../androidaps/danar/comm/MsgBolusProgress.kt | 4 +- .../androidaps/danar/comm/MsgBolusStart.kt | 2 +- .../danar/comm/MsgBolusStartWithSpeed.kt | 2 +- .../androidaps/danar/comm/MsgBolusStop.kt | 4 +- .../androidaps/danar/comm/MsgCheckValue.kt | 2 +- .../androidaps/danar/comm/MsgError.kt | 4 +- .../androidaps/danar/comm/MsgHistoryAlarm.kt | 2 +- .../androidaps/danar/comm/MsgHistoryAll.kt | 6 +- .../danar/comm/MsgHistoryAllDone.kt | 2 +- .../danar/comm/MsgHistoryBasalHour.kt | 2 +- .../androidaps/danar/comm/MsgHistoryBolus.kt | 2 +- .../androidaps/danar/comm/MsgHistoryCarbo.kt | 2 +- .../danar/comm/MsgHistoryDailyInsulin.kt | 2 +- .../androidaps/danar/comm/MsgHistoryDone.kt | 2 +- .../androidaps/danar/comm/MsgHistoryError.kt | 2 +- .../danar/comm/MsgHistoryGlucose.kt | 2 +- .../androidaps/danar/comm/MsgHistoryNew.kt | 2 +- .../danar/comm/MsgHistoryNewDone.kt | 2 +- .../androidaps/danar/comm/MsgHistoryRefill.kt | 2 +- .../danar/comm/MsgHistorySuspend.kt | 2 +- .../danar/comm/MsgInitConnStatusBasic.kt | 2 +- .../danar/comm/MsgInitConnStatusBolus.kt | 6 +- .../danar/comm/MsgInitConnStatusOption.kt | 6 +- .../danar/comm/MsgInitConnStatusTime.kt | 8 +- .../androidaps/danar/comm/MsgPCCommStart.kt | 2 +- .../androidaps/danar/comm/MsgPCCommStop.kt | 2 +- .../danar/comm/MsgSetActivateBasalProfile.kt | 2 +- .../danar/comm/MsgSetBasalProfile.kt | 4 +- .../androidaps/danar/comm/MsgSetCarbsEntry.kt | 2 +- .../danar/comm/MsgSetExtendedBolusStart.kt | 2 +- .../danar/comm/MsgSetExtendedBolusStop.kt | 2 +- .../danar/comm/MsgSetSingleBasalProfile.kt | 4 +- .../danar/comm/MsgSetTempBasalStart.kt | 2 +- .../danar/comm/MsgSetTempBasalStop.kt | 2 +- .../androidaps/danar/comm/MsgSetTime.kt | 2 +- .../danar/comm/MsgSetUserOptions.kt | 2 +- .../danar/comm/MsgSettingActiveProfile.kt | 2 +- .../androidaps/danar/comm/MsgSettingBasal.kt | 2 +- .../danar/comm/MsgSettingBasalProfileAll.kt | 2 +- .../danar/comm/MsgSettingGlucose.kt | 2 +- .../danar/comm/MsgSettingMaxValues.kt | 2 +- .../androidaps/danar/comm/MsgSettingMeal.kt | 6 +- .../danar/comm/MsgSettingProfileRatios.kt | 2 +- .../danar/comm/MsgSettingProfileRatiosAll.kt | 2 +- .../danar/comm/MsgSettingPumpTime.kt | 2 +- .../danar/comm/MsgSettingShippingInfo.kt | 2 +- .../danar/comm/MsgSettingUserOptions.kt | 2 +- .../androidaps/danar/comm/MsgStatus.kt | 2 +- .../androidaps/danar/comm/MsgStatusBasic.kt | 2 +- .../danar/comm/MsgStatusBolusExtended.kt | 4 +- .../androidaps/danar/comm/MsgStatusProfile.kt | 2 +- .../danar/comm/MsgStatusTempBasal.kt | 4 +- .../AbstractDanaRExecutionService.java | 34 +++--- .../danar/services/DanaRExecutionService.java | 30 ++--- .../nightscout/pump/danaR/DanaRPluginTest.kt | 12 +- .../pump/danaR/comm/DanaRTestBase.kt | 14 +-- .../pump/danaR/comm/MsgBolusProgressTest.kt | 2 +- .../pump/danaR/comm/MsgBolusStopTest.kt | 2 +- .../pump/danaR/comm/MsgSettingBasalTest.kt | 2 +- .../danaR/comm/MsgStatusBolusExtendedTest.kt | 2 +- .../pump/danaRKorean/DanaRKoreanPluginTest.kt | 12 +- .../pump/danaRv2/DanaRv2PluginTest.kt | 16 +-- .../nightscout/pump/danars/DanaRSPlugin.kt | 72 ++++++------ .../pump/danars/activities/BLEScanActivity.kt | 8 +- .../danars/activities/EnterPinActivity.kt | 10 +- .../pump/danars/comm/DanaRSPacket.kt | 6 +- .../DanaRSPacketAPSBasalSetTemporaryBasal.kt | 2 +- .../comm/DanaRSPacketAPSHistoryEvents.kt | 20 ++-- .../comm/DanaRSPacketAPSSetEventHistory.kt | 2 +- .../comm/DanaRSPacketBasalGetBasalRate.kt | 10 +- .../comm/DanaRSPacketBasalGetProfileNumber.kt | 2 +- ...anaRSPacketBasalSetCancelTemporaryBasal.kt | 2 +- .../DanaRSPacketBasalSetProfileBasalRate.kt | 2 +- .../comm/DanaRSPacketBasalSetProfileNumber.kt | 2 +- .../comm/DanaRSPacketBasalSetSuspendOff.kt | 2 +- .../comm/DanaRSPacketBasalSetSuspendOn.kt | 2 +- .../DanaRSPacketBasalSetTemporaryBasal.kt | 2 +- .../comm/DanaRSPacketBolusGet24CIRCFArray.kt | 2 +- .../comm/DanaRSPacketBolusGetBolusOption.kt | 10 +- .../comm/DanaRSPacketBolusGetCIRCFArray.kt | 2 +- ...aRSPacketBolusGetCalculationInformation.kt | 2 +- ...anaRSPacketBolusGetStepBolusInformation.kt | 2 +- .../comm/DanaRSPacketBolusSet24CIRCFArray.kt | 8 +- .../comm/DanaRSPacketBolusSetBolusOption.kt | 2 +- .../comm/DanaRSPacketBolusSetExtendedBolus.kt | 2 +- ...DanaRSPacketBolusSetExtendedBolusCancel.kt | 2 +- .../DanaRSPacketBolusSetStepBolusStart.kt | 4 +- .../comm/DanaRSPacketBolusSetStepBolusStop.kt | 8 +- .../comm/DanaRSPacketEtcKeepConnection.kt | 2 +- .../comm/DanaRSPacketEtcSetHistorySave.kt | 2 +- .../comm/DanaRSPacketGeneralGetPumpCheck.kt | 8 +- ...naRSPacketGeneralGetShippingInformation.kt | 2 +- .../DanaRSPacketGeneralGetShippingVersion.kt | 2 +- ...anaRSPacketGeneralGetUserTimeChangeFlag.kt | 2 +- ...RSPacketGeneralInitialScreenInformation.kt | 2 +- ...DanaRSPacketGeneralSetHistoryUploadMode.kt | 2 +- ...PacketGeneralSetUserTimeChangeFlagClear.kt | 2 +- .../pump/danars/comm/DanaRSPacketHistory.kt | 10 +- .../danars/comm/DanaRSPacketHistoryAlarm.kt | 2 +- .../comm/DanaRSPacketHistoryAllHistory.kt | 2 +- .../danars/comm/DanaRSPacketHistoryBasal.kt | 2 +- .../comm/DanaRSPacketHistoryBloodGlucose.kt | 2 +- .../danars/comm/DanaRSPacketHistoryBolus.kt | 2 +- .../comm/DanaRSPacketHistoryCarbohydrate.kt | 2 +- .../danars/comm/DanaRSPacketHistoryDaily.kt | 2 +- .../danars/comm/DanaRSPacketHistoryPrime.kt | 2 +- .../danars/comm/DanaRSPacketHistoryRefill.kt | 2 +- .../danars/comm/DanaRSPacketHistorySuspend.kt | 2 +- .../comm/DanaRSPacketHistoryTemporary.kt | 2 +- .../danars/comm/DanaRSPacketNotifyAlarm.kt | 10 +- .../DanaRSPacketNotifyDeliveryComplete.kt | 8 +- .../DanaRSPacketNotifyDeliveryRateDisplay.kt | 8 +- .../DanaRSPacketNotifyMissedBolusAlarm.kt | 2 +- .../comm/DanaRSPacketOptionGetPumpTime.kt | 2 +- ...DanaRSPacketOptionGetPumpUTCAndTimeZone.kt | 2 +- .../comm/DanaRSPacketOptionGetUserOption.kt | 2 +- .../comm/DanaRSPacketOptionSetPumpTime.kt | 2 +- ...DanaRSPacketOptionSetPumpUTCAndTimeZone.kt | 2 +- .../comm/DanaRSPacketOptionSetUserOption.kt | 2 +- .../danars/comm/DanaRSPacketReviewBolusAvg.kt | 2 +- .../comm/DanaRSPacketReviewGetPumpDecRatio.kt | 2 +- .../danars/dialogs/PairingProgressDialog.kt | 6 +- .../danars/events/EventDanaRSDeviceChange.kt | 2 +- .../events/EventDanaRSPairingSuccess.kt | 2 +- .../pump/danars/services/BLEComm.kt | 24 ++-- .../pump/danars/services/DanaRSService.kt | 54 ++++----- .../pump/danars/DanaRSPluginTest.kt | 12 +- .../nightscout/pump/danars/DanaRSTestBase.kt | 4 +- .../DanaRSPacketNotifyDeliveryCompleteTest.kt | 2 +- .../danars/comm/DanaRsMessageHashTableTest.kt | 2 +- .../comm/DanaRsPacketApsHistoryEventsTest.kt | 6 +- .../DanaRsPacketBolusSetStepBolusStartTest.kt | 10 +- .../DanaRsPacketBolusSetStepBolusStopTest.kt | 2 +- .../comm/DanaRsPacketNotifyAlarmTest.kt | 2 +- ...naRsPacketNotifyDeliveryRateDisplayTest.kt | 12 +- .../pump/diaconn/DiaconnG8Fragment.kt | 38 +++---- .../pump/diaconn/DiaconnG8Plugin.kt | 76 ++++++------- .../nightscout/pump/diaconn/DiaconnG8Pump.kt | 16 +-- .../activities/DiaconnG8BLEScanActivity.kt | 6 +- .../activities/DiaconnG8HistoryActivity.kt | 22 ++-- .../DiaconnG8UserOptionsActivity.kt | 16 +-- .../pump/diaconn/api/DiaconnLogUploader.kt | 4 +- .../events/EventDiaconnG8DeviceChange.kt | 2 +- .../diaconn/events/EventDiaconnG8NewStatus.kt | 2 +- .../diaconn/packet/AppCancelSettingPacket.kt | 2 +- .../packet/AppCancelSettingResponsePacket.kt | 2 +- .../diaconn/packet/AppConfirmSettingPacket.kt | 2 +- .../packet/AppConfirmSettingResponsePacket.kt | 2 +- .../diaconn/packet/BasalLimitInquirePacket.kt | 2 +- .../packet/BasalLimitInquireResponsePacket.kt | 6 +- .../diaconn/packet/BasalPauseReportPacket.kt | 2 +- .../diaconn/packet/BasalPauseSettingPacket.kt | 2 +- .../packet/BasalPauseSettingResponsePacket.kt | 2 +- .../pump/diaconn/packet/BasalSettingPacket.kt | 2 +- .../packet/BasalSettingReportPacket.kt | 2 +- .../packet/BasalSettingResponsePacket.kt | 2 +- .../packet/BatteryWarningReportPacket.kt | 2 +- .../packet/BigAPSMainInfoInquirePacket.kt | 2 +- .../BigAPSMainInfoInquireResponsePacket.kt | 6 +- .../diaconn/packet/BigLogInquirePacket.kt | 2 +- .../packet/BigLogInquireResponsePacket.kt | 26 ++--- .../packet/BigMainInfoInquirePacket.kt | 2 +- .../BigMainInfoInquireResponsePacket.kt | 10 +- .../diaconn/packet/BolusSpeedInquirePacket.kt | 2 +- .../packet/BolusSpeedInquireResponsePacket.kt | 4 +- .../diaconn/packet/BolusSpeedSettingPacket.kt | 2 +- .../packet/BolusSpeedSettingReportPacket.kt | 4 +- .../packet/BolusSpeedSettingResponsePacket.kt | 2 +- .../diaconn/packet/ConfirmReportPacket.kt | 2 +- .../pump/diaconn/packet/DiaconnG8Packet.java | 6 +- .../packet/DisplayTimeInquirePacket.kt | 2 +- .../DisplayTimeInquireResponsePacket.kt | 2 +- .../packet/DisplayTimeoutSettingPacket.kt | 2 +- .../DisplayTimeoutSettingResponsePacket.kt | 2 +- .../packet/IncarnationInquirePacket.kt | 2 +- .../IncarnationInquireResponsePacket.kt | 6 +- .../packet/InjectionBasalReportPacket.kt | 2 +- .../packet/InjectionBasalSettingPacket.kt | 2 +- .../InjectionBasalSettingResponsePacket.kt | 2 +- .../packet/InjectionBlockReportPacket.kt | 2 +- .../packet/InjectionCancelSettingPacket.kt | 2 +- .../InjectionCancelSettingResponsePacket.kt | 2 +- ...njectionExtendedBolusResultReportPacket.kt | 6 +- .../InjectionExtendedBolusSettingPacket.kt | 2 +- ...ctionExtendedBolusSettingResponsePacket.kt | 2 +- .../packet/InjectionMealSettingPacket.kt | 2 +- .../InjectionMealSettingResponsePacket.kt | 2 +- .../packet/InjectionProgressReportPacket.kt | 6 +- .../packet/InjectionSnackInquirePacket.kt | 2 +- .../InjectionSnackInquireResponsePacket.kt | 2 +- .../InjectionSnackResultReportPacket.kt | 6 +- .../packet/InjectionSnackSettingPacket.kt | 2 +- .../InjectionSnackSettingResponsePacket.kt | 2 +- .../diaconn/packet/InsulinLackReportPacket.kt | 2 +- .../diaconn/packet/LanguageInquirePacket.kt | 2 +- .../packet/LanguageInquireResponsePacket.kt | 2 +- .../diaconn/packet/LanguageSettingPacket.kt | 2 +- .../packet/LanguageSettingResponsePacket.kt | 2 +- .../diaconn/packet/LogStatusInquirePacket.kt | 2 +- .../packet/LogStatusInquireResponsePacket.kt | 2 +- .../pump/diaconn/packet/RejectReportPacket.kt | 2 +- .../diaconn/packet/SerialNumInquirePacket.kt | 2 +- .../packet/SerialNumInquireResponsePacket.kt | 6 +- .../diaconn/packet/SneckLimitInquirePacket.kt | 2 +- .../packet/SneckLimitInquireResponsePacket.kt | 2 +- .../pump/diaconn/packet/SoundInquirePacket.kt | 2 +- .../packet/SoundInquireResponsePacket.kt | 2 +- .../pump/diaconn/packet/SoundSettingPacket.kt | 2 +- .../packet/SoundSettingResponsePacket.kt | 2 +- .../diaconn/packet/TempBasalInquirePacket.kt | 2 +- .../packet/TempBasalInquireResponsePacket.kt | 4 +- .../diaconn/packet/TempBasalReportPacket.kt | 4 +- .../diaconn/packet/TempBasalSettingPacket.kt | 2 +- .../packet/TempBasalSettingResponsePacket.kt | 2 +- .../pump/diaconn/packet/TimeInquirePacket.kt | 2 +- .../packet/TimeInquireResponsePacket.kt | 2 +- .../pump/diaconn/packet/TimeReportPacket.kt | 2 +- .../pump/diaconn/packet/TimeSettingPacket.kt | 2 +- .../packet/TimeSettingResponsePacket.kt | 2 +- .../pump/diaconn/service/BLECommonService.kt | 12 +- .../pump/diaconn/service/DiaconnG8Service.kt | 52 ++++----- .../plugins/pump/eopatch/EopatchPumpPlugin.kt | 60 +++++----- .../plugins/pump/eopatch/RxAction.kt | 4 +- .../pump/eopatch/alarm/AlarmManager.kt | 24 ++-- .../pump/eopatch/alarm/AlarmProcess.kt | 2 +- .../pump/eopatch/alarm/AlarmRegistry.kt | 12 +- .../pump/eopatch/ble/IPatchManager.java | 2 +- .../pump/eopatch/ble/PatchManager.java | 22 ++-- .../pump/eopatch/ble/PatchManagerImpl.java | 10 +- .../pump/eopatch/ble/PatchStateManager.java | 8 +- .../pump/eopatch/ble/PreferenceManager.kt | 8 +- .../pump/eopatch/ble/task/ActivateTask.java | 2 +- .../pump/eopatch/ble/task/DeactivateTask.java | 4 +- .../pump/eopatch/ble/task/FetchAlarmTask.java | 4 +- .../eopatch/ble/task/GetPatchInfoTask.java | 2 +- .../eopatch/ble/task/InfoReminderTask.java | 2 +- .../ble/task/InternalSuspendedTask.java | 16 +-- .../eopatch/ble/task/NeedleSensingTask.java | 2 +- .../pump/eopatch/ble/task/PauseBasalTask.java | 16 +-- .../pump/eopatch/ble/task/PrimingTask.java | 2 +- .../ble/task/ReadBolusFinishTimeTask.java | 2 +- .../ble/task/ReadTempBasalFinishTimeTask.java | 2 +- .../eopatch/ble/task/ResumeBasalTask.java | 2 +- .../pump/eopatch/ble/task/SelfTestTask.java | 2 +- .../eopatch/ble/task/SetGlobalTimeTask.java | 2 +- .../eopatch/ble/task/SetLowReservoirTask.java | 2 +- .../eopatch/ble/task/StartCalcBolusTask.java | 4 +- .../ble/task/StartNormalBasalTask.java | 4 +- .../eopatch/ble/task/StartQuickBolusTask.java | 2 +- .../eopatch/ble/task/StartTempBasalTask.java | 4 +- .../pump/eopatch/ble/task/StopBasalTask.java | 16 +-- .../eopatch/ble/task/StopComboBolusTask.java | 2 +- .../eopatch/ble/task/StopExtBolusTask.java | 2 +- .../eopatch/ble/task/StopNowBolusTask.java | 4 +- .../eopatch/ble/task/StopTempBasalTask.java | 2 +- .../pump/eopatch/ble/task/TaskBase.java | 2 +- .../pump/eopatch/ble/task/TaskQueue.java | 6 +- .../ble/task/UpdateConnectionTask.java | 2 +- .../pump/eopatch/event/EoPatchEvents.kt | 2 +- .../eopatch/extension/ObservableExtension.kt | 4 +- .../pump/eopatch/extension/SingleExtension.kt | 4 +- .../pump/eopatch/ui/AlarmHelperActivity.kt | 6 +- .../plugins/pump/eopatch/ui/EoBaseActivity.kt | 2 +- .../eopatch/ui/EopatchOverviewFragment.kt | 6 +- .../ui/dialogs/ActivationNotCompleteDialog.kt | 4 +- .../pump/eopatch/ui/dialogs/AlarmDialog.kt | 10 +- .../pump/eopatch/ui/dialogs/CommonDialog.kt | 2 +- .../ui/viewmodel/EopatchOverviewViewModel.kt | 18 +-- .../eopatch/ui/viewmodel/EopatchViewModel.kt | 10 +- .../plugins/pump/eopatch/vo/Alarms.kt | 2 +- .../plugins/pump/eopatch/vo/BolusCurrent.kt | 2 +- .../plugins/pump/eopatch/vo/IPreference.kt | 2 +- .../pump/eopatch/vo/NormalBasalManager.kt | 4 +- .../plugins/pump/eopatch/vo/PatchConfig.kt | 2 +- .../plugins/pump/eopatch/vo/PatchState.kt | 2 +- .../pump/eopatch/vo/TempBasalManager.kt | 2 +- .../pump/medtronic/MedtronicFragment.kt | 36 +++--- .../pump/medtronic/MedtronicPumpPlugin.kt | 56 +++++----- .../comm/MedtronicCommunicationManager.kt | 4 +- .../pump/medtronic/comm/MedtronicConverter.kt | 6 +- .../comm/history/MedtronicHistoryDecoder.kt | 4 +- .../medtronic/comm/history/RawHistoryPage.kt | 4 +- .../cgms/MedtronicCGMSHistoryDecoder.kt | 4 +- .../pump/MedtronicPumpHistoryDecoder.kt | 4 +- .../comm/history/pump/PumpHistoryResult.kt | 4 +- .../medtronic/comm/message/PumpMessage.kt | 4 +- .../pump/medtronic/comm/ui/MedtronicUIComm.kt | 4 +- .../comm/ui/MedtronicUIPostprocessor.kt | 6 +- .../pump/medtronic/comm/ui/MedtronicUITask.kt | 6 +- .../medtronic/data/MedtronicHistoryData.kt | 22 ++-- .../pump/medtronic/data/dto/BasalProfile.kt | 6 +- .../medtronic/data/dto/BasalProfileEntry.kt | 4 +- .../data/dto/RLHistoryItemMedtronic.kt | 2 +- .../pump/medtronic/data/dto/TempBasalPair.kt | 4 +- .../medtronic/data/dto/TempBasalProcessDTO.kt | 2 +- .../defs/MedtronicCustomActionType.kt | 2 +- .../defs/MedtronicNotificationType.kt | 2 +- .../dialog/MedtronicHistoryActivity.kt | 2 +- .../medtronic/driver/MedtronicPumpStatus.kt | 8 +- .../EventMedtronicPumpConfigurationChanged.kt | 2 +- .../events/EventMedtronicPumpValuesChanged.kt | 2 +- .../service/RileyLinkMedtronicService.kt | 2 +- .../pump/medtronic/util/MedtronicUtil.kt | 12 +- .../pump/medtronic/MedtronicTestBase.kt | 8 +- .../comm/MedtronicHistoryDataUTest.kt | 2 +- .../pump/MedtronicPumpHistoryDecoderUTest.kt | 2 +- .../data/MedtronicHistoryDataUTest.kt | 2 +- .../nightscout/pump/medtrum/MedtrumPlugin.kt | 66 +++++------ .../nightscout/pump/medtrum/MedtrumPump.kt | 24 ++-- .../medtrum/comm/packets/ActivatePacket.kt | 4 +- .../medtrum/comm/packets/AuthorizePacket.kt | 2 +- .../comm/packets/CancelTempBasalPacket.kt | 2 +- .../medtrum/comm/packets/GetRecordPacket.kt | 12 +- .../medtrum/comm/packets/MedtrumPacket.kt | 4 +- .../comm/packets/NotificationPacket.kt | 4 +- .../comm/packets/SetTempBasalPacket.kt | 2 +- .../medtrum/comm/packets/SetTimeZonePacket.kt | 6 +- .../medtrum/comm/packets/SynchronizePacket.kt | 2 +- .../pump/medtrum/services/BLEComm.kt | 4 +- .../pump/medtrum/services/MedtrumService.kt | 50 ++++----- .../ui/MedtrumActivateCompleteFragment.kt | 6 +- .../medtrum/ui/MedtrumActivateFragment.kt | 6 +- .../medtrum/ui/MedtrumAttachPatchFragment.kt | 6 +- .../pump/medtrum/ui/MedtrumBaseActivity.kt | 2 +- .../ui/MedtrumDeactivatePatchFragment.kt | 6 +- .../ui/MedtrumDeactivationCompleteFragment.kt | 4 +- .../medtrum/ui/MedtrumOverviewFragment.kt | 8 +- .../ui/MedtrumPreparePatchConnectFragment.kt | 6 +- .../medtrum/ui/MedtrumPreparePatchFragment.kt | 4 +- .../ui/MedtrumPrimeCompleteFragment.kt | 6 +- .../pump/medtrum/ui/MedtrumPrimeFragment.kt | 6 +- .../pump/medtrum/ui/MedtrumPrimingFragment.kt | 6 +- .../MedtrumRetryActivationConnectFragment.kt | 6 +- .../ui/MedtrumRetryActivationFragment.kt | 6 +- .../ui/MedtrumStartDeactivationFragment.kt | 6 +- .../ui/viewmodel/MedtrumOverviewViewModel.kt | 16 +-- .../medtrum/ui/viewmodel/MedtrumViewModel.kt | 8 +- .../pump/medtrum/MedtrumPumpTest.kt | 10 +- .../pump/medtrum/MedtrumTestBase.kt | 6 +- .../comm/packets/GetRecordPacketTest.kt | 8 +- .../comm/packets/NotificationPacketTest.kt | 2 +- .../queue/command/CommandDeactivatePod.java | 2 +- .../command/CommandDisableSuspendAlerts.kt | 2 +- .../command/CommandHandleTimeChange.java | 2 +- .../queue/command/CommandPlayTestBeep.java | 2 +- .../queue/command/CommandResumeDelivery.java | 2 +- .../queue/command/CommandSilenceAlerts.java | 2 +- .../queue/command/CommandSuspendDelivery.java | 2 +- .../CommandUpdateAlertConfiguration.java | 2 +- .../action/InitializePodViewModel.kt | 4 +- .../action/InsertCannulaViewModel.kt | 4 +- .../PodActivationActionViewModelBase.kt | 4 +- .../common/fragment/ActionFragmentBase.kt | 2 +- .../common/fragment/WizardFragmentBase.kt | 2 +- .../common/viewmodel/ActionViewModelBase.kt | 8 +- .../action/DeactivatePodViewModel.kt | 4 +- .../dash/EventOmnipodDashPumpValuesChanged.kt | 2 +- .../omnipod/dash/OmnipodDashPumpPlugin.kt | 76 ++++++------- .../dash/di/OmnipodDashHistoryModule.kt | 2 +- .../dash/driver/OmnipodDashManagerImpl.kt | 8 +- .../driver/comm/OmnipodDashBleManagerImpl.kt | 6 +- .../dash/driver/comm/ServiceDiscoverer.kt | 4 +- .../driver/comm/callbacks/BleCommCallbacks.kt | 4 +- .../dash/driver/comm/endecrypt/EnDecrypt.kt | 4 +- .../pump/omnipod/dash/driver/comm/io/BleIO.kt | 4 +- .../omnipod/dash/driver/comm/io/CmdBleIO.kt | 2 +- .../omnipod/dash/driver/comm/io/DataBleIO.kt | 2 +- .../dash/driver/comm/message/MessageIO.kt | 4 +- .../dash/driver/comm/pair/KeyExchange.kt | 6 +- .../dash/driver/comm/pair/LTKExchanger.kt | 6 +- .../dash/driver/comm/scan/PodScanner.kt | 4 +- .../dash/driver/comm/scan/ScanCollector.kt | 4 +- .../dash/driver/comm/session/Connection.kt | 8 +- .../dash/driver/comm/session/EapMessage.kt | 4 +- .../dash/driver/comm/session/Milenage.kt | 6 +- .../dash/driver/comm/session/Session.kt | 4 +- .../driver/comm/session/SessionEstablisher.kt | 6 +- .../pod/state/OmnipodDashPodStateManager.kt | 2 +- .../state/OmnipodDashPodStateManagerImpl.kt | 12 +- .../pump/omnipod/dash/history/DashHistory.kt | 4 +- .../pump/omnipod/dash/history/data/Record.kt | 4 +- .../dash/history/database/Converters.kt | 2 +- .../omnipod/dash/ui/DashPodHistoryActivity.kt | 10 +- .../dash/ui/DashPodManagementActivity.kt | 16 +-- .../dash/ui/OmnipodDashOverviewFragment.kt | 32 +++--- .../DashPodActivationWizardActivity.kt | 2 +- .../action/DashInitializePodViewModel.kt | 12 +- .../action/DashInsertCannulaViewModel.kt | 26 ++--- .../action/DashDeactivatePodViewModel.kt | 16 +-- .../pump/omnipod/dash/util/Functions.kt | 4 +- .../plugins/pump/omnipod/dash/util/I8n.kt | 2 +- .../dash/driver/comm/pair/KeyExchangeTest.kt | 2 +- .../dash/driver/comm/session/MilenageTest.kt | 2 +- .../pump/omnipod/dash/util/FunctionsTest.kt | 4 +- .../omnipod/eros/OmnipodErosPumpPlugin.java | 74 ++++++------- .../eros/data/RLHistoryItemOmnipod.java | 2 +- .../action/AssignAddressAction.kt | 2 +- .../communication/action/SetupPodAction.java | 2 +- .../communication/message/OmnipodMessage.java | 4 +- .../driver/manager/ErosPodStateManager.java | 4 +- .../eros/driver/manager/OmnipodManager.java | 6 +- .../EventOmnipodErosActiveAlertsChanged.kt | 2 +- .../EventOmnipodErosFaultEventChanged.kt | 2 +- .../EventOmnipodErosPumpValuesChanged.kt | 2 +- .../eros/event/EventOmnipodErosTbrChanged.kt | 2 +- .../EventOmnipodErosUncertainTbrRecovered.kt | 2 +- .../extensions/DetailedBolusInfoExtension.kt | 2 +- .../eros/extensions/PumpStateExtension.kt | 2 +- .../eros/manager/AapsErosPodStateManager.java | 10 +- .../eros/manager/AapsOmnipodErosManager.java | 36 +++--- .../queue/command/CommandGetPodStatus.java | 2 +- .../queue/command/CommandReadPulseLog.java | 2 +- .../OmnipodRileyLinkCommunicationManager.java | 2 +- .../service/RileyLinkOmnipodService.java | 2 +- .../omnipod/eros/ui/ErosPodHistoryActivity.kt | 10 +- .../eros/ui/ErosPodManagementActivity.kt | 18 +-- .../eros/ui/OmnipodErosOverviewFragment.kt | 30 ++--- .../action/ErosInitializePodViewModel.kt | 6 +- .../action/ErosInsertCannulaViewModel.kt | 8 +- .../action/ErosDeactivatePodViewModel.kt | 10 +- .../omnipod/eros/util/AapsOmnipodUtil.java | 2 +- .../omnipod/eros/util/OmnipodAlertUtil.java | 2 +- .../omnipod/eros/OmnipodErosPumpPluginTest.kt | 16 +-- .../AapsOmnipodErosManagerTest.kt | 4 +- .../manager/AapsErosPodStateManagerTest.kt | 2 +- .../pump/common/PumpPluginAbstract.kt | 50 ++++----- .../pump/common/ble/BondStateReceiver.kt | 10 +- .../nightscout/pump/common/data/PumpStatus.kt | 2 +- .../pump/common/defs/PumpDriverState.kt | 4 +- .../pump/common/defs/PumpHistoryEntryGroup.kt | 2 +- .../pump/common/di/PumpCommonModule.kt | 6 +- .../driver/ble/PumpBLESelectorAbstract.kt | 10 +- .../common/driver/history/PumpHistoryEntry.kt | 2 +- .../pump/common/events/EventBondChanged.kt | 2 +- .../pump/common/events/EventPumpChanged.kt | 2 +- .../EventPumpConnectionParametersChanged.kt | 2 +- .../events/EventPumpFragmentValuesChanged.kt | 2 +- .../pump/common/sync/PumpDbEntry.kt | 6 +- .../common/sync/PumpSyncEntriesCreator.kt | 2 +- .../pump/common/sync/PumpSyncStorage.kt | 10 +- .../pump/common/ui/PumpBLEConfigActivity.kt | 12 +- .../pump/common/ui/PumpHistoryActivity.kt | 6 +- .../pump/common/utils/ProfileUtil.kt | 6 +- .../dialog/RileyLinkBLEConfigActivity.kt | 12 +- .../EventRileyLinkDeviceStatusChange.kt | 2 +- .../RileyLinkCommunicationManager.java | 10 +- .../common/hw/rileylink/RileyLinkUtil.java | 2 +- .../pump/common/hw/rileylink/ble/RFSpy.java | 12 +- .../common/hw/rileylink/ble/RFSpyReader.kt | 4 +- .../common/hw/rileylink/ble/RileyLinkBLE.kt | 8 +- .../hw/rileylink/ble/data/RadioResponse.java | 4 +- .../data/encoding/Encoding4b6bAbstract.java | 2 +- .../ble/data/encoding/Encoding4b6bGeoff.java | 2 +- .../ble/defs/RileyLinkEncodingType.java | 2 +- .../hw/rileylink/ble/device/OrangeLinkImpl.kt | 6 +- .../CharacteristicReadOperation.java | 4 +- .../CharacteristicWriteOperation.java | 4 +- .../operations/DescriptorWriteOperation.java | 4 +- .../hw/rileylink/data/RLHistoryItem.java | 2 +- .../dialog/RileyLinkStatusActivity.kt | 2 +- .../dialog/RileyLinkStatusGeneralFragment.kt | 10 +- .../dialog/RileyLinkStatusHistoryFragment.kt | 4 +- .../RileyLinkBluetoothStateReceiver.kt | 4 +- .../service/RileyLinkBroadcastReceiver.kt | 8 +- .../hw/rileylink/service/RileyLinkService.kt | 12 +- .../rileylink/service/RileyLinkServiceData.kt | 6 +- .../service/tasks/DiscoverGattServicesTask.kt | 2 +- .../tasks/InitializePumpManagerTask.kt | 10 +- .../tasks/ResetRileyLinkConfigurationTask.kt | 4 +- .../hw/rileylink/service/tasks/ServiceTask.kt | 2 +- .../service/tasks/ServiceTaskExecutor.kt | 4 +- .../service/tasks/WakeAndTuneTask.kt | 4 +- .../pump/virtual/VirtualPumpFragment.kt | 26 ++--- .../pump/virtual/VirtualPumpPlugin.kt | 62 +++++------ .../pump/virtual/di/VirtualPumpModule.kt | 2 +- .../events/EventVirtualPumpUpdateGui.kt | 2 +- .../extensions/PumpEnactResultExtension.kt | 4 +- .../pump/virtual/VirtualPumpPluginUTest.kt | 22 ++-- .../aaps/shared/impl/di/SharedImplModule.kt | 12 +- .../impl/logging/AAPSLoggerProduction.kt | 6 +- .../app/aaps/shared/impl/logging/LImpl.kt | 8 +- .../aaps/shared/impl/rx/AapsSchedulersImpl.kt | 2 +- .../app/aaps/shared/impl/rx/bus/RxBusImpl.kt | 10 +- .../sharedPreferences/SPImplementation.kt | 4 +- .../aaps/shared/impl/utils/DateUtilImpl.kt | 10 +- .../app/aaps/shared/impl/logging/LImplTest.kt | 4 +- .../app/aaps/shared/tests/AAPSLoggerTest.kt | 4 +- .../app/aaps/shared/tests/HardLimitsMock.kt | 6 +- .../kotlin/app/aaps/shared/tests/TestBase.kt | 4 +- .../aaps/shared/tests/TestBaseWithProfile.kt | 24 ++-- .../app/aaps/shared/tests/TestPumpPlugin.kt | 18 +-- .../shared/tests/rx/TestAapsSchedulers.kt | 2 +- .../ui/activities/ErrorHelperActivity.kt | 2 +- .../ui/activities/ProfileHelperActivity.kt | 24 ++-- .../ui/activities/QuickWizardListActivity.kt | 12 +- .../nightscout/ui/activities/StatsActivity.kt | 12 +- .../ui/activities/SurveyActivity.kt | 10 +- .../ui/activities/TDDStatsActivity.kt | 28 ++--- .../ui/activities/TreatmentsActivity.kt | 8 +- .../fragments/TreatmentsBolusCarbsFragment.kt | 28 ++--- .../fragments/TreatmentsCareportalFragment.kt | 26 ++--- .../TreatmentsExtendedBolusesFragment.kt | 24 ++-- .../TreatmentsProfileSwitchFragment.kt | 34 +++--- .../fragments/TreatmentsTempTargetFragment.kt | 30 ++--- .../TreatmentsTemporaryBasalsFragment.kt | 28 ++--- .../fragments/TreatmentsUserEntryFragment.kt | 22 ++-- .../ui/activityMonitor/ActivityMonitor.kt | 16 +-- .../nightscout/ui/alertDialogs/ErrorDialog.kt | 8 +- .../ui/defaultProfile/DefaultProfile.kt | 10 +- .../ui/defaultProfile/DefaultProfileDPV.kt | 8 +- .../ui/dialogs/BolusProgressDialog.kt | 22 ++-- .../ui/dialogs/CalibrationDialog.kt | 12 +- .../info/nightscout/ui/dialogs/CarbsDialog.kt | 44 ++++---- .../info/nightscout/ui/dialogs/CareDialog.kt | 22 ++-- .../ui/dialogs/DialogFragmentWithDate.kt | 10 +- .../ui/dialogs/EditQuickWizardDialog.kt | 12 +- .../ui/dialogs/ExtendedBolusDialog.kt | 20 ++-- .../info/nightscout/ui/dialogs/FillDialog.kt | 24 ++-- .../nightscout/ui/dialogs/InsulinDialog.kt | 60 +++++----- .../info/nightscout/ui/dialogs/LoopDialog.kt | 52 ++++----- .../ui/dialogs/ProfileSwitchDialog.kt | 28 ++--- .../ui/dialogs/ProfileViewerDialog.kt | 26 ++--- .../nightscout/ui/dialogs/TempBasalDialog.kt | 26 ++--- .../nightscout/ui/dialogs/TempTargetDialog.kt | 20 ++-- .../nightscout/ui/dialogs/TreatmentDialog.kt | 28 ++--- .../nightscout/ui/dialogs/WizardDialog.kt | 46 ++++---- .../nightscout/ui/dialogs/WizardInfoDialog.kt | 8 +- .../ui/elements/EmptyRecyclerView.kt | 4 +- .../ui/events/EventQuickWizardChange.kt | 2 +- .../ui/extensions/DoubleToSignedString.kt | 4 +- .../ui/services/AlarmSoundService.kt | 10 +- .../ui/services/AlarmSoundServiceHelper.kt | 6 +- .../info/nightscout/ui/tabs/TabPageAdapter.kt | 4 +- .../java/info/nightscout/ui/widget/Widget.kt | 40 +++---- .../ui/widget/WidgetConfigureActivity.kt | 2 +- .../ui/defaultProfile/DefaultProfileTest.kt | 2 +- .../info/nightscout/androidaps/WearApp.kt | 6 +- .../androidaps/comm/DataHandlerWear.kt | 20 ++-- .../comm/DataLayerListenerServiceWear.kt | 20 ++-- .../androidaps/comm/ExceptionHandlerWear.kt | 6 +- .../androidaps/comm/IntentWearToMobile.kt | 2 +- .../BaseComplicationProviderService.kt | 10 +- .../complications/BrCobIobComplication.kt | 2 +- .../complications/CobDetailedComplication.kt | 2 +- .../complications/CobIconComplication.kt | 2 +- .../complications/CobIobComplication.kt | 2 +- .../ComplicationTapBroadcastReceiver.kt | 6 +- .../complications/IobDetailedComplication.kt | 2 +- .../complications/IobIconComplication.kt | 2 +- .../complications/LongStatusComplication.kt | 2 +- .../LongStatusFlippedComplication.kt | 2 +- .../complications/SgvComplication.kt | 2 +- .../UploaderBatteryComplication.kt | 2 +- .../complications/WallpaperComplication.kt | 2 +- .../androidaps/data/RawDisplayData.kt | 2 +- .../events/EventWearPreferenceChange.kt | 2 +- .../androidaps/heartrate/HeartRateListener.kt | 8 +- .../interaction/ConfigurationActivity.kt | 4 +- .../interaction/TileConfigurationActivity.kt | 4 +- .../WatchfaceConfigurationActivity.kt | 4 +- .../actions/BackgroundActionActivity.kt | 10 +- .../interaction/actions/BolusActivity.kt | 10 +- .../interaction/actions/CarbActivity.kt | 6 +- .../interaction/actions/ECarbActivity.kt | 8 +- .../interaction/actions/FillActivity.kt | 6 +- .../actions/ProfileSwitchActivity.kt | 6 +- .../actions/QuickSnoozeActivity.kt | 6 +- .../interaction/actions/TempTargetActivity.kt | 6 +- .../interaction/actions/TreatmentActivity.kt | 12 +- .../actions/ViewSelectorActivity.kt | 4 +- .../interaction/actions/WizardActivity.kt | 6 +- .../interaction/menus/FillMenuActivity.kt | 4 +- .../interaction/menus/MainMenuActivity.kt | 6 +- .../interaction/menus/StatusMenuActivity.kt | 8 +- .../interaction/utils/DisplayFormat.kt | 2 +- .../utils/EditPlusMinusViewAdapter.kt | 2 +- .../interaction/utils/Inevitable.kt | 6 +- .../interaction/utils/MenuListActivity.kt | 4 +- .../interaction/utils/Persistence.kt | 16 +-- .../androidaps/interaction/utils/WearUtil.kt | 4 +- .../nightscout/androidaps/tile/TileBase.kt | 11 +- .../androidaps/tile/source/ActionSource.kt | 4 +- .../tile/source/QuickWizardSource.kt | 8 +- .../tile/source/StaticTileSource.kt | 6 +- .../tile/source/TempTargetSource.kt | 6 +- .../androidaps/watchfaces/CircleWatchface.kt | 18 +-- .../androidaps/watchfaces/CustomWatchface.kt | 38 +++---- .../watchfaces/DigitalStyleWatchface.kt | 2 +- .../watchfaces/SteampunkWatchface.kt | 2 +- .../watchfaces/utils/BaseWatchFace.kt | 22 ++-- .../watchfaces/utils/BgGraphBuilder.kt | 10 +- .../androidaps/watchfaces/utils/SimpleUi.kt | 6 +- .../nightscout/androidaps/WearTestBase.kt | 4 +- .../heartrate/HeartRateListenerTest.kt | 4 +- .../testing/mockers/RawDataMocker.kt | 6 +- .../nightscout/workflow/InvokeLoopWorker.kt | 8 +- .../nightscout/workflow/LoadBgDataWorker.kt | 18 +-- .../workflow/PrepareBasalDataWorker.kt | 8 +- .../workflow/PrepareBgDataWorker.kt | 12 +- .../workflow/PrepareBucketedDataWorker.kt | 8 +- .../PrepareIobAutosensGraphDataWorker.kt | 24 ++-- .../workflow/PreparePredictionsWorker.kt | 16 +-- .../PrepareTemporaryTargetDataWorker.kt | 10 +- .../workflow/PrepareTreatmentsDataWorker.kt | 20 ++-- .../nightscout/workflow/UpdateGraphWorker.kt | 6 +- .../workflow/UpdateIobCobSensWorker.kt | 8 +- .../nightscout/workflow/UpdateWidgetWorker.kt | 2 +- .../workflow/iob/CarbsInPastExtension.kt | 16 +-- .../workflow/iob/IobCobOref1Worker.kt | 36 +++--- .../workflow/iob/IobCobOrefWorker.kt | 36 +++--- 1455 files changed, 6458 insertions(+), 6459 deletions(-) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/actions/Actions.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/alerts/LocalAlertUtils.kt (91%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/androidPermissions/AndroidPermission.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/APS.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/APSResult.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/ApsMode.kt (85%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/AutosensData.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/AutosensDataStore.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/AutosensResult.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/BasalData.kt (74%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/DetermineBasalAdapter.kt (80%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/Loop.kt (86%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/SMBDefaults.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/Sensitivity.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/aps/VariableSensitivityResult.kt (65%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/automation/Automation.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/automation/AutomationEvent.kt (76%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/autotune/Autotune.kt (85%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/bgQualityCheck/BgQualityCheck.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/configuration/Config.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/configuration/ConfigBuilder.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/configuration/ConfigExportImport.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/configuration/Constants.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/constraints/Constraint.kt (93%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/constraints/ConstraintsChecker.kt (93%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/constraints/Objectives.kt (93%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/constraints/PluginConstraints.kt (94%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Safety.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/db/GlucoseUnit.kt (91%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/db/PersistenceLayer.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/extensions/UIUtils.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/insulin/Insulin.kt (86%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/CobInfo.kt (82%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/GlucoseStatus.kt (84%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/GlucoseStatusProvider.kt (80%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/InMemoryGlucoseValue.kt (96%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/Iob.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/IobCobCalculator.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/IobTotal.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/iob/MealData.kt (85%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/logging/AAPSLogger.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/logging/L.kt (76%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/logging/LTag.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/logging/LogElement.kt (79%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/logging/LoggerUtils.kt (65%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/logging/UserEntryLogger.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/ImportExportPrefs.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/PrefFileListProvider.kt (86%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/PrefMetadata.kt (80%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/PrefsFile.kt (89%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/PrefsImportDir.kt (55%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/PrefsMetadataKey.kt (80%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/maintenance/PrefsStatus.kt (66%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/notifications/Notification.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/notifications/NotificationHolder.kt (86%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/notifications/NotificationUserMessage.kt (85%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/nsclient/NSAlarm.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/nsclient/NSSettingsStatus.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/nsclient/NSSgv.kt (90%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/nsclient/ProcessedDeviceStatusData.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/nsclient/StoreDataForDb.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/objects/Instantiator.kt (53%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/overview/Overview.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/overview/OverviewMenus.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/plugin/ActivePlugin.kt (77%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/plugin/OwnDatabasePlugin.kt (59%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/plugin/PluginBase.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/plugin/PluginDescription.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/plugin/PluginFragment.kt (59%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/plugin/PluginType.kt (84%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/DefaultValueHelper.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/Profile.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/ProfileFunction.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/ProfileSource.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/ProfileStore.kt (90%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/ProfileUtil.kt (96%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/profile/PureProfile.kt (85%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profiling/Profiler.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/protection/PasswordCheck.kt (96%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/protection/ProtectionCheck.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/BlePreCheck.kt (78%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/BolusProgressData.kt (69%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/Dana.kt (89%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/DetailedBolusInfo.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/DetailedBolusInfoStorage.kt (81%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/Diaconn.kt (79%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/Insight.kt (81%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/Medtrum.kt (92%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodDash.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/OmnipodEros.kt (62%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/Pump.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/PumpEnactResult.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/PumpPluginBase.kt (61%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/PumpSync.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/TemporaryBasalStorage.kt (83%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/VirtualPump.kt (70%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/WarnColors.kt (91%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/actions/CustomAction.kt (76%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/actions/CustomActionType.kt (55%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/DoseSettings.kt (76%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/DoseStepSize.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/ManufacturerType.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/PumpCapability.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/PumpDescription.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/PumpTempBasalType.kt (58%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/pump/defs/PumpType.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/queue/Callback.kt (67%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/queue/Command.kt (88%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/queue/CommandQueue.kt (91%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/queue/CustomCommand.kt (64%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/receivers/Intents.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/receivers/ReceiverStatusStore.kt (65%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/resources/ResourceHelper.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/AapsSchedulers.kt (85%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/bus/RxBus.kt (76%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/Event.kt (91%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAcceptOpenLoopChange.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppExit.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppInitialized.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventAutosensCalculationFinished.kt (62%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventBTChange.kt (80%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBucketedDataCreated.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventChargingState.kt (65%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventConfigBuilderChange.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomActionsChanged.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventCustomCalculationFinished.kt (52%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventDanaRSyncStatus.kt (57%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDeviceStatusChange.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt (50%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt (68%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventDismissNotification.kt (56%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt (78%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventExtendedBolusChange.kt (51%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventFoodDatabaseChanged.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventInitializationChanged.kt (50%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLocalProfileChanged.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventLoop.kt (74%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventLoopUpdateGui.kt (66%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileDataToWear.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileToWear.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventNSClientNewLog.kt (93%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientRestart.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventNetworkChange.kt (85%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventNewBG.kt (60%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventNewHistoryData.kt (92%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventNewOpenLoopNotification.kt (51%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventNtpStatus.kt (61%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOfflineChange.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventOverviewBolusProgress.kt (86%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventPreferenceChange.kt (84%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileStoreChanged.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileSwitchChanged.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventPumpStatusChanged.kt (95%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventQueueChanged.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventRebuildTabs.kt (59%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventRefreshButtonState.kt (59%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventRefreshOverview.kt (65%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventSWRLStatus.kt (81%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventSWSyncStatus.kt (81%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventSWUpdate.kt (54%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventScale.kt (50%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventStatus.kt (78%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempBasalChange.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempTargetChange.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventThemeSwitch.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTherapyEventChange.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTreatmentChange.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventUpdateGui.kt (72%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt (60%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventUpdateOverviewGraph.kt (57%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventUpdateOverviewIobCob.kt (58%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventUpdateOverviewSensitivity.kt (60%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearCwfExported.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearDataToMobile.kt create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearToMobile.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventWearUpdateGui.kt (53%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/events/EventXdripNewLog.kt (93%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/weardata/CustomWatchfaceFormat.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/rx/weardata/EventData.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/sharedPreferences/SP.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/smoothing/Smoothing.kt (78%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/smsCommunicator/Sms.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/smsCommunicator/SmsCommunicator.kt (79%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/source/BgSource.kt (89%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/source/DexcomBoyda.kt (76%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/source/NSClientSource.kt (80%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/source/XDripSource.kt (58%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/stats/DexcomTIR.kt (83%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/stats/DexcomTirCalculator.kt (81%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/stats/TIR.kt (77%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/stats/TddCalculator.kt (93%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/stats/TirCalculator.kt (87%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/storage/Storage.kt (84%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/sync/DataSyncSelector.kt (98%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/sync/DataSyncSelectorXdrip.kt (57%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/sync/NsClient.kt (93%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/sync/Sync.kt (73%) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Tidepool.kt rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/sync/XDripBroadcast.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/ui/IconsProvider.kt (70%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/ui/UiInteraction.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/userEntry/UserEntryMapper.kt (99%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/userEntry/UserEntryPresentationHelper.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/userEntry/ValueWithUnitMapper.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/DateUtil.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/DecimalFormatter.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/HardLimits.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/MidnightTime.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/Round.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/SafeParse.kt (97%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/T.kt (95%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/TimeChangeType.kt (68%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/Translator.kt (94%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/utils/TrendCalculator.kt (90%) rename core/interfaces/src/main/kotlin/app/aaps/{ => core}/interfaces/versionChecker/VersionCheckerUtils.kt (83%) delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/actions/Actions.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Safety.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/profiling/Profiler.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodDash.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAcceptOpenLoopChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppExit.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppInitialized.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBucketedDataCreated.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventConfigBuilderChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomActionsChanged.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDeviceStatusChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventFoodDatabaseChanged.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLocalProfileChanged.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileDataToWear.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileToWear.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientRestart.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOfflineChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileStoreChanged.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileSwitchChanged.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventQueueChanged.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempBasalChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempTargetChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventThemeSwitch.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTherapyEventChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTreatmentChange.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearCwfExported.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearDataToMobile.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearToMobile.kt delete mode 100644 core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Tidepool.kt rename core/interfaces/src/test/kotlin/app/aaps/{ => core}/interfaces/rx/RxSchedulerRule.kt (96%) rename core/interfaces/src/test/kotlin/app/aaps/{ => core}/interfaces/rx/weardata/EventDataTest.kt (99%) rename core/interfaces/src/test/kotlin/app/aaps/{ => core}/interfaces/utils/SafeParseTest.kt (99%) diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt index e20b577970..98e6ea89de 100644 --- a/app/src/main/kotlin/app/aaps/MainActivity.kt +++ b/app/src/main/kotlin/app/aaps/MainActivity.kt @@ -36,25 +36,25 @@ import app.aaps.configuration.activities.SingleFragmentActivity import app.aaps.configuration.setupwizard.SetupWizardActivity import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventAppInitialized -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventRebuildTabs -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.ui.IconsProvider -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventAppInitialized +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventRebuildTabs +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.tabs.TabLayoutMediator import com.google.firebase.crashlytics.FirebaseCrashlytics diff --git a/app/src/main/kotlin/app/aaps/MainApp.kt b/app/src/main/kotlin/app/aaps/MainApp.kt index dd9e4b7126..7775aa2555 100644 --- a/app/src/main/kotlin/app/aaps/MainApp.kt +++ b/app/src/main/kotlin/app/aaps/MainApp.kt @@ -14,20 +14,20 @@ import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.PeriodicWorkRequest import androidx.work.WorkManager import app.aaps.di.DaggerAppComponent -import app.aaps.interfaces.alerts.LocalAlertUtils -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.extensions.runOnUiThread -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.alerts.LocalAlertUtils +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import app.aaps.receivers.BTReceiver import app.aaps.receivers.ChargingStateReceiver import app.aaps.receivers.KeepAliveWorker diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt index c299c1b0b3..28a27f4202 100644 --- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt @@ -11,24 +11,24 @@ import android.widget.TextView import app.aaps.core.main.events.EventIobCalculationProgress import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.extensions.toVisibilityKeepSpace -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.overview.OverviewMenus -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished -import app.aaps.interfaces.rx.events.EventCustomCalculationFinished -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.rx.events.EventScale -import app.aaps.interfaces.rx.events.EventUpdateOverviewGraph -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.extensions.toVisibilityKeepSpace +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.overview.OverviewMenus +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAutosensCalculationFinished +import app.aaps.core.interfaces.rx.events.EventCustomCalculationFinished +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.rx.events.EventScale +import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import com.google.android.material.datepicker.MaterialDatePicker import com.jjoe64.graphview.GraphView import dagger.android.HasAndroidInjector diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt index 3ee4154540..b83662ae3f 100644 --- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt +++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt @@ -3,16 +3,16 @@ package app.aaps.activities import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.implementation.overview.OverviewDataImpl diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt index 78bb95402c..a0096fc3b9 100644 --- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt @@ -16,21 +16,21 @@ import androidx.preference.PreferenceManager import androidx.preference.PreferenceScreen import androidx.preference.size import app.aaps.configuration.maintenance.MaintenancePlugin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.protection.PasswordCheck -import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC -import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD -import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN -import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.NONE -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventRebuildTabs -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC +import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD +import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN +import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.NONE +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventRebuildTabs +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.support.AndroidSupportInjection import info.nightscout.androidaps.R import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin diff --git a/app/src/main/kotlin/app/aaps/di/AppModule.kt b/app/src/main/kotlin/app/aaps/di/AppModule.kt index 8c3bdbb559..cd324c1758 100644 --- a/app/src/main/kotlin/app/aaps/di/AppModule.kt +++ b/app/src/main/kotlin/app/aaps/di/AppModule.kt @@ -6,10 +6,10 @@ import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.implementations.ConfigImpl import app.aaps.implementations.InstantiatorImpl import app.aaps.implementations.UiInteractionImpl -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.workflow.CalculationWorkflowImpl import dagger.Binds import dagger.Lazy diff --git a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt index b857a8f30d..9bf7fea7a8 100644 --- a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt +++ b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt @@ -2,7 +2,7 @@ package app.aaps.di import app.aaps.configuration.configBuilder.ConfigBuilderPlugin import app.aaps.configuration.maintenance.MaintenancePlugin -import app.aaps.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginBase import dagger.Binds import dagger.Module import dagger.multibindings.IntKey diff --git a/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt b/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt index 62d5f5650b..d729a327f5 100644 --- a/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt @@ -1,8 +1,8 @@ package app.aaps.implementations import android.os.Build -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.maintenance.PrefFileListProvider import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R import java.io.File diff --git a/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt b/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt index e19b821688..1eaa1401b7 100644 --- a/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt @@ -1,10 +1,10 @@ package app.aaps.implementations -import app.aaps.interfaces.aps.APSResult -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.APSResult +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.utils.DateUtil import dagger.Reusable import dagger.android.HasAndroidInjector import info.nightscout.implementation.profile.ProfileStoreObject diff --git a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt index 33c9c1482e..1186c9648c 100644 --- a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt @@ -12,10 +12,10 @@ import app.aaps.activities.MyPreferenceFragment import app.aaps.activities.PreferencesActivity import app.aaps.configuration.activities.SingleFragmentActivity import app.aaps.core.main.events.EventNewNotification -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.NSAlarm -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R import info.nightscout.core.ui.toast.ToastUtils diff --git a/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt index 3c32d96677..3d885b79da 100644 --- a/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt @@ -3,8 +3,8 @@ package app.aaps.receivers import android.bluetooth.BluetoothDevice import android.content.Context import android.content.Intent -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventBTChange +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventBTChange import dagger.android.DaggerBroadcastReceiver import info.nightscout.core.utils.extensions.safeGetParcelableExtra import javax.inject.Inject diff --git a/app/src/main/kotlin/app/aaps/receivers/ChargingStateReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/ChargingStateReceiver.kt index b55abb0ed9..a2eabfa652 100644 --- a/app/src/main/kotlin/app/aaps/receivers/ChargingStateReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/ChargingStateReceiver.kt @@ -4,11 +4,11 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.BatteryManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventChargingState +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventChargingState import dagger.android.DaggerBroadcastReceiver import javax.inject.Inject diff --git a/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt index 130b041fa8..719abe1576 100644 --- a/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt @@ -5,9 +5,9 @@ import android.content.Intent import android.provider.Telephony import androidx.work.Data import androidx.work.OneTimeWorkRequest -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.receivers.Intents +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.receivers.Intents import dagger.android.DaggerBroadcastReceiver import info.nightscout.core.utils.extensions.copyDouble import info.nightscout.core.utils.extensions.copyLong diff --git a/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt b/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt index b7669838fe..059cb6ad25 100644 --- a/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt +++ b/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt @@ -12,21 +12,21 @@ import androidx.work.workDataOf import app.aaps.configuration.maintenance.MaintenancePlugin import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.alerts.LocalAlertUtils -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.alerts.LocalAlertUtils +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import com.google.common.util.concurrent.ListenableFuture import info.nightscout.androidaps.R import info.nightscout.database.impl.AppRepository diff --git a/app/src/main/kotlin/app/aaps/receivers/TimeDateOrTZChangeReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/TimeDateOrTZChangeReceiver.kt index 52a597e6ec..31997add1d 100644 --- a/app/src/main/kotlin/app/aaps/receivers/TimeDateOrTZChangeReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/TimeDateOrTZChangeReceiver.kt @@ -2,11 +2,11 @@ package app.aaps.receivers import android.content.Context import android.content.Intent -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.utils.TimeChangeType import com.google.gson.Gson import dagger.android.DaggerBroadcastReceiver import java.util.Date diff --git a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt index 05d2d6eb9e..61a449cbce 100644 --- a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt +++ b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt @@ -13,20 +13,20 @@ import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event -import app.aaps.interfaces.rx.events.EventAppInitialized -import app.aaps.interfaces.rx.events.EventNewHistoryData -import app.aaps.interfaces.rx.events.EventOfflineChange -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventTherapyEventChange -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.EventAppInitialized +import app.aaps.core.interfaces.rx.events.EventNewHistoryData +import app.aaps.core.interfaces.rx.events.EventOfflineChange +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventTherapyEventChange +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.utils.worker.then diff --git a/app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt b/app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt index 14f91da86c..c0cf316d28 100644 --- a/app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt +++ b/app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt @@ -1,12 +1,12 @@ package app.aaps.configuration.maintenance import android.content.Context -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.LoggerUtils -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.LoggerUtils +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.HasAndroidInjector diff --git a/core/interfaces/build.gradle b/core/interfaces/build.gradle index 80c2e5ef58..7cef0cbe09 100644 --- a/core/interfaces/build.gradle +++ b/core/interfaces/build.gradle @@ -15,7 +15,7 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle" android { - namespace 'app.aaps.interfaces' + namespace 'app.aaps.core.interfaces' defaultConfig { minSdkVersion 25 // for wear } diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/actions/Actions.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/actions/Actions.kt new file mode 100644 index 0000000000..6c90b00535 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/actions/Actions.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.actions + +interface Actions \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/alerts/LocalAlertUtils.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt similarity index 91% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/alerts/LocalAlertUtils.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt index a320df1379..b702658068 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/alerts/LocalAlertUtils.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/alerts/LocalAlertUtils.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.alerts +package app.aaps.core.interfaces.alerts interface LocalAlertUtils { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/androidPermissions/AndroidPermission.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/androidPermissions/AndroidPermission.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/androidPermissions/AndroidPermission.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/androidPermissions/AndroidPermission.kt index d8d91007d8..cc2b6393cf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/androidPermissions/AndroidPermission.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/androidPermissions/AndroidPermission.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.androidPermissions +package app.aaps.core.interfaces.androidPermissions import android.content.Context import androidx.fragment.app.FragmentActivity -import app.aaps.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator interface AndroidPermission { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APS.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APS.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APS.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APS.kt index 62edd45dbf..e43902cd02 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APS.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APS.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps interface APS { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APSResult.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APSResult.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APSResult.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APSResult.kt index 2b8e046a47..b1dfe22efa 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APSResult.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APSResult.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps import android.text.Spanned -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.iob.IobTotal +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.iob.IobTotal import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/ApsMode.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/ApsMode.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/ApsMode.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/ApsMode.kt index 362e78098f..c3f2981dc5 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/ApsMode.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/ApsMode.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps enum class ApsMode { OPEN, diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensData.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensData.kt index ebb9907da6..2240f0a09c 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensData.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps interface AutosensData { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensDataStore.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensDataStore.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensDataStore.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensDataStore.kt index 67daaa6284..a0ccff4d3c 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensDataStore.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensDataStore.kt @@ -1,9 +1,9 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps import androidx.collection.LongSparseArray -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.GlucoseValue interface AutosensDataStore { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensResult.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensResult.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensResult.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensResult.kt index 9381591031..b5f6f7481a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensResult.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensResult.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps data class AutosensResult( diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/BasalData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/BasalData.kt similarity index 74% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/BasalData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/BasalData.kt index c5585a5a20..ab1073ab4b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/BasalData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/BasalData.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps class BasalData { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/DetermineBasalAdapter.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/DetermineBasalAdapter.kt similarity index 80% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/DetermineBasalAdapter.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/DetermineBasalAdapter.kt index 532b38ec7a..b0d8b0bb0d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/DetermineBasalAdapter.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/DetermineBasalAdapter.kt @@ -1,9 +1,9 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.iob.MealData -import app.aaps.interfaces.profile.Profile +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.iob.MealData +import app.aaps.core.interfaces.profile.Profile interface DetermineBasalAdapter { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Loop.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Loop.kt similarity index 86% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Loop.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Loop.kt index a5a3e22dd0..6778a6961a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Loop.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Loop.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.PumpEnactResult import info.nightscout.database.entities.OfflineEvent interface Loop { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/SMBDefaults.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/SMBDefaults.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/SMBDefaults.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/SMBDefaults.kt index d25a1c13da..bdab654e73 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/SMBDefaults.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/SMBDefaults.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps @Suppress("SpellCheckingInspection") object SMBDefaults { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Sensitivity.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Sensitivity.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Sensitivity.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Sensitivity.kt index 7f77672e74..c0f9b3e7a6 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Sensitivity.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Sensitivity.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps -import app.aaps.interfaces.configuration.ConfigExportImport +import app.aaps.core.interfaces.configuration.ConfigExportImport interface Sensitivity : ConfigExportImport { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/VariableSensitivityResult.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/VariableSensitivityResult.kt similarity index 65% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/VariableSensitivityResult.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/VariableSensitivityResult.kt index 70b21a6e25..38cf606e52 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/VariableSensitivityResult.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/VariableSensitivityResult.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.aps +package app.aaps.core.interfaces.aps interface VariableSensitivityResult { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/Automation.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/Automation.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/Automation.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/Automation.kt index f68da348e8..b544847e7b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/Automation.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/Automation.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.automation +package app.aaps.core.interfaces.automation interface Automation { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/AutomationEvent.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/AutomationEvent.kt similarity index 76% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/AutomationEvent.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/AutomationEvent.kt index fab60e1a50..268d864802 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/AutomationEvent.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/AutomationEvent.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.automation +package app.aaps.core.interfaces.automation interface AutomationEvent { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/autotune/Autotune.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/autotune/Autotune.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/autotune/Autotune.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/autotune/Autotune.kt index 259ee24ddf..4ddf5239c3 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/autotune/Autotune.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/autotune/Autotune.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.autotune +package app.aaps.core.interfaces.autotune interface Autotune { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/bgQualityCheck/BgQualityCheck.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/bgQualityCheck/BgQualityCheck.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/bgQualityCheck/BgQualityCheck.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/bgQualityCheck/BgQualityCheck.kt index 9cfcde10b7..8c3d83467d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/bgQualityCheck/BgQualityCheck.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/bgQualityCheck/BgQualityCheck.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.bgQualityCheck +package app.aaps.core.interfaces.bgQualityCheck import androidx.annotation.DrawableRes diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Config.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Config.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Config.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Config.kt index fb9b1df7a7..63cc4ae5f6 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Config.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Config.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.configuration +package app.aaps.core.interfaces.configuration @Suppress("PropertyName") interface Config { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigBuilder.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigBuilder.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigBuilder.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigBuilder.kt index 00c8a84bc1..065fc83a8e 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigBuilder.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigBuilder.kt @@ -1,11 +1,11 @@ -package app.aaps.interfaces.configuration +package app.aaps.core.interfaces.configuration import android.widget.LinearLayout import androidx.annotation.StringRes import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginType +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginType interface ConfigBuilder { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigExportImport.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigExportImport.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigExportImport.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigExportImport.kt index 24c5cbd599..a9ed681ff8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigExportImport.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigExportImport.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.configuration +package app.aaps.core.interfaces.configuration import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Constants.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Constants.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Constants.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Constants.kt index 4de1c66dc2..4c6165546b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Constants.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Constants.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.configuration +package app.aaps.core.interfaces.configuration /** * Created by mike on 07.06.2016. diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Constraint.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Constraint.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Constraint.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Constraint.kt index c17b4f2494..1a5456b0fa 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Constraint.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Constraint.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.constraints +package app.aaps.core.interfaces.constraints interface Constraint> { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/ConstraintsChecker.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/ConstraintsChecker.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/ConstraintsChecker.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/ConstraintsChecker.kt index dae8a06b65..222023a568 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/ConstraintsChecker.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/ConstraintsChecker.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.constraints +package app.aaps.core.interfaces.constraints -import app.aaps.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile /** * Constraints interface diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Objectives.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Objectives.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt index 53c546d132..39fd2583f2 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Objectives.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Objectives.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.constraints +package app.aaps.core.interfaces.constraints interface Objectives { companion object { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/PluginConstraints.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/PluginConstraints.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/PluginConstraints.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/PluginConstraints.kt index 629a749f91..a25599efe7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/PluginConstraints.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/PluginConstraints.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.constraints +package app.aaps.core.interfaces.constraints -import app.aaps.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile /** * PluginConstraints interface diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Safety.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Safety.kt new file mode 100644 index 0000000000..4a9c313ba9 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/Safety.kt @@ -0,0 +1,5 @@ +package app.aaps.core.interfaces.constraints + +import app.aaps.core.interfaces.configuration.ConfigExportImport + +interface Safety : ConfigExportImport \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/db/GlucoseUnit.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/db/GlucoseUnit.kt similarity index 91% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/db/GlucoseUnit.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/db/GlucoseUnit.kt index fa787eeb2f..df750893ee 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/db/GlucoseUnit.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/db/GlucoseUnit.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.db +package app.aaps.core.interfaces.db @Suppress("SpellCheckingInspection") enum class GlucoseUnit(val asText: String) { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/db/PersistenceLayer.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/db/PersistenceLayer.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/db/PersistenceLayer.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/db/PersistenceLayer.kt index 83ce689eb2..f4bcefcf5d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/db/PersistenceLayer.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/db/PersistenceLayer.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.db +package app.aaps.core.interfaces.db -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import dagger.android.HasAndroidInjector import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/extensions/UIUtils.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/extensions/UIUtils.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/extensions/UIUtils.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/extensions/UIUtils.kt index aa198ae71e..107db27dee 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/extensions/UIUtils.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/extensions/UIUtils.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.extensions +package app.aaps.core.interfaces.extensions import android.os.Handler import android.os.Looper diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/insulin/Insulin.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/insulin/Insulin.kt similarity index 86% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/insulin/Insulin.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/insulin/Insulin.kt index 5fc7089cad..76ee69147d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/insulin/Insulin.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/insulin/Insulin.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.insulin +package app.aaps.core.interfaces.insulin -import app.aaps.interfaces.configuration.ConfigExportImport -import app.aaps.interfaces.iob.Iob +import app.aaps.core.interfaces.configuration.ConfigExportImport +import app.aaps.core.interfaces.iob.Iob import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InsulinConfiguration diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/CobInfo.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/CobInfo.kt similarity index 82% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/CobInfo.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/CobInfo.kt index 27f943a4bb..45a7ea82ff 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/CobInfo.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/CobInfo.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob /** All COB up to now, including carbs not yet processed by IobCob calculation. */ data class CobInfo(val timestamp: Long, val displayCob: Double?, val futureCarbs: Double) \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatus.kt similarity index 84% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatus.kt index 1e76bff673..dcb54b6bd3 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob data class GlucoseStatus( val glucose: Double, diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatusProvider.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatusProvider.kt similarity index 80% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatusProvider.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatusProvider.kt index b3fa0cd364..f692001ce4 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatusProvider.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatusProvider.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob interface GlucoseStatusProvider { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValue.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/InMemoryGlucoseValue.kt similarity index 96% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValue.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/InMemoryGlucoseValue.kt index e5ba34852e..4b338ce2ec 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValue.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/InMemoryGlucoseValue.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob import info.nightscout.database.entities.GlucoseValue diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/Iob.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/Iob.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/Iob.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/Iob.kt index fef0b68885..35dfcc1f62 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/Iob.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/Iob.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob class Iob { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobCobCalculator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobCobCalculator.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobCobCalculator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobCobCalculator.kt index aeac669207..bb61178b6f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobCobCalculator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobCobCalculator.kt @@ -1,10 +1,10 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.BasalData -import app.aaps.interfaces.profile.Profile +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.BasalData +import app.aaps.core.interfaces.profile.Profile import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.TemporaryBasal import org.json.JSONArray diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobTotal.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobTotal.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobTotal.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobTotal.kt index 57704c39a5..b15d0b2f86 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobTotal.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobTotal.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob @Suppress("SpellCheckingInspection") open class IobTotal(val time: Long) { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/MealData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/MealData.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/MealData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/MealData.kt index 29e1b3eb60..e76e8e31a8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/MealData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/MealData.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob class MealData { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/AAPSLogger.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/AAPSLogger.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/AAPSLogger.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/AAPSLogger.kt index e33a2c48dd..e2e9890d89 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/AAPSLogger.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/AAPSLogger.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.logging +package app.aaps.core.interfaces.logging /** * Created by adrian on 2019-12-27. diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/L.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/L.kt similarity index 76% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/L.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/L.kt index d9b9796b4b..8e571d97c5 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/L.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/L.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.logging +package app.aaps.core.interfaces.logging interface L { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LTag.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LTag.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LTag.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LTag.kt index f4fa98373e..d516a7822f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LTag.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LTag.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.logging +package app.aaps.core.interfaces.logging enum class LTag(val tag: String, val defaultValue: Boolean = true, val requiresRestart: Boolean = false) { CORE("CORE"), diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LogElement.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LogElement.kt similarity index 79% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LogElement.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LogElement.kt index f66296e003..5e5f964ddf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LogElement.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LogElement.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.logging +package app.aaps.core.interfaces.logging interface LogElement { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LoggerUtils.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LoggerUtils.kt similarity index 65% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LoggerUtils.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LoggerUtils.kt index 70adf5e716..dd20e28dbd 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LoggerUtils.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LoggerUtils.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.logging +package app.aaps.core.interfaces.logging interface LoggerUtils { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/UserEntryLogger.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/UserEntryLogger.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/UserEntryLogger.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/UserEntryLogger.kt index 62ea19247f..2288b084f7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/UserEntryLogger.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/UserEntryLogger.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.logging +package app.aaps.core.interfaces.logging -import app.aaps.interfaces.userEntry.UserEntryMapper -import app.aaps.interfaces.userEntry.ValueWithUnitMapper +import app.aaps.core.interfaces.userEntry.UserEntryMapper +import app.aaps.core.interfaces.userEntry.ValueWithUnitMapper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/ImportExportPrefs.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/ImportExportPrefs.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/ImportExportPrefs.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/ImportExportPrefs.kt index 27acb5794e..4c7d4e8fdf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/ImportExportPrefs.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/ImportExportPrefs.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import app.aaps.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfData interface ImportExportPrefs { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefFileListProvider.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefFileListProvider.kt similarity index 86% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefFileListProvider.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefFileListProvider.kt index 259a6b71f4..ed0f3745cc 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefFileListProvider.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefFileListProvider.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance -import app.aaps.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfData import java.io.File interface PrefFileListProvider { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefMetadata.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefMetadata.kt similarity index 80% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefMetadata.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefMetadata.kt index f1f5868da0..747a5c7eab 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefMetadata.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefMetadata.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsFile.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsFile.kt similarity index 89% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsFile.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsFile.kt index d4fe3db6c8..b832474a6b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsFile.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsFile.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsImportDir.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsImportDir.kt similarity index 55% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsImportDir.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsImportDir.kt index e6a871c712..17c8863257 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsImportDir.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsImportDir.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance enum class PrefsImportDir { ROOT_DIR, diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsMetadataKey.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsMetadataKey.kt similarity index 80% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsMetadataKey.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsMetadataKey.kt index 13028c7495..a08fe54e4a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsMetadataKey.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsMetadataKey.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance import android.content.Context diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsStatus.kt similarity index 66% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsStatus.kt index 69e408fc23..6bb86bba73 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsStatus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.maintenance +package app.aaps.core.interfaces.maintenance import android.os.Parcelable diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/Notification.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/Notification.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt index ac99dda64c..ba138abaf8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/Notification.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/Notification.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.notifications +package app.aaps.core.interfaces.notifications import android.content.Context import androidx.annotation.RawRes diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationHolder.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationHolder.kt similarity index 86% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationHolder.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationHolder.kt index aba92859af..862b1ca919 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationHolder.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationHolder.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.notifications +package app.aaps.core.interfaces.notifications import android.app.Notification import android.app.PendingIntent diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationUserMessage.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationUserMessage.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationUserMessage.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationUserMessage.kt index b5e340bfe8..9a77cc5456 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationUserMessage.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationUserMessage.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.notifications +package app.aaps.core.interfaces.notifications class NotificationUserMessage(text: String) : Notification() { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSAlarm.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSAlarm.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSAlarm.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSAlarm.kt index 5047158d10..e1cbe43de7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSAlarm.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSAlarm.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.nsclient +package app.aaps.core.interfaces.nsclient interface NSAlarm { /* diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSettingsStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSSettingsStatus.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSettingsStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSSettingsStatus.kt index f48f94d15b..a165211cf7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSettingsStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSSettingsStatus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.nsclient +package app.aaps.core.interfaces.nsclient import android.content.Context import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSgv.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSSgv.kt similarity index 90% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSgv.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSSgv.kt index 5b8cf9d0c9..48db2fe227 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSgv.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/NSSgv.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.nsclient +package app.aaps.core.interfaces.nsclient /** * diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/ProcessedDeviceStatusData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/ProcessedDeviceStatusData.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/ProcessedDeviceStatusData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/ProcessedDeviceStatusData.kt index 7230fd649a..f9d69ac6e5 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/ProcessedDeviceStatusData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/ProcessedDeviceStatusData.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.nsclient +package app.aaps.core.interfaces.nsclient import android.text.Spanned -import app.aaps.interfaces.aps.APSResult +import app.aaps.core.interfaces.aps.APSResult import dagger.android.HasAndroidInjector import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/StoreDataForDb.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/StoreDataForDb.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/StoreDataForDb.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/StoreDataForDb.kt index ed971d958b..062126d0a4 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/StoreDataForDb.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/StoreDataForDb.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.nsclient +package app.aaps.core.interfaces.nsclient import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/objects/Instantiator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/objects/Instantiator.kt similarity index 53% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/objects/Instantiator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/objects/Instantiator.kt index 832a9d59d5..997a3d4112 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/objects/Instantiator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/objects/Instantiator.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.objects +package app.aaps.core.interfaces.objects -import app.aaps.interfaces.aps.APSResult -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.aps.APSResult +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.profile.ProfileStore import org.json.JSONObject interface Instantiator { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/Overview.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/Overview.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/Overview.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/Overview.kt index 084fc242e9..bfc10d6846 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/Overview.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/Overview.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.overview +package app.aaps.core.interfaces.overview import androidx.annotation.StringRes -import app.aaps.interfaces.configuration.ConfigExportImport -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.configuration.ConfigExportImport +import app.aaps.core.interfaces.rx.bus.RxBus interface Overview : ConfigExportImport { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/OverviewMenus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/OverviewMenus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt index ee15638fb1..a48dc688cc 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/OverviewMenus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.overview +package app.aaps.core.interfaces.overview import android.content.Context import android.widget.ImageButton diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/ActivePlugin.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt similarity index 77% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/ActivePlugin.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt index 8940202720..fb10ea0368 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/ActivePlugin.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt @@ -1,18 +1,18 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin -import app.aaps.interfaces.aps.APS -import app.aaps.interfaces.aps.Sensitivity -import app.aaps.interfaces.constraints.Objectives -import app.aaps.interfaces.constraints.Safety -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.overview.Overview -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.smoothing.Smoothing -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.sync.Sync +import app.aaps.core.interfaces.aps.APS +import app.aaps.core.interfaces.aps.Sensitivity +import app.aaps.core.interfaces.constraints.Objectives +import app.aaps.core.interfaces.constraints.Safety +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.overview.Overview +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.sync.Sync interface ActivePlugin { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/OwnDatabasePlugin.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/OwnDatabasePlugin.kt similarity index 59% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/OwnDatabasePlugin.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/OwnDatabasePlugin.kt index 6b7e4f3b29..0e9eb0d048 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/OwnDatabasePlugin.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/OwnDatabasePlugin.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin interface OwnDatabasePlugin { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginBase.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginBase.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginBase.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginBase.kt index c825f57e44..07f498cdec 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginBase.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginBase.kt @@ -1,10 +1,10 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector /** diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginDescription.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginDescription.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginDescription.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginDescription.kt index 40f26428ac..bcb73468e6 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginDescription.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginDescription.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin import app.aaps.annotations.OpenForTesting diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginFragment.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginFragment.kt similarity index 59% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginFragment.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginFragment.kt index 4236cc0c8c..21191047e9 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginFragment.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginFragment.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin interface PluginFragment { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginType.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginType.kt similarity index 84% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginType.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginType.kt index 9d6fc98eeb..2344ab5666 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginType.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginType.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin /** * Main plugin type diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/DefaultValueHelper.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/DefaultValueHelper.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/DefaultValueHelper.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/DefaultValueHelper.kt index 8f6c45c26f..2958d86e83 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/DefaultValueHelper.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/DefaultValueHelper.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile interface DefaultValueHelper { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/Profile.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/Profile.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/Profile.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/Profile.kt index 4cdf7f9ad2..3f0f36fb37 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/Profile.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/Profile.kt @@ -1,13 +1,13 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.Round import org.json.JSONObject interface Profile { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileFunction.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileFunction.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileFunction.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileFunction.kt index 4464b737b9..e3ecdf6c92 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileFunction.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileFunction.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import info.nightscout.database.entities.ProfileSwitch interface ProfileFunction { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileSource.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileSource.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileSource.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileSource.kt index 2c98a379bc..33434f3873 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileSource.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileSource.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile import androidx.fragment.app.FragmentActivity import org.json.JSONArray diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileStore.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileStore.kt similarity index 90% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileStore.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileStore.kt index df6e7211da..d7d8243145 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileStore.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileStore.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileUtil.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileUtil.kt similarity index 96% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileUtil.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileUtil.kt index 3911491f41..081161ed8a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileUtil.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileUtil.kt @@ -1,11 +1,11 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit interface ProfileUtil { /** - * Units selected in [app.aaps.interfaces.sharedPreferences.SP] + * Units selected in [app.aaps.core.interfaces.sharedPreferences.SP] * * @return GlucoseUnit for UI */ diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/PureProfile.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/PureProfile.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/PureProfile.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/PureProfile.kt index dc6162ba5f..fe1644aec1 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/PureProfile.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/PureProfile.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.data.TargetBlock import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profiling/Profiler.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profiling/Profiler.kt new file mode 100644 index 0000000000..4fb9c58ed4 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profiling/Profiler.kt @@ -0,0 +1,8 @@ +package app.aaps.core.interfaces.profiling + +import app.aaps.core.interfaces.logging.LTag + +interface Profiler { + + fun log(lTag: LTag, function: String, start: Long) +} \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/PasswordCheck.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/PasswordCheck.kt similarity index 96% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/PasswordCheck.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/PasswordCheck.kt index 3b06910181..c0b5777ab1 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/PasswordCheck.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/PasswordCheck.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.protection +package app.aaps.core.interfaces.protection import android.content.Context import androidx.annotation.StringRes diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/ProtectionCheck.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/ProtectionCheck.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/ProtectionCheck.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/ProtectionCheck.kt index a040808383..b4e24c9a3f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/ProtectionCheck.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/ProtectionCheck.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.protection +package app.aaps.core.interfaces.protection import androidx.fragment.app.FragmentActivity diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BlePreCheck.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BlePreCheck.kt similarity index 78% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BlePreCheck.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BlePreCheck.kt index 84c54a03e5..93fccd2825 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BlePreCheck.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BlePreCheck.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump import androidx.appcompat.app.AppCompatActivity diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BolusProgressData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BolusProgressData.kt similarity index 69% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BolusProgressData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BolusProgressData.kt index 22c0cb2f64..94e2ab6913 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BolusProgressData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BolusProgressData.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump object BolusProgressData { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Dana.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Dana.kt similarity index 89% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Dana.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Dana.kt index f709eb591b..7d20fb31b2 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Dana.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Dana.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump /** * Functionality supported by Dana* pumps only diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/DetailedBolusInfo.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/DetailedBolusInfo.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/DetailedBolusInfo.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/DetailedBolusInfo.kt index dfdd0be259..f786979a75 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/DetailedBolusInfo.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/DetailedBolusInfo.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump import android.content.Context -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.pump.defs.PumpType import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.Carbs diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoStorage.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/DetailedBolusInfoStorage.kt similarity index 81% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoStorage.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/DetailedBolusInfoStorage.kt index fe99a3caa6..601fcf16a8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoStorage.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/DetailedBolusInfoStorage.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump interface DetailedBolusInfoStorage { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Diaconn.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Diaconn.kt similarity index 79% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Diaconn.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Diaconn.kt index 896609a675..9b97e20eb2 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Diaconn.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Diaconn.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump interface Diaconn { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Insight.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Insight.kt similarity index 81% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Insight.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Insight.kt index a0750eb03f..8ee72c5beb 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Insight.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Insight.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump interface Insight { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Medtrum.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Medtrum.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Medtrum.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Medtrum.kt index 3f7c1f571c..ddc734e96d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Medtrum.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Medtrum.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump /** * Functionality supported by Medtrum* pumps only diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodDash.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodDash.kt new file mode 100644 index 0000000000..6a0e7afc6b --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodDash.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.pump + +interface OmnipodDash \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodEros.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodEros.kt similarity index 62% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodEros.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodEros.kt index 45595435da..03adac94b4 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodEros.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/OmnipodEros.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump interface OmnipodEros { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Pump.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Pump.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Pump.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Pump.kt index d77f87cc8a..9db46de755 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/Pump.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/Pump.kt @@ -1,13 +1,13 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.pump.actions.CustomActionType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CustomCommand -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.utils.TimeChangeType import org.json.JSONObject /** diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpEnactResult.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpEnactResult.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpEnactResult.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpEnactResult.kt index 5363c0fbb1..07d642863b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpEnactResult.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpEnactResult.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump import android.content.Context import dagger.android.HasAndroidInjector diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpPluginBase.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpPluginBase.kt similarity index 61% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpPluginBase.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpPluginBase.kt index 8e26996cf8..0e0fc0110e 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpPluginBase.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpPluginBase.kt @@ -1,13 +1,13 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump import android.os.SystemClock -import app.aaps.interfaces.R -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.R +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector abstract class PumpPluginBase( diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpSync.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpSync.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpSync.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpSync.kt index 5233258993..92d5697e17 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/PumpSync.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpSync.kt @@ -1,10 +1,10 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TemporaryBasal import kotlin.math.max import kotlin.math.min diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/TemporaryBasalStorage.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/TemporaryBasalStorage.kt similarity index 83% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/TemporaryBasalStorage.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/TemporaryBasalStorage.kt index c08e983878..c24e3ab42f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/TemporaryBasalStorage.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/TemporaryBasalStorage.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump interface TemporaryBasalStorage { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/VirtualPump.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/VirtualPump.kt similarity index 70% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/VirtualPump.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/VirtualPump.kt index 376bb620bf..ae6604f34f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/VirtualPump.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/VirtualPump.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump interface VirtualPump { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/WarnColors.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/WarnColors.kt similarity index 91% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/WarnColors.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/WarnColors.kt index da18e6a731..847b32b94f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/WarnColors.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/WarnColors.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump import android.widget.TextView import info.nightscout.database.entities.TherapyEvent diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/actions/CustomAction.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/actions/CustomAction.kt similarity index 76% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/actions/CustomAction.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/actions/CustomAction.kt index a732b22d37..f4348642f0 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/actions/CustomAction.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/actions/CustomAction.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.actions +package app.aaps.core.interfaces.pump.actions data class CustomAction( val name: Int, diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/actions/CustomActionType.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/actions/CustomActionType.kt similarity index 55% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/actions/CustomActionType.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/actions/CustomActionType.kt index 0afe44a12f..370695b0c4 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/actions/CustomActionType.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/actions/CustomActionType.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.actions +package app.aaps.core.interfaces.pump.actions interface CustomActionType { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/DoseSettings.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/DoseSettings.kt similarity index 76% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/DoseSettings.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/DoseSettings.kt index 419075b96e..e7e1c557b0 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/DoseSettings.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/DoseSettings.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs class DoseSettings(val step: Double, val durationStep: Int, val maxDuration: Int, val minDose: Double, val maxDose: Double = Double.MAX_VALUE) \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/DoseStepSize.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/DoseStepSize.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/DoseStepSize.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/DoseStepSize.kt index 58f6e64f04..621d735477 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/DoseStepSize.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/DoseStepSize.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs import java.util.Locale diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/ManufacturerType.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/ManufacturerType.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/ManufacturerType.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/ManufacturerType.kt index 97cfe7e1ad..71125404a2 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/ManufacturerType.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/ManufacturerType.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs enum class ManufacturerType(val description: String) { AAPS("AAPS"), diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpCapability.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpCapability.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpCapability.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpCapability.kt index aa8d887fcc..7b72c30af4 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpCapability.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpCapability.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs enum class PumpCapability { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpDescription.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpDescription.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpDescription.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpDescription.kt index 26e19a8ac9..6d65db1233 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpDescription.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpDescription.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs class PumpDescription() { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpTempBasalType.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpTempBasalType.kt similarity index 58% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpTempBasalType.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpTempBasalType.kt index e5303a93d9..f5d000f72d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpTempBasalType.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpTempBasalType.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs enum class PumpTempBasalType { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpType.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpType.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpType.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpType.kt index 0cbb0c59fe..ebf385556e 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/defs/PumpType.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpType.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.utils.Round import kotlin.math.min @Suppress("unused") diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/Callback.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/Callback.kt similarity index 67% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/Callback.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/Callback.kt index bb3828ebf2..19eda218aa 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/Callback.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/Callback.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.queue +package app.aaps.core.interfaces.queue -import app.aaps.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpEnactResult abstract class Callback : Runnable { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/Command.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/Command.kt similarity index 88% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/Command.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/Command.kt index 7d870345e1..5caadcf633 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/Command.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/Command.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.queue +package app.aaps.core.interfaces.queue -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/CommandQueue.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/CommandQueue.kt similarity index 91% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/CommandQueue.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/CommandQueue.kt index 43f0752ce2..a15ac38c4f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/CommandQueue.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/CommandQueue.kt @@ -1,9 +1,9 @@ -package app.aaps.interfaces.queue +package app.aaps.core.interfaces.queue import android.text.Spanned -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync interface CommandQueue { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/CustomCommand.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/CustomCommand.kt similarity index 64% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/CustomCommand.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/CustomCommand.kt index 8cc549e0d8..312a4dfbb6 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/queue/CustomCommand.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/queue/CustomCommand.kt @@ -1,15 +1,15 @@ -package app.aaps.interfaces.queue +package app.aaps.core.interfaces.queue import java.io.Serializable /** * Implement this interface for every custom pump command that you want to be able to queue - * See [app.aaps.interfaces.queue.CommandQueue.customCommand] for queuing a custom command. + * See [app.aaps.core.interfaces.queue.CommandQueue.customCommand] for queuing a custom command. */ interface CustomCommand : Serializable { /** - * @return short description of this command to be used in [app.aaps.interfaces.queue.Command.status] + * @return short description of this command to be used in [app.aaps.core.interfaces.queue.Command.status] * The description is typically all caps. */ val statusDescription: String diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/receivers/Intents.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/receivers/Intents.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/receivers/Intents.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/receivers/Intents.kt index 160fbfa18a..fbcfca67e6 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/receivers/Intents.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/receivers/Intents.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.receivers +package app.aaps.core.interfaces.receivers @Suppress("unused") interface Intents { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/receivers/ReceiverStatusStore.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/receivers/ReceiverStatusStore.kt similarity index 65% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/receivers/ReceiverStatusStore.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/receivers/ReceiverStatusStore.kt index aaa6e198a3..3f2c769797 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/receivers/ReceiverStatusStore.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/receivers/ReceiverStatusStore.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.receivers +package app.aaps.core.interfaces.receivers -import app.aaps.interfaces.rx.events.EventChargingState -import app.aaps.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.rx.events.EventChargingState +import app.aaps.core.interfaces.rx.events.EventNetworkChange interface ReceiverStatusStore { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/resources/ResourceHelper.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/resources/ResourceHelper.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/resources/ResourceHelper.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/resources/ResourceHelper.kt index a9df9bf2f3..517ec7a4ca 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/resources/ResourceHelper.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/resources/ResourceHelper.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.resources +package app.aaps.core.interfaces.resources import android.content.Context import android.content.res.AssetFileDescriptor diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/AapsSchedulers.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/AapsSchedulers.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/AapsSchedulers.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/AapsSchedulers.kt index 21f716dca0..9392965dcf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/AapsSchedulers.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/AapsSchedulers.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx +package app.aaps.core.interfaces.rx import io.reactivex.rxjava3.core.Scheduler diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/bus/RxBus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/bus/RxBus.kt similarity index 76% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/bus/RxBus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/bus/RxBus.kt index de0a815fd8..907a530eba 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/bus/RxBus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/bus/RxBus.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.rx.bus +package app.aaps.core.interfaces.rx.bus -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import io.reactivex.rxjava3.core.Observable interface RxBus { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/Event.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/Event.kt similarity index 91% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/Event.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/Event.kt index bccdf039e4..e1a7edefb7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/Event.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/Event.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import org.apache.commons.lang3.builder.ReflectionToStringBuilder import org.apache.commons.lang3.builder.ToStringStyle diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAcceptOpenLoopChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAcceptOpenLoopChange.kt new file mode 100644 index 0000000000..cd21acaa3e --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAcceptOpenLoopChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventAcceptOpenLoopChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppExit.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppExit.kt new file mode 100644 index 0000000000..3b5f137ea4 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppExit.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventAppExit : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppInitialized.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppInitialized.kt new file mode 100644 index 0000000000..dfc1b20b5f --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAppInitialized.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventAppInitialized : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAutosensCalculationFinished.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAutosensCalculationFinished.kt similarity index 62% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAutosensCalculationFinished.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAutosensCalculationFinished.kt index 15edf45579..f64fb1e50d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAutosensCalculationFinished.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventAutosensCalculationFinished.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventAutosensCalculationFinished(val cause: Event?) : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBTChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBTChange.kt similarity index 80% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBTChange.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBTChange.kt index 8c11af0b4a..3cb3e03ce8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBTChange.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBTChange.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventBTChange(val state: Change, val deviceName: String?, val deviceAddress: String? = null) : Event() { diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBucketedDataCreated.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBucketedDataCreated.kt new file mode 100644 index 0000000000..ecb495f715 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventBucketedDataCreated.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventBucketedDataCreated : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventChargingState.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventChargingState.kt similarity index 65% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventChargingState.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventChargingState.kt index 51362cfa13..ec284878f7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventChargingState.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventChargingState.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventChargingState(val isCharging: Boolean, val batterLevel: Int) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventConfigBuilderChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventConfigBuilderChange.kt new file mode 100644 index 0000000000..d484920972 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventConfigBuilderChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventConfigBuilderChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomActionsChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomActionsChanged.kt new file mode 100644 index 0000000000..75ed919fae --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomActionsChanged.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventCustomActionsChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomCalculationFinished.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomCalculationFinished.kt similarity index 52% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomCalculationFinished.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomCalculationFinished.kt index 216207d14a..68b61f3195 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomCalculationFinished.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventCustomCalculationFinished.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventCustomCalculationFinished : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDanaRSyncStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDanaRSyncStatus.kt similarity index 57% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDanaRSyncStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDanaRSyncStatus.kt index 6ce993eb7c..67cb90747f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDanaRSyncStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDanaRSyncStatus.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventDanaRSyncStatus(var message: String) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDeviceStatusChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDeviceStatusChange.kt new file mode 100644 index 0000000000..35f7c7603c --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDeviceStatusChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventDeviceStatusChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt similarity index 50% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt index cbf22bf87f..d6d141da8a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDiaconnG8PumpLogReset.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventDiaconnG8PumpLogReset : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt similarity index 68% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt index 323dc81598..4d0ffc64e6 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDismissBolusProgressIfRunning.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventDismissBolusProgressIfRunning(val resultSuccess: Boolean?, val id: Long?) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDismissNotification.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDismissNotification.kt similarity index 56% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDismissNotification.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDismissNotification.kt index aef67569cf..32ecd45543 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDismissNotification.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventDismissNotification.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventDismissNotification(var id: Int) : Event() diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt similarity index 78% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt index ef374241dc..9d1244dde8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventEffectiveProfileSwitchChanged.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventEffectiveProfileSwitchChanged(timestamp: Long?) : Event() { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventExtendedBolusChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventExtendedBolusChange.kt similarity index 51% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventExtendedBolusChange.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventExtendedBolusChange.kt index 86366da3b3..1aa65f4d33 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventExtendedBolusChange.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventExtendedBolusChange.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventExtendedBolusChange : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventFoodDatabaseChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventFoodDatabaseChanged.kt new file mode 100644 index 0000000000..c95e1c55ba --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventFoodDatabaseChanged.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventFoodDatabaseChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventInitializationChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventInitializationChanged.kt similarity index 50% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventInitializationChanged.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventInitializationChanged.kt index fd49c7ad9c..15d7704315 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventInitializationChanged.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventInitializationChanged.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventInitializationChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLocalProfileChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLocalProfileChanged.kt new file mode 100644 index 0000000000..7f711dc4cd --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLocalProfileChanged.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventLocalProfileChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLoop.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLoop.kt similarity index 74% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLoop.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLoop.kt index 49fe3f90df..7c09d12ceb 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLoop.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLoop.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events /** Supeclass for all events concerned with input or output into or from the LoopPlugin. */ abstract class EventLoop : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLoopUpdateGui.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLoopUpdateGui.kt similarity index 66% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLoopUpdateGui.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLoopUpdateGui.kt index 73897204f1..5f6e9a7dea 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLoopUpdateGui.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventLoopUpdateGui.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events /** * Created by mike on 05.08.2016. diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileDataToWear.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileDataToWear.kt new file mode 100644 index 0000000000..6f3ef85b9b --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileDataToWear.kt @@ -0,0 +1,5 @@ +package app.aaps.core.interfaces.rx.events + +import app.aaps.core.interfaces.rx.weardata.EventData + +class EventMobileDataToWear(val payload: EventData.ActionSetCustomWatchface) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileToWear.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileToWear.kt new file mode 100644 index 0000000000..c4ceb71fbe --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventMobileToWear.kt @@ -0,0 +1,5 @@ +package app.aaps.core.interfaces.rx.events + +import app.aaps.core.interfaces.rx.weardata.EventData + +class EventMobileToWear(val payload: EventData) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientNewLog.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientNewLog.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientNewLog.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientNewLog.kt index bfec19d767..fb2bd18b0b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientNewLog.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientNewLog.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import java.text.SimpleDateFormat import java.util.Locale diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientRestart.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientRestart.kt new file mode 100644 index 0000000000..9663e32a41 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNSClientRestart.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventNSClientRestart : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNetworkChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNetworkChange.kt similarity index 85% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNetworkChange.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNetworkChange.kt index fbfbb79f02..fc0bb64181 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNetworkChange.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNetworkChange.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventNetworkChange( var mobileConnected: Boolean = false, diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewBG.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewBG.kt similarity index 60% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewBG.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewBG.kt index 3d7026433a..e933bff4bf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewBG.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewBG.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventNewBG(val glucoseValueTimestamp: Long?) : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewHistoryData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewHistoryData.kt similarity index 92% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewHistoryData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewHistoryData.kt index 3a84461fa1..a8340ade08 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewHistoryData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewHistoryData.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewOpenLoopNotification.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewOpenLoopNotification.kt similarity index 51% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewOpenLoopNotification.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewOpenLoopNotification.kt index de6cc6171c..47fabf12de 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNewOpenLoopNotification.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNewOpenLoopNotification.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventNewOpenLoopNotification : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNtpStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNtpStatus.kt similarity index 61% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNtpStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNtpStatus.kt index 0267d3c1df..3e2faa081e 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNtpStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventNtpStatus.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventNtpStatus(val status: String, val percent: Int) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOfflineChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOfflineChange.kt new file mode 100644 index 0000000000..05071b0141 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOfflineChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventOfflineChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOverviewBolusProgress.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOverviewBolusProgress.kt similarity index 86% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOverviewBolusProgress.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOverviewBolusProgress.kt index 2eb154971f..7a5c6b58c1 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOverviewBolusProgress.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOverviewBolusProgress.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events object EventOverviewBolusProgress : Event() { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventPreferenceChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventPreferenceChange.kt similarity index 84% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventPreferenceChange.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventPreferenceChange.kt index 5292da0efb..bb696694f7 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventPreferenceChange.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventPreferenceChange.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventPreferenceChange : Event { diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileStoreChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileStoreChanged.kt new file mode 100644 index 0000000000..5072bafec4 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileStoreChanged.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventProfileStoreChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileSwitchChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileSwitchChanged.kt new file mode 100644 index 0000000000..c2c5ebbcc8 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventProfileSwitchChanged.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventProfileSwitchChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventPumpStatusChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventPumpStatusChanged.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventPumpStatusChanged.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventPumpStatusChanged.kt index c151bc2dd8..34ae5a4051 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventPumpStatusChanged.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventPumpStatusChanged.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import android.content.Context -import app.aaps.interfaces.R +import app.aaps.core.interfaces.R class EventPumpStatusChanged : EventStatus { diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventQueueChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventQueueChanged.kt new file mode 100644 index 0000000000..a102d816a3 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventQueueChanged.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventQueueChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRebuildTabs.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRebuildTabs.kt similarity index 59% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRebuildTabs.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRebuildTabs.kt index 6820eaafae..b547e0de0d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRebuildTabs.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRebuildTabs.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventRebuildTabs(var recreate: Boolean = false) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRefreshButtonState.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRefreshButtonState.kt similarity index 59% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRefreshButtonState.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRefreshButtonState.kt index 095d0ad0c3..2e57499d19 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRefreshButtonState.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRefreshButtonState.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventRefreshButtonState(val newState: Boolean) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRefreshOverview.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRefreshOverview.kt similarity index 65% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRefreshOverview.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRefreshOverview.kt index d7bd44013f..a12304a6ca 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventRefreshOverview.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventRefreshOverview.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventRefreshOverview(var from: String, val now: Boolean = false) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWRLStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWRLStatus.kt similarity index 81% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWRLStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWRLStatus.kt index 47ae069b6e..c9938af638 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWRLStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWRLStatus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import android.content.Context diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWSyncStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWSyncStatus.kt similarity index 81% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWSyncStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWSyncStatus.kt index d9fdc58671..904b86cb33 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWSyncStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWSyncStatus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import android.content.Context diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWUpdate.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWUpdate.kt similarity index 54% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWUpdate.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWUpdate.kt index 1172c75b25..494fe4059b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventSWUpdate.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventSWUpdate.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventSWUpdate(var redraw: Boolean) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventScale.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventScale.kt similarity index 50% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventScale.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventScale.kt index 39dbe77aee..4566d064b2 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventScale.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventScale.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventScale(val hours: Int) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventStatus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventStatus.kt similarity index 78% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventStatus.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventStatus.kt index a00de1ad3c..6951c5ee4a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventStatus.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventStatus.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import android.content.Context diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempBasalChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempBasalChange.kt new file mode 100644 index 0000000000..0da4180df8 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempBasalChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventTempBasalChange : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempTargetChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempTargetChange.kt new file mode 100644 index 0000000000..6b1d3b67e1 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTempTargetChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventTempTargetChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventThemeSwitch.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventThemeSwitch.kt new file mode 100644 index 0000000000..34dd6ef788 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventThemeSwitch.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventThemeSwitch : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTherapyEventChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTherapyEventChange.kt new file mode 100644 index 0000000000..7515ce6a17 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTherapyEventChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventTherapyEventChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTreatmentChange.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTreatmentChange.kt new file mode 100644 index 0000000000..36673c30f4 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventTreatmentChange.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.rx.events + +class EventTreatmentChange : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateGui.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateGui.kt similarity index 72% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateGui.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateGui.kt index 87700124e2..35eb73d921 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateGui.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateGui.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events /** Base class for events to update the UI, mostly a specific tab. */ abstract class EventUpdateGui : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt similarity index 60% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt index 5d4e89ddb3..9f54da0915 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewCalcProgress.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventUpdateOverviewCalcProgress(val from: String) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewGraph.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewGraph.kt similarity index 57% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewGraph.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewGraph.kt index 4db2507aeb..31a592a1e8 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewGraph.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewGraph.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventUpdateOverviewGraph(val from: String) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewIobCob.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewIobCob.kt similarity index 58% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewIobCob.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewIobCob.kt index e4d4431d35..934f5a7002 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewIobCob.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewIobCob.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventUpdateOverviewIobCob(val from: String) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewSensitivity.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewSensitivity.kt similarity index 60% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewSensitivity.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewSensitivity.kt index a04a44c342..0574283556 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventUpdateOverviewSensitivity.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventUpdateOverviewSensitivity.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events class EventUpdateOverviewSensitivity(val from: String) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearCwfExported.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearCwfExported.kt new file mode 100644 index 0000000000..4011682047 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearCwfExported.kt @@ -0,0 +1,5 @@ +package app.aaps.core.interfaces.rx.events + +import app.aaps.core.interfaces.rx.weardata.EventData + +class EventWearCwfExported(val payload: EventData.ActionSetCustomWatchface) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearDataToMobile.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearDataToMobile.kt new file mode 100644 index 0000000000..e276207b5d --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearDataToMobile.kt @@ -0,0 +1,5 @@ +package app.aaps.core.interfaces.rx.events + +import app.aaps.core.interfaces.rx.weardata.EventData + +class EventWearDataToMobile(val payload: EventData) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearToMobile.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearToMobile.kt new file mode 100644 index 0000000000..fe740beb72 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearToMobile.kt @@ -0,0 +1,5 @@ +package app.aaps.core.interfaces.rx.events + +import app.aaps.core.interfaces.rx.weardata.EventData + +class EventWearToMobile(val payload: EventData) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearUpdateGui.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearUpdateGui.kt similarity index 53% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearUpdateGui.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearUpdateGui.kt index 7ada7af398..6686822ea9 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearUpdateGui.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventWearUpdateGui.kt @@ -1,5 +1,5 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events -import app.aaps.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfData class EventWearUpdateGui(val customWatchfaceData: CwfData? = null, val exportFile: Boolean = false) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventXdripNewLog.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventXdripNewLog.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventXdripNewLog.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventXdripNewLog.kt index 0da18f5a90..c6649282f1 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventXdripNewLog.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventXdripNewLog.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.events +package app.aaps.core.interfaces.rx.events import java.text.SimpleDateFormat import java.util.Locale diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/weardata/CustomWatchfaceFormat.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/CustomWatchfaceFormat.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/weardata/CustomWatchfaceFormat.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/CustomWatchfaceFormat.kt index 5d05fcbd82..f518792d0c 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/weardata/CustomWatchfaceFormat.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/CustomWatchfaceFormat.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.weardata +package app.aaps.core.interfaces.rx.weardata import android.content.res.Resources import android.graphics.BitmapFactory @@ -7,7 +7,7 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.PictureDrawable import androidx.annotation.StringRes -import app.aaps.interfaces.R +import app.aaps.core.interfaces.R import com.caverock.androidsvg.SVG import kotlinx.serialization.Serializable import org.json.JSONObject diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/weardata/EventData.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/EventData.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/weardata/EventData.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/EventData.kt index 9b1799afb4..548e4b071b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/weardata/EventData.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/EventData.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.rx.weardata +package app.aaps.core.interfaces.rx.weardata -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sharedPreferences/SP.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sharedPreferences/SP.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/sharedPreferences/SP.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sharedPreferences/SP.kt index 2053506be3..2e008c7787 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sharedPreferences/SP.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sharedPreferences/SP.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.sharedPreferences +package app.aaps.core.interfaces.sharedPreferences import androidx.annotation.StringRes diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/smoothing/Smoothing.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smoothing/Smoothing.kt similarity index 78% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/smoothing/Smoothing.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smoothing/Smoothing.kt index 2740c6a343..dea4e59a8e 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/smoothing/Smoothing.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smoothing/Smoothing.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.smoothing +package app.aaps.core.interfaces.smoothing -import app.aaps.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue interface Smoothing { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/smsCommunicator/Sms.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/Sms.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/smsCommunicator/Sms.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/Sms.kt index a83667a14a..66c38d6943 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/smsCommunicator/Sms.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/Sms.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.smsCommunicator +package app.aaps.core.interfaces.smsCommunicator import android.telephony.SmsMessage diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/smsCommunicator/SmsCommunicator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/SmsCommunicator.kt similarity index 79% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/smsCommunicator/SmsCommunicator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/SmsCommunicator.kt index e3e3e40f07..4bd38b722a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/smsCommunicator/SmsCommunicator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/SmsCommunicator.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.smsCommunicator +package app.aaps.core.interfaces.smsCommunicator interface SmsCommunicator { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/BgSource.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/BgSource.kt similarity index 89% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/source/BgSource.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/BgSource.kt index 537590b530..215b27305c 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/BgSource.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/BgSource.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.source +package app.aaps.core.interfaces.source interface BgSource { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/DexcomBoyda.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/DexcomBoyda.kt similarity index 76% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/source/DexcomBoyda.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/DexcomBoyda.kt index d6ba02cc35..e8d1c8e13b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/DexcomBoyda.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/DexcomBoyda.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.source +package app.aaps.core.interfaces.source interface DexcomBoyda { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/NSClientSource.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/NSClientSource.kt similarity index 80% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/source/NSClientSource.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/NSClientSource.kt index ef2ad1a350..5c8a7d72ca 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/NSClientSource.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/NSClientSource.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.source +package app.aaps.core.interfaces.source import info.nightscout.database.entities.GlucoseValue diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/XDripSource.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/XDripSource.kt similarity index 58% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/source/XDripSource.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/XDripSource.kt index ad7ba2c6c4..2c2a1b8101 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/source/XDripSource.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/source/XDripSource.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.source +package app.aaps.core.interfaces.source interface XDripSource { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/DexcomTIR.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/DexcomTIR.kt similarity index 83% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/DexcomTIR.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/DexcomTIR.kt index f7ea5c4cf7..666370725e 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/DexcomTIR.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/DexcomTIR.kt @@ -1,9 +1,9 @@ -package app.aaps.interfaces.stats +package app.aaps.core.interfaces.stats import android.content.Context import android.widget.TableRow import android.widget.TextView -import app.aaps.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.ProfileUtil interface DexcomTIR { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/DexcomTirCalculator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt similarity index 81% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/DexcomTirCalculator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt index 10ce0ab532..3618654d9a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/DexcomTirCalculator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/DexcomTirCalculator.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.stats +package app.aaps.core.interfaces.stats import android.content.Context import android.widget.TableLayout diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TIR.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TIR.kt similarity index 77% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TIR.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TIR.kt index e2cd79019f..b2a7776d33 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TIR.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TIR.kt @@ -1,9 +1,9 @@ -package app.aaps.interfaces.stats +package app.aaps.core.interfaces.stats import android.content.Context import android.widget.TableRow -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil interface TIR { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TddCalculator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TddCalculator.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TddCalculator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TddCalculator.kt index b13bfe190d..d8e2eee00f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TddCalculator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TddCalculator.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.stats +package app.aaps.core.interfaces.stats import android.content.Context import android.util.LongSparseArray diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TirCalculator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TirCalculator.kt similarity index 87% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TirCalculator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TirCalculator.kt index 825d9a72a2..4500270d76 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/stats/TirCalculator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TirCalculator.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.stats +package app.aaps.core.interfaces.stats import android.content.Context import android.util.LongSparseArray diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/storage/Storage.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/storage/Storage.kt similarity index 84% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/storage/Storage.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/storage/Storage.kt index bb6d9d6df4..b791831d55 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/storage/Storage.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/storage/Storage.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.storage +package app.aaps.core.interfaces.storage import java.io.File diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/DataSyncSelector.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/DataSyncSelector.kt similarity index 98% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/DataSyncSelector.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/DataSyncSelector.kt index 868fbf8fb1..e1c01ea719 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/DataSyncSelector.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/DataSyncSelector.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.sync +package app.aaps.core.interfaces.sync import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/DataSyncSelectorXdrip.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/DataSyncSelectorXdrip.kt similarity index 57% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/DataSyncSelectorXdrip.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/DataSyncSelectorXdrip.kt index 595cfc84bc..9feb0ed72a 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/DataSyncSelectorXdrip.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/DataSyncSelectorXdrip.kt @@ -1,3 +1,3 @@ -package app.aaps.interfaces.sync +package app.aaps.core.interfaces.sync interface DataSyncSelectorXdrip : DataSyncSelector \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/NsClient.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/NsClient.kt similarity index 93% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/NsClient.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/NsClient.kt index 328ffdc7a2..ac25d4a663 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/NsClient.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/NsClient.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.sync +package app.aaps.core.interfaces.sync -import app.aaps.interfaces.nsclient.NSAlarm -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog /** * Plugin providing communication with Nightscout server diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Sync.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Sync.kt similarity index 73% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Sync.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Sync.kt index 7c9ab911cf..b357e9a772 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Sync.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Sync.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.sync +package app.aaps.core.interfaces.sync interface Sync { diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Tidepool.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Tidepool.kt new file mode 100644 index 0000000000..83c95f50ec --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/Tidepool.kt @@ -0,0 +1,3 @@ +package app.aaps.core.interfaces.sync + +interface Tidepool : Sync \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/XDripBroadcast.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/XDripBroadcast.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/XDripBroadcast.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/XDripBroadcast.kt index 89cdd9580f..0462b77bc3 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/XDripBroadcast.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sync/XDripBroadcast.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.sync +package app.aaps.core.interfaces.sync /** * Send data to xDrip+ via Inter-app settings diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/ui/IconsProvider.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/ui/IconsProvider.kt similarity index 70% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/ui/IconsProvider.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/ui/IconsProvider.kt index 5c0e0fa40d..7f6c5276cf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/ui/IconsProvider.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/ui/IconsProvider.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.ui +package app.aaps.core.interfaces.ui interface IconsProvider { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/ui/UiInteraction.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/ui/UiInteraction.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/ui/UiInteraction.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/ui/UiInteraction.kt index bd6c4411ba..f19feb9894 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/ui/UiInteraction.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/ui/UiInteraction.kt @@ -1,10 +1,10 @@ -package app.aaps.interfaces.ui +package app.aaps.core.interfaces.ui import android.content.Context import androidx.annotation.RawRes import androidx.annotation.StringRes import androidx.fragment.app.FragmentManager -import app.aaps.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.nsclient.NSAlarm import dagger.android.HasAndroidInjector /** diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/UserEntryMapper.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/UserEntryMapper.kt similarity index 99% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/UserEntryMapper.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/UserEntryMapper.kt index c7a51135c0..b18851b7e4 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/UserEntryMapper.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/UserEntryMapper.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.userEntry +package app.aaps.core.interfaces.userEntry import info.nightscout.database.entities.UserEntry diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/UserEntryPresentationHelper.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/UserEntryPresentationHelper.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/UserEntryPresentationHelper.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/UserEntryPresentationHelper.kt index c37b67e98b..848e5c768f 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/UserEntryPresentationHelper.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/UserEntryPresentationHelper.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.userEntry +package app.aaps.core.interfaces.userEntry import android.text.Spanned import androidx.annotation.ColorRes diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/ValueWithUnitMapper.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/ValueWithUnitMapper.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/ValueWithUnitMapper.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/ValueWithUnitMapper.kt index 77b7c08479..ae14dc6b3b 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/userEntry/ValueWithUnitMapper.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/userEntry/ValueWithUnitMapper.kt @@ -1,6 +1,6 @@ -package app.aaps.interfaces.userEntry +package app.aaps.core.interfaces.userEntry -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.ValueWithUnit diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/DateUtil.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/DateUtil.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/DateUtil.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/DateUtil.kt index 97b182b3d0..3494f2c322 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/DateUtil.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/DateUtil.kt @@ -1,8 +1,8 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import android.os.Build import androidx.annotation.RequiresApi -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import java.util.TimeZone import java.util.concurrent.TimeUnit diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/DecimalFormatter.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/DecimalFormatter.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/DecimalFormatter.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/DecimalFormatter.kt index e1befef3ca..2531a1822c 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/DecimalFormatter.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/DecimalFormatter.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import java.text.DecimalFormat diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/HardLimits.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/HardLimits.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/HardLimits.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/HardLimits.kt index ab7052c0d6..8f1910fd63 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/HardLimits.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/HardLimits.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils interface HardLimits { companion object { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/MidnightTime.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/MidnightTime.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/MidnightTime.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/MidnightTime.kt index 9c545258f5..caab607afc 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/MidnightTime.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/MidnightTime.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import android.util.LongSparseArray import java.util.Calendar diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/Round.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/Round.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/Round.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/Round.kt index f2c5d9c12a..dbf9863fd3 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/Round.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/Round.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import java.math.BigDecimal import java.security.InvalidParameterException diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/SafeParse.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/SafeParse.kt similarity index 97% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/SafeParse.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/SafeParse.kt index f35d377e01..e7d0dc9718 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/SafeParse.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/SafeParse.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils object SafeParse { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/T.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/T.kt similarity index 95% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/T.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/T.kt index 384e60b429..06de9b11d3 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/T.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/T.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils @Suppress("SpellCheckingInspection") class T(val time: Long = 0L) { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/TimeChangeType.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/TimeChangeType.kt similarity index 68% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/TimeChangeType.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/TimeChangeType.kt index 1db1638bf6..6f45fa1139 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/TimeChangeType.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/TimeChangeType.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils enum class TimeChangeType { TimezoneChanged, DSTStarted, DSTEnded, TimeChanged diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/Translator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/Translator.kt similarity index 94% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/Translator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/Translator.kt index 205d50d9fd..d17fac6bcf 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/Translator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/Translator.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.TemporaryTarget diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/TrendCalculator.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/TrendCalculator.kt similarity index 90% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/TrendCalculator.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/TrendCalculator.kt index 5b7d10520c..9f6de95e3c 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/utils/TrendCalculator.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/TrendCalculator.kt @@ -1,7 +1,7 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue import info.nightscout.database.entities.GlucoseValue /** diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/versionChecker/VersionCheckerUtils.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/versionChecker/VersionCheckerUtils.kt similarity index 83% rename from core/interfaces/src/main/kotlin/app/aaps/interfaces/versionChecker/VersionCheckerUtils.kt rename to core/interfaces/src/main/kotlin/app/aaps/core/interfaces/versionChecker/VersionCheckerUtils.kt index aa645a6b8c..9477e61d4d 100644 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/versionChecker/VersionCheckerUtils.kt +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/versionChecker/VersionCheckerUtils.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.versionChecker +package app.aaps.core.interfaces.versionChecker interface VersionCheckerUtils { diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/actions/Actions.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/actions/Actions.kt deleted file mode 100644 index 773d5d6d55..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/actions/Actions.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.actions - -interface Actions \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Safety.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Safety.kt deleted file mode 100644 index ec8e59ea09..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Safety.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.aaps.interfaces.constraints - -import app.aaps.interfaces.configuration.ConfigExportImport - -interface Safety : ConfigExportImport \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profiling/Profiler.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/profiling/Profiler.kt deleted file mode 100644 index eff7c03751..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/profiling/Profiler.kt +++ /dev/null @@ -1,8 +0,0 @@ -package app.aaps.interfaces.profiling - -import app.aaps.interfaces.logging.LTag - -interface Profiler { - - fun log(lTag: LTag, function: String, start: Long) -} \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodDash.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodDash.kt deleted file mode 100644 index 0fa2f0ff62..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/OmnipodDash.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.pump - -interface OmnipodDash \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAcceptOpenLoopChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAcceptOpenLoopChange.kt deleted file mode 100644 index 49314a3f84..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAcceptOpenLoopChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventAcceptOpenLoopChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppExit.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppExit.kt deleted file mode 100644 index 0efdba0e24..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppExit.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventAppExit : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppInitialized.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppInitialized.kt deleted file mode 100644 index d1ce190705..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventAppInitialized.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventAppInitialized : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBucketedDataCreated.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBucketedDataCreated.kt deleted file mode 100644 index 71b2c600ad..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventBucketedDataCreated.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventBucketedDataCreated : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventConfigBuilderChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventConfigBuilderChange.kt deleted file mode 100644 index 4e3d217005..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventConfigBuilderChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventConfigBuilderChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomActionsChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomActionsChanged.kt deleted file mode 100644 index 00a81b6f61..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventCustomActionsChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventCustomActionsChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDeviceStatusChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDeviceStatusChange.kt deleted file mode 100644 index 84995628d8..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventDeviceStatusChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventDeviceStatusChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventFoodDatabaseChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventFoodDatabaseChanged.kt deleted file mode 100644 index 3d06c42246..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventFoodDatabaseChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventFoodDatabaseChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLocalProfileChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLocalProfileChanged.kt deleted file mode 100644 index ef9de42ac3..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventLocalProfileChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventLocalProfileChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileDataToWear.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileDataToWear.kt deleted file mode 100644 index 75ac101dc6..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileDataToWear.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.aaps.interfaces.rx.events - -import app.aaps.interfaces.rx.weardata.EventData - -class EventMobileDataToWear(val payload: EventData.ActionSetCustomWatchface) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileToWear.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileToWear.kt deleted file mode 100644 index 1cf21e239f..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventMobileToWear.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.aaps.interfaces.rx.events - -import app.aaps.interfaces.rx.weardata.EventData - -class EventMobileToWear(val payload: EventData) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientRestart.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientRestart.kt deleted file mode 100644 index 47d1bc35e1..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventNSClientRestart.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventNSClientRestart : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOfflineChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOfflineChange.kt deleted file mode 100644 index 301dc8f36f..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventOfflineChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventOfflineChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileStoreChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileStoreChanged.kt deleted file mode 100644 index 01ddecffc0..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileStoreChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventProfileStoreChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileSwitchChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileSwitchChanged.kt deleted file mode 100644 index 3ecd6dadaa..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventProfileSwitchChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventProfileSwitchChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventQueueChanged.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventQueueChanged.kt deleted file mode 100644 index e4440e4e28..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventQueueChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventQueueChanged : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempBasalChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempBasalChange.kt deleted file mode 100644 index 9e9891e60f..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempBasalChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventTempBasalChange : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempTargetChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempTargetChange.kt deleted file mode 100644 index 7238afce9b..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTempTargetChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventTempTargetChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventThemeSwitch.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventThemeSwitch.kt deleted file mode 100644 index 508c67cb9d..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventThemeSwitch.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventThemeSwitch : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTherapyEventChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTherapyEventChange.kt deleted file mode 100644 index b3fb0dbe20..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTherapyEventChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventTherapyEventChange : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTreatmentChange.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTreatmentChange.kt deleted file mode 100644 index 131e2d1544..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventTreatmentChange.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.rx.events - -class EventTreatmentChange : EventLoop() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearCwfExported.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearCwfExported.kt deleted file mode 100644 index 16d77d126e..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearCwfExported.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.aaps.interfaces.rx.events - -import app.aaps.interfaces.rx.weardata.EventData - -class EventWearCwfExported(val payload: EventData.ActionSetCustomWatchface) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearDataToMobile.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearDataToMobile.kt deleted file mode 100644 index a58b64f685..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearDataToMobile.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.aaps.interfaces.rx.events - -import app.aaps.interfaces.rx.weardata.EventData - -class EventWearDataToMobile(val payload: EventData) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearToMobile.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearToMobile.kt deleted file mode 100644 index 969b86c514..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/rx/events/EventWearToMobile.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.aaps.interfaces.rx.events - -import app.aaps.interfaces.rx.weardata.EventData - -class EventWearToMobile(val payload: EventData) : Event() \ No newline at end of file diff --git a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Tidepool.kt b/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Tidepool.kt deleted file mode 100644 index 8a062342da..0000000000 --- a/core/interfaces/src/main/kotlin/app/aaps/interfaces/sync/Tidepool.kt +++ /dev/null @@ -1,3 +0,0 @@ -package app.aaps.interfaces.sync - -interface Tidepool : Sync \ No newline at end of file diff --git a/core/interfaces/src/test/kotlin/app/aaps/interfaces/rx/RxSchedulerRule.kt b/core/interfaces/src/test/kotlin/app/aaps/core/interfaces/rx/RxSchedulerRule.kt similarity index 96% rename from core/interfaces/src/test/kotlin/app/aaps/interfaces/rx/RxSchedulerRule.kt rename to core/interfaces/src/test/kotlin/app/aaps/core/interfaces/rx/RxSchedulerRule.kt index 613d486760..cf526cb553 100644 --- a/core/interfaces/src/test/kotlin/app/aaps/interfaces/rx/RxSchedulerRule.kt +++ b/core/interfaces/src/test/kotlin/app/aaps/core/interfaces/rx/RxSchedulerRule.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx +package app.aaps.core.interfaces.rx import io.reactivex.rxjava3.android.plugins.RxAndroidPlugins import io.reactivex.rxjava3.core.Scheduler diff --git a/core/interfaces/src/test/kotlin/app/aaps/interfaces/rx/weardata/EventDataTest.kt b/core/interfaces/src/test/kotlin/app/aaps/core/interfaces/rx/weardata/EventDataTest.kt similarity index 99% rename from core/interfaces/src/test/kotlin/app/aaps/interfaces/rx/weardata/EventDataTest.kt rename to core/interfaces/src/test/kotlin/app/aaps/core/interfaces/rx/weardata/EventDataTest.kt index a9b26d8607..3b617e3eae 100644 --- a/core/interfaces/src/test/kotlin/app/aaps/interfaces/rx/weardata/EventDataTest.kt +++ b/core/interfaces/src/test/kotlin/app/aaps/core/interfaces/rx/weardata/EventDataTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.rx.weardata +package app.aaps.core.interfaces.rx.weardata import com.google.common.truth.Truth.assertThat import kotlinx.serialization.ExperimentalSerializationApi diff --git a/core/interfaces/src/test/kotlin/app/aaps/interfaces/utils/SafeParseTest.kt b/core/interfaces/src/test/kotlin/app/aaps/core/interfaces/utils/SafeParseTest.kt similarity index 99% rename from core/interfaces/src/test/kotlin/app/aaps/interfaces/utils/SafeParseTest.kt rename to core/interfaces/src/test/kotlin/app/aaps/core/interfaces/utils/SafeParseTest.kt index 1bc81fe98a..4f92c47b1f 100644 --- a/core/interfaces/src/test/kotlin/app/aaps/interfaces/utils/SafeParseTest.kt +++ b/core/interfaces/src/test/kotlin/app/aaps/core/interfaces/utils/SafeParseTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt b/core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt index 55f8664b2e..09f4a58eea 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.constraints -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag class ConstraintObject>(private var value: T, private val aapsLogger: AAPSLogger) : Constraint { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt b/core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt index a34644ab53..3eb0a1c6e0 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt @@ -2,7 +2,7 @@ package app.aaps.core.main.di import app.aaps.core.main.wizard.BolusWizard import app.aaps.core.main.wizard.QuickWizardEntry -import app.aaps.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpEnactResult import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt b/core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt index 81703a93d7..c3bd3e70cb 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt @@ -1,7 +1,7 @@ package app.aaps.core.main.events import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventIobCalculationProgress(val pass: CalculationWorkflow.ProgressData, private val progressPct: Int, val cause: Event?) : Event() { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt b/core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt index 95f360768d..96cf016b05 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt @@ -1,6 +1,6 @@ package app.aaps.core.main.events -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.events.Event class EventNewNotification(var notification: Notification) : Event() diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt index ca34179778..a95b46672a 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt @@ -1,7 +1,7 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.data.TargetBlock import org.json.JSONArray diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt index 17e43b09cd..f7f776403c 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.iob.Iob -import app.aaps.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.iob.Iob +import app.aaps.core.interfaces.plugin.ActivePlugin import info.nightscout.database.entities.Bolus fun Bolus.iobCalc(activePlugin: ActivePlugin, time: Long, dia: Double): Iob { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt index 5bb9ab61a3..d0eac9d9af 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt @@ -1,12 +1,12 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.TemporaryBasal diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt index c5abe99dae..5554cd7712 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt @@ -1,10 +1,10 @@ package app.aaps.core.main.extensions import app.aaps.core.main.R -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.GlucoseValue import org.json.JSONObject diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt index 107b030d30..9589138d53 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt @@ -1,12 +1,12 @@ package app.aaps.core.main.extensions import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.ProfileSwitch import org.json.JSONObject diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt index 1452f3e112..133338a977 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt @@ -1,12 +1,12 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.interfaces.end diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt index 401a8c471e..ddbedd64c8 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt @@ -1,10 +1,10 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter import info.nightscout.database.entities.TemporaryTarget import java.util.concurrent.TimeUnit diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt index 6bdf2137b8..00e5ba2f5b 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt @@ -1,7 +1,7 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.TherapyEvent fun TherapyEvent.isOlderThan(hours: Double, dateUtil: DateUtil): Boolean { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt index 99e98a0474..17ed06a997 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt @@ -3,8 +3,8 @@ package app.aaps.core.main.graph import android.content.Context import android.graphics.Color import android.util.AttributeSet -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.utils.T import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt index fc24b3aab4..fc8c226e39 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt @@ -2,8 +2,8 @@ package app.aaps.core.main.graph import android.content.Context import android.util.AttributeSet -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.Round import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt index 52e96fc83a..7e601903b7 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt @@ -2,8 +2,8 @@ package app.aaps.core.main.graph import android.content.Context import android.util.AttributeSet -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.Round import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt index 1b9a3f850e..674c8c428c 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt @@ -2,10 +2,10 @@ package app.aaps.core.main.graph import android.content.Context import android.util.AttributeSet -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.Round import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt index 6a99b7c192..902051fb7e 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt @@ -10,12 +10,12 @@ import app.aaps.core.main.graph.data.FixedLineGraphSeries import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries import app.aaps.core.main.graph.data.Scale import app.aaps.core.main.graph.data.ScaledDataPoint -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.iob.CobInfo -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.iob.CobInfo +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal import com.jjoe64.graphview.series.BarGraphSeries import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt index 8d34277c22..0e15d2a53c 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt @@ -4,10 +4,10 @@ import android.content.Context import android.util.AttributeSet import app.aaps.core.main.graph.data.AreaGraphSeries import app.aaps.core.main.graph.data.DoubleDataPoint -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.Round import com.jjoe64.graphview.DefaultLabelFormatter import com.jjoe64.graphview.GraphView import java.text.NumberFormat diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt index 24a4044dcb..e6463e4c53 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt @@ -2,10 +2,10 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter import info.nightscout.database.entities.Bolus class BolusDataPoint( diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt index df6f8ebd59..8ab61223c5 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt @@ -3,7 +3,7 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint import app.aaps.core.main.R -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.database.entities.Carbs class CarbsDataPoint( diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt index 8b0319493f..5c310020f2 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt @@ -2,8 +2,8 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.EffectiveProfileSwitch class EffectiveProfileSwitchDataPoint( @@ -19,7 +19,7 @@ class EffectiveProfileSwitchDataPoint( get() = "" + (if (data.originalPercentage != 100) "${data.originalPercentage}%" else "") + (if (data.originalPercentage != 100 && data.originalTimeshift != 0L) "," else "") + - (if (data.originalTimeshift != 0L) (T.msecs(data.originalTimeshift).hours().toString() + rh.gs(app.aaps.interfaces.R.string.shorthour)) else "") + (if (data.originalTimeshift != 0L) (T.msecs(data.originalTimeshift).hours().toString() + rh.gs(app.aaps.core.interfaces.R.string.shorthour)) else "") override val duration = 0L override val shape = PointsWithLabelGraphSeries.Shape.PROFILE override val size = 2f diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt index f1ecde95a4..eaae3e4a4b 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt @@ -2,8 +2,8 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter import info.nightscout.database.entities.ExtendedBolus class ExtendedBolusDataPoint( diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt index baec123f83..f516fa44f5 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt @@ -2,10 +2,10 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.database.entities.GlucoseValue class GlucoseValueDataPoint( diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt index 2b3cf13871..6e8a555287 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt @@ -2,7 +2,7 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.database.entities.HeartRate class HeartRateDataPoint( diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt index 78e4b18cd2..5261f96b9a 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt @@ -4,12 +4,12 @@ import android.content.Context import android.graphics.Paint import androidx.annotation.ColorInt import androidx.core.graphics.ColorUtils -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper class InMemoryGlucoseValueDataPoint( val data: InMemoryGlucoseValue, diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt index 4990a3c258..b2ffc996db 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt @@ -2,10 +2,10 @@ package app.aaps.core.main.graph.data import android.content.Context import android.graphics.Paint -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.Translator +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.Translator import info.nightscout.database.entities.TherapyEvent class TherapyEventDataPoint( diff --git a/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt index d66b1b6740..5b670eb61b 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.iob -import app.aaps.interfaces.iob.CobInfo -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.iob.CobInfo +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter fun CobInfo.generateCOBString(decimalFormatter: DecimalFormatter): String { var cobStringResult = "--g" diff --git a/core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt index fd3502cd9e..d1d02406b9 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.iob -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round fun GlucoseStatus.log(decimalFormatter: DecimalFormatter): String = "Glucose: " + decimalFormatter.to0Decimal(glucose) + " mg/dl " + "Noise: " + decimalFormatter.to0Decimal(noise) + " " + diff --git a/core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt index da8c34cc02..c3e3925220 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.iob -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.Round import org.json.JSONException import org.json.JSONObject diff --git a/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt index e69bc9ea8f..10f1fc6ee9 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt @@ -7,18 +7,18 @@ import app.aaps.core.main.extensions.lowTargetBlockValueBySeconds import app.aaps.core.main.extensions.shiftBlock import app.aaps.core.main.extensions.shiftTargetBlock import app.aaps.core.main.extensions.targetBlockValueBySeconds -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.Profile.ProfileValue -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile.ProfileValue +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.ProfileSwitch diff --git a/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt index f9ea8195bd..45fd20a5be 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter fun PumpEnactResult.toHtml(rh: ResourceHelper, decimalFormatter: DecimalFormatter): String { var ret = "" + rh.gs(info.nightscout.core.ui.R.string.success) + ": " + success diff --git a/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt index cf398996c9..5a793e157e 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt @@ -1,6 +1,6 @@ package app.aaps.core.main.pump -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.pump.defs.PumpType import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt index 53bc485dad..b79da63faf 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt @@ -9,7 +9,7 @@ import androidx.core.view.MenuCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import app.aaps.core.main.R -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper class ActionModeHelper(val rh: ResourceHelper, val activity: FragmentActivity?, val fragment: Fragment?) { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt index 407eec19e5..ee51b0ca8b 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt @@ -1,6 +1,6 @@ package app.aaps.core.main.utils -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import info.nightscout.core.utils.toHex import org.spongycastle.util.encoders.Base64 import java.nio.ByteBuffer diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt index c478905c71..3928946e50 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt @@ -3,7 +3,7 @@ package app.aaps.core.main.utils.extensions import android.content.Context import androidx.annotation.AttrRes import androidx.annotation.ColorRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper fun String.formatBold(): String = "$this" diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt index 2eb2dec1ae..5a270b0dc0 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.utils.extensions import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import org.json.JSONObject fun JSONObject.putInt(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject = diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt index a15cf0754c..ae77244182 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt @@ -2,10 +2,10 @@ package app.aaps.core.main.utils.fabric import android.os.Bundle import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.ktx.analytics import com.google.firebase.crashlytics.FirebaseCrashlytics diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt index af8af197a2..aba26436a5 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt @@ -4,8 +4,8 @@ import android.content.Context import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext diff --git a/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt index 815a33fe2e..dec572aba3 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt @@ -7,35 +7,35 @@ import app.aaps.core.main.extensions.highValueToUnitsToString import app.aaps.core.main.extensions.lowValueToUnitsToString import app.aaps.core.main.iob.round import app.aaps.core.main.utils.extensions.formatColor -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.automation.Automation -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.automation.Automation +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog diff --git a/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt index 03b4650f74..ae10ccd68b 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt @@ -1,6 +1,6 @@ package app.aaps.core.main.wizard -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import org.json.JSONArray import org.json.JSONObject diff --git a/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt index 5ffc702ea7..c8eb72d855 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt @@ -3,16 +3,16 @@ package app.aaps.core.main.wizard import app.aaps.annotations.OpenForTesting import app.aaps.core.main.extensions.valueToUnits import app.aaps.core.main.iob.round -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.core.utils.JsonHelper.safeGetInt import info.nightscout.core.utils.JsonHelper.safeGetString diff --git a/core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt b/core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt index 27d32a0edb..1fb22baa35 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.workflow import app.aaps.core.main.graph.OverviewData -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.rx.events.Event interface CalculationWorkflow { companion object { diff --git a/core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt index 549ebac697..f98a23abdf 100644 --- a/core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt +++ b/core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt @@ -1,6 +1,6 @@ package app.aaps.core.main.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.data.TargetBlock diff --git a/core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt index 137012df33..5e38b30692 100644 --- a/core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt +++ b/core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.utils import android.content.Context -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.T import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat @@ -88,7 +88,7 @@ class DateUtilImplTest : TestBase() { } */ @Test fun timeFrameStringTest() { - `when`(rh.gs(app.aaps.interfaces.R.string.shorthour)).thenReturn("h") + `when`(rh.gs(app.aaps.core.interfaces.R.string.shorthour)).thenReturn("h") assertThat(DateUtilImpl(context).timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), rh)).isEqualTo("(1h 1')") } } diff --git a/core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt index beb8f4b00d..af84efa524 100644 --- a/core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt +++ b/core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt @@ -1,8 +1,8 @@ package app.aaps.core.main.wizard -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt index 2323166db3..a91ed9073c 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt @@ -1,12 +1,12 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob import android.content.Context import android.graphics.Color import app.aaps.core.main.graph.data.InMemoryGlucoseValueDataPoint -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.GlucoseValue import org.junit.jupiter.api.BeforeEach diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt index abd234cd5d..a258549a2d 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt index 1f543cda7f..e173ffaf3f 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob import android.content.Context import app.aaps.core.main.iob.combine @@ -7,7 +7,7 @@ import app.aaps.core.main.iob.determineBasalJson import app.aaps.core.main.iob.json import app.aaps.core.main.iob.plus import app.aaps.core.main.iob.round -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt index be23f55663..2e1afd39df 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.iob +package app.aaps.core.interfaces.iob import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt index 346e3755ad..b7b0f35522 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.plugin +package app.aaps.core.interfaces.plugin import androidx.fragment.app.Fragment import com.google.common.truth.Truth.assertThat diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt index 6d559458c3..1132488f6f 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt @@ -1,14 +1,14 @@ -package app.aaps.interfaces.profile +package app.aaps.core.interfaces.profile import android.content.Context import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.tests.HardLimitsMock import app.aaps.shared.tests.TestBase diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt index 0cb8d11eb3..d96083969b 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump +package app.aaps.core.interfaces.pump import android.content.Context import app.aaps.shared.tests.TestBase diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt index 15e9e95f51..acb295c551 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.pump.defs +package app.aaps.core.interfaces.pump.defs import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt index 2bef9e91bc..79c9ccb624 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt index 95e841ff26..2438dae7fd 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt index 28841f289d..29dae015d8 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt @@ -1,4 +1,4 @@ -package app.aaps.interfaces.utils +package app.aaps.core.interfaces.utils import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt index 3f67c4922c..5504d47c57 100644 --- a/core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt @@ -5,7 +5,7 @@ import android.text.Editable import android.text.TextUtils import android.text.TextWatcher import android.widget.EditText -import app.aaps.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.ProfileUtil import com.google.android.material.textfield.TextInputLayout import dagger.android.HasAndroidInjector import info.nightscout.core.validators.validators.AlphaNumericValidator diff --git a/core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt b/core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt index c9b02b7cb5..feda6c8da7 100644 --- a/core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt @@ -4,8 +4,8 @@ import android.content.Context import android.util.AttributeSet import androidx.preference.EditTextPreference import androidx.preference.PreferenceViewHolder -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt index e60cce2708..432619abcc 100644 --- a/core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt @@ -1,7 +1,7 @@ package info.nightscout.core.validators.validators import android.widget.EditText -import app.aaps.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.ProfileUtil class BgRangeValidator(customErrorMessage: String?, private val min: Int, private val max: Int, private val profileUtil: ProfileUtil) : Validator(customErrorMessage) { diff --git a/core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt b/core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt index b8531e4bcf..58846c5cf9 100644 --- a/core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt +++ b/core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt @@ -1,7 +1,7 @@ package info.nightscout.core.validators.validators import android.widget.EditText -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.SafeParse /** * A validator that returns true only if the input field contains only numbers diff --git a/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt index b781176330..9ec45b093f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.sharedPreferences.SP import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt index 08d46a7454..99211fd0dc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt @@ -2,11 +2,11 @@ package info.nightscout.implementation import android.content.Context import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt index fe7de3c24f..6df0b542f8 100644 --- a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt @@ -1,22 +1,22 @@ package info.nightscout.implementation import app.aaps.core.main.events.EventNewNotification -import app.aaps.interfaces.alerts.LocalAlertUtils -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.alerts.LocalAlertUtils +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry.Action diff --git a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt index 0fed971c9d..84370b9e40 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt @@ -1,7 +1,7 @@ package info.nightscout.implementation -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.Translator +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.Translator import dagger.Reusable import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.TemporaryTarget @@ -107,10 +107,10 @@ class TranslatorImpl @Inject internal constructor( override fun translate(units: ValueWithUnit?): String = when (units) { is ValueWithUnit.Gram -> rh.gs(info.nightscout.core.ui.R.string.shortgram) - is ValueWithUnit.Hour -> rh.gs(app.aaps.interfaces.R.string.shorthour) + is ValueWithUnit.Hour -> rh.gs(app.aaps.core.interfaces.R.string.shorthour) is ValueWithUnit.Insulin -> rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) is ValueWithUnit.Mgdl -> rh.gs(info.nightscout.core.ui.R.string.mgdl) - is ValueWithUnit.Minute -> rh.gs(app.aaps.interfaces.R.string.shortminute) + is ValueWithUnit.Minute -> rh.gs(app.aaps.core.interfaces.R.string.shortminute) is ValueWithUnit.Mmoll -> rh.gs(info.nightscout.core.ui.R.string.mmol) is ValueWithUnit.Percent -> rh.gs(info.nightscout.core.ui.R.string.shortpercent) is ValueWithUnit.UnitPerHour -> rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour) diff --git a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt index b6b50f42fd..fafda6e795 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.TrendCalculator import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt b/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt index bc98605c88..0395aa5a22 100644 --- a/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt @@ -1,12 +1,12 @@ package info.nightscout.implementation import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.userEntry.UserEntryMapper -import app.aaps.interfaces.userEntry.ValueWithUnitMapper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.userEntry.UserEntryMapper +import app.aaps.core.interfaces.userEntry.ValueWithUnitMapper +import app.aaps.core.interfaces.utils.DateUtil import dagger.Reusable import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action diff --git a/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt b/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt index c1bf7c51bf..2d786175cb 100644 --- a/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt @@ -8,10 +8,10 @@ import android.content.Context import android.content.Intent import androidx.core.app.NotificationCompat import androidx.core.app.TaskStackBuilder -import app.aaps.interfaces.notifications.NotificationHolder -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.ui.IconsProvider -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.ui.UiInteraction import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt b/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt index 1ea086c50e..892214743b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt +++ b/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt @@ -1,22 +1,22 @@ package info.nightscout.implementation.db import android.content.Context -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDeviceStatusChange -import app.aaps.interfaces.rx.events.EventEffectiveProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventFoodDatabaseChanged -import app.aaps.interfaces.rx.events.EventNewBG -import app.aaps.interfaces.rx.events.EventNewHistoryData -import app.aaps.interfaces.rx.events.EventOfflineChange -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.rx.events.EventTempTargetChange -import app.aaps.interfaces.rx.events.EventTherapyEventChange -import app.aaps.interfaces.rx.events.EventTreatmentChange -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDeviceStatusChange +import app.aaps.core.interfaces.rx.events.EventEffectiveProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventFoodDatabaseChanged +import app.aaps.core.interfaces.rx.events.EventNewBG +import app.aaps.core.interfaces.rx.events.EventNewHistoryData +import app.aaps.core.interfaces.rx.events.EventOfflineChange +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.rx.events.EventTempTargetChange +import app.aaps.core.interfaces.rx.events.EventTherapyEventChange +import app.aaps.core.interfaces.rx.events.EventTreatmentChange +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.Carbs diff --git a/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt b/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt index 27a9704ee5..44916ebe3b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.db -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback import dagger.Reusable import dagger.android.HasAndroidInjector import info.nightscout.database.ValueWrapper diff --git a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt b/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt index cae0c379dc..23a0cd200e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt +++ b/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt @@ -1,37 +1,37 @@ package info.nightscout.implementation.di import app.aaps.core.main.graph.OverviewData -import app.aaps.interfaces.alerts.LocalAlertUtils -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.logging.LoggerUtils -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.NotificationHolder -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.profiling.Profiler -import app.aaps.interfaces.protection.PasswordCheck -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.pump.BlePreCheck -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.WarnColors -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.stats.DexcomTirCalculator -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.stats.TirCalculator -import app.aaps.interfaces.storage.Storage -import app.aaps.interfaces.ui.IconsProvider -import app.aaps.interfaces.userEntry.UserEntryPresentationHelper -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.Translator -import app.aaps.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.alerts.LocalAlertUtils +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.logging.LoggerUtils +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profiling.Profiler +import app.aaps.core.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.WarnColors +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.stats.DexcomTirCalculator +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.stats.TirCalculator +import app.aaps.core.interfaces.storage.Storage +import app.aaps.core.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.Translator +import app.aaps.core.interfaces.utils.TrendCalculator import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt b/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt index c1fb5151ea..5eb3e4d4e5 100644 --- a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt @@ -3,13 +3,13 @@ package info.nightscout.implementation.iob import app.aaps.annotations.OpenForTesting import app.aaps.core.main.iob.asRounded import app.aaps.core.main.iob.log -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.Reusable import javax.inject.Inject import kotlin.math.roundToLong diff --git a/implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt b/implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt index 19ee3e8ac6..0a6e71dc1b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt +++ b/implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt @@ -2,7 +2,7 @@ package info.nightscout.implementation.lifecycle import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner -import app.aaps.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.protection.ProtectionCheck import javax.inject.Inject class ProcessLifecycleListener @Inject constructor(private val protectionCheck: ProtectionCheck) : DefaultLifecycleObserver { diff --git a/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt index e0f7abc1cd..50d42c823f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt @@ -1,8 +1,8 @@ package info.nightscout.implementation.logging import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.LoggerUtils -import app.aaps.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.logging.LoggerUtils +import app.aaps.core.interfaces.maintenance.PrefFileListProvider import dagger.Reusable import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt index 1bafd0d724..54be457680 100644 --- a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt @@ -18,21 +18,21 @@ import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries import app.aaps.core.main.graph.data.Scale import app.aaps.core.main.graph.data.ScaledDataPoint import app.aaps.core.main.iob.round -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.iob.CobInfo -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.iob.CobInfo +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import com.jjoe64.graphview.series.BarGraphSeries import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries diff --git a/implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt b/implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt index ad0ea08d66..187f192969 100644 --- a/implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt +++ b/implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt @@ -1,25 +1,25 @@ package info.nightscout.implementation.plugin -import app.aaps.interfaces.aps.APS -import app.aaps.interfaces.aps.Sensitivity -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.constraints.Objectives -import app.aaps.interfaces.constraints.Safety -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.overview.Overview -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.smoothing.Smoothing -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.sync.Sync +import app.aaps.core.interfaces.aps.APS +import app.aaps.core.interfaces.aps.Sensitivity +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.constraints.Objectives +import app.aaps.core.interfaces.constraints.Safety +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.overview.Overview +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.sync.Sync import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt index f275ea9af0..7c13f5be91 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt @@ -3,23 +3,23 @@ package info.nightscout.implementation.profile import app.aaps.core.main.extensions.fromConstant import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventEffectiveProfileSwitchChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventEffectiveProfileSwitchChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.T import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.impl.AppRepository diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt index b65bee5ca9..0e4f03b552 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt @@ -3,15 +3,15 @@ package info.nightscout.implementation.profile import androidx.collection.ArrayMap import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import info.nightscout.core.utils.JsonHelper import org.json.JSONException diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt index 03d0226616..18476ffc1b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt @@ -1,9 +1,9 @@ package info.nightscout.implementation.profile -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DecimalFormatter import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt index 3fbb062925..3182a00154 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt @@ -1,9 +1,9 @@ package info.nightscout.implementation.profiling import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profiling.Profiler +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profiling.Profiler import dagger.Reusable import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt b/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt index 5ff4f08e0b..d8c1a19eab 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt +++ b/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt @@ -17,8 +17,8 @@ import androidx.biometric.BiometricPrompt.ERROR_USER_CANCELED import androidx.biometric.BiometricPrompt.ERROR_VENDOR import androidx.biometric.BiometricPrompt.PromptInfo import androidx.fragment.app.FragmentActivity -import app.aaps.interfaces.extensions.runOnUiThread -import app.aaps.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.protection.PasswordCheck import info.nightscout.core.ui.R import info.nightscout.core.ui.toast.ToastUtils import java.util.concurrent.Executors diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt index 0c4d7565b7..4678b890b7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt @@ -13,8 +13,8 @@ import android.widget.TextView import androidx.annotation.StringRes import app.aaps.core.main.R import app.aaps.core.main.utils.CryptoUtil -import app.aaps.interfaces.protection.PasswordCheck -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.Reusable import info.nightscout.core.ui.toast.ToastUtils diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt index fe4f46d44e..a22e55544c 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.protection import androidx.fragment.app.FragmentActivity -import app.aaps.interfaces.protection.PasswordCheck -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.Reusable import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt index f9cbb8a6c2..07bd603dfd 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt @@ -11,8 +11,8 @@ import android.provider.Settings import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import app.aaps.interfaces.pump.BlePreCheck -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.extensions.safeEnable import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt index b43c667181..0b520d3eda 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt @@ -1,13 +1,13 @@ package info.nightscout.implementation.pump import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import com.google.gson.Gson import com.google.gson.reflect.TypeToken import info.nightscout.implementation.R diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt index a24949be01..a1f5d6edb4 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt @@ -4,21 +4,21 @@ import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.pump.fromDbPumpType import app.aaps.core.main.pump.toDbPumpType import app.aaps.core.main.pump.toDbSource -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt index cf458c3c03..769ef7ccc8 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.pump import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.utils.T import javax.inject.Inject import javax.inject.Singleton import kotlin.math.abs diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt index 9c2598d03b..80e88fb114 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt @@ -2,9 +2,9 @@ package info.nightscout.implementation.pump import android.widget.TextView import app.aaps.core.main.extensions.isOlderThan -import app.aaps.interfaces.pump.WarnColors -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.pump.WarnColors +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.TherapyEvent import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt index 999406ff9b..28c3a6af9e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt @@ -13,36 +13,36 @@ import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.extensions.getCustomizedName import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.Command.CommandType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.queue.CustomCommand -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissBolusProgressIfRunning -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.Command.CommandType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissBolusProgressIfRunning +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt index 020190d08b..83a4afb526 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt @@ -5,20 +5,20 @@ import android.content.Context import android.os.Build import android.os.PowerManager import android.os.SystemClock -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissBolusProgressIfRunning -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissBolusProgressIfRunning +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import info.nightscout.core.ui.R import info.nightscout.core.utils.extensions.safeDisable import info.nightscout.core.utils.extensions.safeEnable diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt index b6e1fa4dd1..5d9598a539 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt @@ -1,14 +1,14 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.BolusProgressData -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissBolusProgressIfRunning +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissBolusProgressIfRunning import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt index faab64bbfc..6bcd0d2ce5 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt index e54f7f6275..7f0e8b57ef 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt index 6c3026450a..f63757792a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt index 9d128c5367..3791d9edbc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CustomCommand import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt index f8ad584f49..31d59cf4fc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt index 4318220043..5eaf5e549b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt index ee61866f12..f2e3a5f19f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Insight -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Insight +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt index 8e7edae76e..cc3dbda896 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt @@ -1,13 +1,13 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Dana -import app.aaps.interfaces.pump.Diaconn -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Dana +import app.aaps.core.interfaces.pump.Diaconn +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt index be9fadd2b9..6781e27f50 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt @@ -1,12 +1,12 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Dana -import app.aaps.interfaces.pump.Diaconn -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Dana +import app.aaps.core.interfaces.pump.Diaconn +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt index d8e0ed47ab..2183cdd52c 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt index 7eccb2e9fd..37b03bf8e7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt @@ -1,12 +1,12 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.alerts.LocalAlertUtils -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.alerts.LocalAlertUtils +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt index e1ed613aa1..1667d96a8b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt @@ -1,13 +1,13 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt index d33308c88a..043a44c0c4 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt @@ -1,15 +1,15 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt index f7a82795e5..955e95fe29 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt @@ -1,13 +1,13 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Dana -import app.aaps.interfaces.pump.Diaconn -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Dana +import app.aaps.core.interfaces.pump.Diaconn +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt index fb275cbcbf..fe672a7a8e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Insight -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Insight +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt index bf959c8b5c..f45e656e3a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Insight -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Insight +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt index 6d3e8bbfd4..930e0373f8 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt @@ -1,12 +1,12 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt index 05b00d5c8d..a9d7e14493 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt @@ -1,12 +1,12 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt index 1d7c90e660..a02790155a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt @@ -1,11 +1,11 @@ package info.nightscout.implementation.queue.commands -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt b/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt index fb5973cecd..b07fc02f92 100644 --- a/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt +++ b/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt @@ -9,11 +9,11 @@ import android.net.wifi.SupplicantState import android.net.wifi.WifiManager import android.os.Handler import android.os.HandlerThread -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNetworkChange import dagger.android.DaggerBroadcastReceiver import info.nightscout.core.utils.receivers.StringUtils import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt b/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt index ffb4987724..d41862ea7c 100644 --- a/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt @@ -3,10 +3,10 @@ package info.nightscout.implementation.receivers import android.content.Context import android.content.Intent import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventChargingState -import app.aaps.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventChargingState +import app.aaps.core.interfaces.rx.events.EventNetworkChange import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt index bef59632f9..68d8df1af4 100644 --- a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt @@ -1,7 +1,7 @@ package info.nightscout.implementation.resources -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.ui.IconsProvider import info.nightscout.implementation.R import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt index 08e7fe20b0..84ec5356c7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt @@ -19,7 +19,7 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.getThemeColor import info.nightscout.core.ui.locale.LocaleHelper import java.util.Locale diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt index cbdcb3f94e..0046f46d3f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt @@ -4,12 +4,12 @@ import android.annotation.SuppressLint import android.content.Context import android.view.ViewGroup import android.widget.TableLayout -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.stats.DexcomTIR -import app.aaps.interfaces.stats.DexcomTirCalculator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.stats.DexcomTIR +import app.aaps.core.interfaces.stats.DexcomTirCalculator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import info.nightscout.database.impl.AppRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt index 3b958e2193..1fb30a707f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt @@ -6,9 +6,9 @@ import android.graphics.Typeface import android.view.Gravity import android.widget.TableRow import android.widget.TextView -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.stats.DexcomTIR +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.stats.DexcomTIR import info.nightscout.implementation.R import java.util.Calendar import kotlin.math.pow diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt index 35a77fb76c..5dd495ce6f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt @@ -9,16 +9,16 @@ import android.widget.TableLayout import android.widget.TableRow import android.widget.TextView import androidx.core.util.size -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.TotalDailyDose @@ -164,7 +164,7 @@ class TddCalculatorImpl @Inject constructor( } todayTdd?.let { layout.addView(TextView(context).apply { - text = rh.gs(app.aaps.interfaces.R.string.today) + text = rh.gs(app.aaps.core.interfaces.R.string.today) setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt index d3924f61bf..98023bb288 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt @@ -8,14 +8,14 @@ import android.view.Gravity import android.view.ViewGroup import android.widget.TableLayout import android.widget.TextView -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.stats.TIR -import app.aaps.interfaces.stats.TirCalculator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.stats.TIR +import app.aaps.core.interfaces.stats.TirCalculator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import info.nightscout.database.impl.AppRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt index 628178828e..80c4924167 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt @@ -5,9 +5,9 @@ import android.content.Context import android.view.Gravity import android.widget.TableRow import android.widget.TextView -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.stats.TIR -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.stats.TIR +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.implementation.R class TirImpl(override val date: Long, override val lowThreshold: Double, override val highThreshold: Double) : TIR { @@ -83,7 +83,7 @@ class TirImpl(override val date: Long, override val lowThreshold: Double, overri row.gravity = Gravity.CENTER_HORIZONTAL row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = - "%02d".format(days) + " " + rh.gs(app.aaps.interfaces.R.string.days) + "%02d".format(days) + " " + rh.gs(app.aaps.core.interfaces.R.string.days) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt index 9171ef2a52..515ccdbb93 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt @@ -5,8 +5,8 @@ import android.content.Context import android.view.Gravity import android.widget.TableRow import android.widget.TextView -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.TotalDailyDose import info.nightscout.implementation.R @@ -69,7 +69,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i row.gravity = Gravity.CENTER_HORIZONTAL row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = - "%02d".format(days) + " " + rh.gs(app.aaps.interfaces.R.string.days) + "%02d".format(days) + " " + rh.gs(app.aaps.core.interfaces.R.string.days) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = diff --git a/implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt b/implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt index 7b4354757b..da38622bb0 100644 --- a/implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt +++ b/implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt @@ -1,6 +1,6 @@ package info.nightscout.implementation.storage -import app.aaps.interfaces.storage.Storage +import app.aaps.core.interfaces.storage.Storage import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt index efdf7b2a86..dc45c1d9b5 100644 --- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -2,14 +2,14 @@ package info.nightscout.implementation.userEntry import android.text.Spanned import app.aaps.core.main.R -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.userEntry.UserEntryPresentationHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Translator +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Translator import dagger.Reusable import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry @@ -170,8 +170,8 @@ class UserEntryPresentationHelperImpl @Inject constructor( csvString(info.nightscout.core.ui.R.string.insulin_unit_shortname), csvString(info.nightscout.core.ui.R.string.profile_ins_units_per_hour), csvString(info.nightscout.core.ui.R.string.shortpercent), - csvString(app.aaps.interfaces.R.string.shorthour), - csvString(app.aaps.interfaces.R.string.shortminute), + csvString(app.aaps.core.interfaces.R.string.shorthour), + csvString(app.aaps.core.interfaces.R.string.shortminute), csvString(info.nightscout.core.ui.R.string.ue_none) ) + "\n" diff --git a/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt b/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt index 8fde6491d9..cbb07fa33e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt @@ -1,7 +1,7 @@ package info.nightscout.implementation.utils -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter import java.text.DecimalFormat import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt index a91ff460f5..cdf17940f3 100644 --- a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt @@ -2,11 +2,11 @@ package info.nightscout.implementation.iob import app.aaps.core.main.iob.asRounded import app.aaps.core.main.iob.log -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.GlucoseValue diff --git a/implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt b/implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt index 56b9370bef..dcd5213978 100644 --- a/implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt @@ -1,10 +1,10 @@ package info.nightscout.implementation.overview -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.ValueWrapper diff --git a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt b/implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt index 68d6e73e68..6e1d653d2d 100644 --- a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt @@ -1,6 +1,6 @@ package info.nightscout.implementation.profile -import app.aaps.interfaces.profile.PureProfile +import app.aaps.core.interfaces.profile.PureProfile import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt b/implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt index ec89e53e74..bcc23cb00f 100644 --- a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt @@ -1,8 +1,8 @@ package info.nightscout.implementation.profile -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.GlucoseValue diff --git a/implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt b/implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt index 1f1c23656f..01ceca4a8f 100644 --- a/implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt @@ -1,8 +1,8 @@ package info.nightscout.implementation.pump -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import info.nightscout.implementation.R diff --git a/implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt b/implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt index ae4d8a20da..660cda54da 100644 --- a/implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt @@ -1,6 +1,6 @@ package info.nightscout.implementation.pump -import app.aaps.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpSync import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt index a16b7ca950..7f8b4a6936 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt @@ -5,26 +5,26 @@ import android.os.Handler import android.os.PowerManager import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CustomCommand -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestPumpPlugin import com.google.common.truth.Truth.assertThat diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt index 5573ee4b12..9dbedbfde7 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt @@ -3,13 +3,13 @@ package info.nightscout.implementation.queue import android.content.Context import android.os.PowerManager import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestPumpPlugin import com.google.common.truth.Truth.assertThat diff --git a/implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt b/implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt index becd30552a..29ead4228c 100644 --- a/implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt @@ -1,7 +1,7 @@ package info.nightscout.implementation.utils -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach diff --git a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt b/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt index a52d97b67c..daff11c509 100644 --- a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt @@ -1,14 +1,14 @@ package info.nightscout.implementation.wizard import app.aaps.core.main.wizard.BolusWizard -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt b/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt index f63d1293bf..74cac443bf 100644 --- a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt +++ b/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt @@ -1,7 +1,7 @@ package info.nightscout.interfaces.pump import app.aaps.core.main.pump.toHtml -import app.aaps.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java index 4981aacde6..2a5706aa56 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java @@ -20,9 +20,9 @@ import androidx.lifecycle.MutableLiveData; import javax.inject.Inject; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.resources.ResourceHelper; import dagger.android.DaggerService; import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity; import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java index 555aecb6af..e87c689082 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java @@ -20,13 +20,13 @@ import java.util.List; import javax.inject.Inject; import app.aaps.core.main.utils.fabric.FabricPrivacy; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.DecimalFormatter; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.DecimalFormatter; import dagger.android.support.DaggerFragment; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock; @@ -221,7 +221,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick string = info.nightscout.core.ui.R.string.connecting; break; case CONNECTED: - string = app.aaps.interfaces.R.string.connected; + string = app.aaps.core.interfaces.R.string.connected; break; case RECOVERING: string = R.string.recovering; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 5f0c047870..1121a88514 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -27,37 +27,37 @@ import javax.inject.Inject; import javax.inject.Singleton; import app.aaps.core.main.events.EventNewNotification; -import app.aaps.interfaces.configuration.Config; -import app.aaps.interfaces.constraints.Constraint; -import app.aaps.interfaces.constraints.PluginConstraints; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.plugin.OwnDatabasePlugin; -import app.aaps.interfaces.plugin.PluginDescription; -import app.aaps.interfaces.plugin.PluginType; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.profile.ProfileFunction; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.Insight; -import app.aaps.interfaces.pump.Pump; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpPluginBase; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.PumpSync.PumpState.TemporaryBasal; -import app.aaps.interfaces.pump.defs.ManufacturerType; -import app.aaps.interfaces.pump.defs.PumpDescription; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventDismissNotification; -import app.aaps.interfaces.rx.events.EventInitializationChanged; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventRefreshOverview; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.T; +import app.aaps.core.interfaces.configuration.Config; +import app.aaps.core.interfaces.constraints.Constraint; +import app.aaps.core.interfaces.constraints.PluginConstraints; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin; +import app.aaps.core.interfaces.plugin.PluginDescription; +import app.aaps.core.interfaces.plugin.PluginType; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.profile.ProfileFunction; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.Insight; +import app.aaps.core.interfaces.pump.Pump; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpPluginBase; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.PumpSync.PumpState.TemporaryBasal; +import app.aaps.core.interfaces.pump.defs.ManufacturerType; +import app.aaps.core.interfaces.pump.defs.PumpDescription; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventDismissNotification; +import app.aaps.core.interfaces.rx.events.EventInitializationChanged; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventRefreshOverview; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.T; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.insight.database.InsightBolusID; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java index 003ccea724..1814271670 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java @@ -32,8 +32,8 @@ import java.util.List; import javax.inject.Inject; -import app.aaps.interfaces.pump.BlePreCheck; -import app.aaps.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.BlePreCheck; +import app.aaps.core.interfaces.pump.PumpSync; import dagger.android.support.DaggerAppCompatActivity; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java index 726ca0bdad..31bc1bddcf 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java @@ -25,9 +25,9 @@ import java.util.List; import javax.inject.Inject; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.sharedPreferences.SP; import dagger.android.DaggerService; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt index 7ebe7bd27f..4e98d686dd 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt @@ -1,5 +1,5 @@ package info.nightscout.androidaps.plugins.pump.insight.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventLocalInsightUpdateGUI : EventUpdateGui() diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt index c03f282e60..d540f5c686 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.insight.utils -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.androidaps.insight.R import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertCategory diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt index 1cc52cb350..b841a41c6e 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt @@ -3,20 +3,20 @@ package info.nightscout.plugins.aps import android.text.Spanned import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.convertedToPercent -import app.aaps.interfaces.aps.APSResult -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.aps.APSResult +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector import info.nightscout.core.ui.R import info.nightscout.core.utils.HtmlHelper diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt index 860412c7d2..b0fa69067d 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt @@ -14,14 +14,14 @@ import androidx.core.view.MenuCompat import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.plugins.aps.databinding.OpenapsFragmentBinding import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/di/ApsModule.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/di/ApsModule.kt index dd4c672cb8..8f0a0acc46 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/di/ApsModule.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/di/ApsModule.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.aps.di -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.autotune.Autotune +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.autotune.Autotune import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventOpenAPSUpdateGui.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventOpenAPSUpdateGui.kt index 06bc0ff4b9..497e525fd2 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventOpenAPSUpdateGui.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventOpenAPSUpdateGui.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.aps.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventOpenAPSUpdateGui : EventUpdateGui() diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventResetOpenAPSGui.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventResetOpenAPSGui.kt index 90a8e2657c..2d6bd6d2dc 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventResetOpenAPSGui.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventResetOpenAPSGui.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.aps.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventResetOpenAPSGui(val text: String) : EventUpdateGui() diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/logger/LoggerCallback.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/logger/LoggerCallback.kt index a03138534a..26e4247601 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/logger/LoggerCallback.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/logger/LoggerCallback.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.aps.logger -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.plugins.aps.utils.StaticInjector import org.mozilla.javascript.ScriptableObject import javax.inject.Inject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/CarbSuggestionReceiver.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/CarbSuggestionReceiver.kt index d892ab09e0..27e7000b2f 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/CarbSuggestionReceiver.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/CarbSuggestionReceiver.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.aps.loop import android.content.Context import android.content.Intent -import app.aaps.interfaces.aps.Loop +import app.aaps.core.interfaces.aps.Loop import dagger.android.DaggerBroadcastReceiver import javax.inject.Inject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt index b1f0bc0d45..56f6fa2f2e 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt @@ -15,15 +15,15 @@ import androidx.lifecycle.Lifecycle import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.pump.toHtml import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventLoopUpdateGui -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment import info.nightscout.core.utils.HtmlHelper diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt index b221c0e52b..42d6f0edea 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt @@ -20,48 +20,48 @@ import app.aaps.core.main.extensions.convertedToPercent import app.aaps.core.main.extensions.plannedRemainingMinutes import app.aaps.core.main.iob.json import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.APSResult -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.aps.Loop.LastRun -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAcceptOpenLoopChange -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventLoopUpdateGui -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventNewOpenLoopNotification -import app.aaps.interfaces.rx.events.EventTempTargetChange -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.APSResult +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.aps.Loop.LastRun +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAcceptOpenLoopChange +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventNewOpenLoopNotification +import app.aaps.core.interfaces.rx.events.EventTempTargetChange +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.DeviceStatus diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/events/EventLoopSetLastRunGui.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/events/EventLoopSetLastRunGui.kt index 28e523c055..031b6e6dd0 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/events/EventLoopSetLastRunGui.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/events/EventLoopSetLastRunGui.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.aps.loop.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui /** * Created by mike on 05.08.2016. diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/extensions/PumpEnactResultExtension.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/extensions/PumpEnactResultExtension.kt index fb50acfeec..1fe00b72e8 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/extensions/PumpEnactResultExtension.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/extensions/PumpEnactResultExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.aps.loop.extensions -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.utils.Round import org.json.JSONObject fun PumpEnactResult.json(baseBasal: Double): JSONObject { diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt index 634a9479a8..4f00a0a403 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt @@ -3,19 +3,19 @@ package info.nightscout.plugins.aps.openAPSAMA import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes import app.aaps.core.main.extensions.plannedRemainingMinutes -import app.aaps.interfaces.aps.DetermineBasalAdapter -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.iob.MealData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.aps.DetermineBasalAdapter +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.iob.MealData +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.plugins.aps.APSResultObject import info.nightscout.plugins.aps.R diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalResultAMA.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalResultAMA.kt index 6f73876841..18d4c13a5d 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalResultAMA.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalResultAMA.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.aps.openAPSAMA -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.plugins.aps.APSResultObject import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt index ab04a2c075..01d760e969 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt @@ -5,29 +5,29 @@ import app.aaps.annotations.OpenForTesting import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.extensions.target import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.APS -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.DetermineBasalAdapter -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profiling.Profiler -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.aps.APS +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.DetermineBasalAdapter +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profiling.Profiler +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.Round import dagger.android.HasAndroidInjector import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.ValueWrapper diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt index a47353c281..989e3f02ce 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt @@ -3,21 +3,21 @@ package info.nightscout.plugins.aps.openAPSSMB import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes import app.aaps.core.main.extensions.plannedRemainingMinutes -import app.aaps.interfaces.aps.DetermineBasalAdapter -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.iob.MealData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.aps.DetermineBasalAdapter +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.iob.MealData +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import info.nightscout.plugins.aps.APSResultObject import info.nightscout.plugins.aps.R diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt index 48331565df..b12ea7d973 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.aps.openAPSSMB -import app.aaps.interfaces.aps.VariableSensitivityResult -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.aps.VariableSensitivityResult +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.plugins.aps.APSResultObject import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt index 8db7ed8c27..e10de5c236 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt @@ -5,32 +5,32 @@ import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.extensions.target -import app.aaps.interfaces.aps.APS -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.DetermineBasalAdapter -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profiling.Profiler -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.aps.APS +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.DetermineBasalAdapter +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profiling.Profiler +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.Round import dagger.android.HasAndroidInjector import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.ValueWrapper diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt index 827a5f6201..22bd151daa 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt @@ -3,22 +3,22 @@ package info.nightscout.plugins.aps.openAPSSMBDynamicISF import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes import app.aaps.core.main.extensions.plannedRemainingMinutes -import app.aaps.interfaces.aps.DetermineBasalAdapter -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.iob.MealData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.aps.DetermineBasalAdapter +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.iob.MealData +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import info.nightscout.plugins.aps.R import info.nightscout.plugins.aps.logger.LoggerCallback diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt index 31c42844e4..e49b904a34 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt @@ -2,22 +2,22 @@ package info.nightscout.plugins.aps.openAPSSMBDynamicISF import android.content.Context import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.aps.DetermineBasalAdapter -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profiling.Profiler -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.aps.DetermineBasalAdapter +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profiling.Profiler +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.aps.R diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt index 85c4403f5a..4b4f5c36d5 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.aps.utils import android.text.Spanned -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import info.nightscout.core.utils.HtmlHelper import org.json.JSONArray import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt index 765191dc75..5ec25bf513 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.general.autotune -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.Round import info.nightscout.core.utils.Percentile import info.nightscout.plugins.general.autotune.data.ATProfile import info.nightscout.plugins.general.autotune.data.LocalInsulin diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt index dfb7f1a684..fb243ec876 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.general.autotune import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.LoggerUtils -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.LoggerUtils +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.plugins.general.autotune.data.ATProfile import info.nightscout.plugins.general.autotune.data.PreppedGlucose import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt index 75095b2c50..976ad77d13 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt @@ -19,26 +19,26 @@ import android.widget.TableRow import android.widget.TextView import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.extensions.runOnUiThread -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventLocalProfileChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventLocalProfileChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt index aa9a87765d..077145f6f5 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt @@ -5,17 +5,17 @@ import app.aaps.core.main.extensions.durationInMinutes import app.aaps.core.main.extensions.toJson import app.aaps.core.main.extensions.toTemporaryBasal import app.aaps.core.main.iob.round -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.iob.Iob -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.iob.Iob +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt index d694072c54..c34e262613 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt @@ -5,26 +5,26 @@ package info.nightscout.plugins.general.autotune import android.view.View import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.autotune.Autotune -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventLocalProfileChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.autotune.Autotune +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventLocalProfileChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.ui.elements.WeekDay import info.nightscout.core.utils.JsonHelper diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt index 31dc37f5d7..a0bea8c636 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.general.autotune -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt index b22cfc33a6..7c4de8c8ab 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt @@ -3,24 +3,24 @@ package info.nightscout.plugins.general.autotune.data import app.aaps.core.main.extensions.blockValueBySeconds import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.SafeParse -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.entities.data.Block diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt index fce063054a..96c764fa8a 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.general.autotune.data -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.GlucoseValue.TrendArrow import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt index f38ac42d84..e8839d66ef 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.general.autotune.data -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import org.json.JSONException import org.json.JSONObject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt index 480f4098d9..2036306de8 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.general.autotune.data -import app.aaps.interfaces.iob.Iob +import app.aaps.core.interfaces.iob.Iob import info.nightscout.database.entities.Bolus import kotlin.math.exp import kotlin.math.pow diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt index be3e51c96d..602e3978b3 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.general.autotune.data -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import org.json.JSONArray import org.json.JSONException import org.json.JSONObject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt index 2c5971c397..46e082fe78 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.general.autotune.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventAutotuneUpdateGui : Event() \ No newline at end of file diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt index 8cf89baa2d..4460c92113 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt @@ -3,21 +3,21 @@ package info.nightscout.plugins.aps.loop import android.app.NotificationManager import android.content.Context import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt index 0bee3679ad..6eac239ed1 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.general.autotune import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.core.utils.JsonHelper diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt index db28f20eef..da14009915 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt @@ -2,14 +2,14 @@ package info.nightscout.plugins.general.autotune import app.aaps.core.main.extensions.shiftBlock import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.core.utils.JsonHelper diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationEvent.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationEvent.kt index 0dea29c09a..5c9a348102 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationEvent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationEvent.kt @@ -1,9 +1,9 @@ package info.nightscout.automation -import app.aaps.interfaces.automation.AutomationEvent -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.automation.AutomationEvent +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.automation.actions.Action import info.nightscout.automation.actions.ActionDummy diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt index b625633637..5411f5b87f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt @@ -24,11 +24,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment import info.nightscout.automation.databinding.AutomationEventItemBinding diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt index 4932f28273..4fbeb1665c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt @@ -6,29 +6,29 @@ import android.os.HandlerThread import android.os.SystemClock import app.aaps.annotations.OpenForTesting import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.automation.Automation -import app.aaps.interfaces.automation.AutomationEvent -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventBTChange -import app.aaps.interfaces.rx.events.EventChargingState -import app.aaps.interfaces.rx.events.EventNetworkChange -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.automation.Automation +import app.aaps.core.interfaces.automation.AutomationEvent +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventBTChange +import app.aaps.core.interfaces.rx.events.EventChargingState +import app.aaps.core.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.automation.actions.Action import info.nightscout.automation.actions.ActionAlarm diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/Action.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/Action.kt index 0a2d4828e2..7ed52e35a6 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/Action.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/Action.kt @@ -2,9 +2,9 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.triggers.Trigger import org.json.JSONException diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt index 7bfe684693..c0fac1b95c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt @@ -3,11 +3,11 @@ package info.nightscout.automation.actions import android.content.Context import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputString diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt index 63b49255cc..54ea2cfa39 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt @@ -3,14 +3,14 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes import app.aaps.core.main.extensions.fromConstant -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.automation.elements.InputCarePortalMenu import info.nightscout.automation.elements.InputDuration diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionDummy.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionDummy.kt index d4f053abe8..8a497d5d22 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionDummy.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionDummy.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import dagger.android.HasAndroidInjector // Used for instantiation of other actions only diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt index e92c3a6f68..f8abdf483b 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt @@ -1,16 +1,16 @@ package info.nightscout.automation.actions import androidx.annotation.DrawableRes -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.database.entities.UserEntry diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt index 57b4071b8e..fae2b6d07a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt @@ -1,15 +1,15 @@ package info.nightscout.automation.actions import androidx.annotation.DrawableRes -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.database.entities.UserEntry diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt index 1f083017bb..babc99433d 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt @@ -1,15 +1,15 @@ package info.nightscout.automation.actions import androidx.annotation.DrawableRes -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.database.entities.UserEntry diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt index 6d076e2723..d6dd1eadca 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt @@ -2,12 +2,12 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt index b594905597..4ffca6d268 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt @@ -3,11 +3,11 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes import app.aaps.core.main.events.EventNewNotification -import app.aaps.interfaces.notifications.NotificationUserMessage -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.notifications.NotificationUserMessage +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputString diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt index e656c1a48c..e1067cac6f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt @@ -2,13 +2,13 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputProfileName diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt index ca7ff31a04..8c7c3dcd87 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt @@ -2,11 +2,11 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt index b2253278c5..70a4a1cb28 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt @@ -2,14 +2,14 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.interfaces.autotune.Autotune -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.autotune.Autotune +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.InputProfileName diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt index b0f3447eb4..83b923dc98 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt @@ -1,9 +1,9 @@ package info.nightscout.automation.actions import android.widget.LinearLayout -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputString diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt index cb047769ac..bbcbfdf7f7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt @@ -3,16 +3,16 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes import app.aaps.core.main.extensions.friendlyDescription -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.ComparatorExists diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt index 4b6a596914..1db71373e5 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.actions import androidx.annotation.DrawableRes -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback import com.google.gson.JsonObject import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt index 2ba11c2250..3626813fee 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt @@ -1,10 +1,10 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.database.entities.UserEntry diff --git a/plugins/automation/src/main/java/info/nightscout/automation/di/AutomationModule.kt b/plugins/automation/src/main/java/info/nightscout/automation/di/AutomationModule.kt index d2b006a925..6e74ce3a30 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/di/AutomationModule.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/di/AutomationModule.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.di -import app.aaps.interfaces.automation.Automation +import app.aaps.core.interfaces.automation.Automation import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt index 450867534c..f8f19da8ee 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt @@ -7,8 +7,8 @@ import android.view.Window import android.view.WindowManager import android.widget.Button import androidx.fragment.app.FragmentManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import dagger.android.support.DaggerDialogFragment import java.util.concurrent.atomic.AtomicBoolean import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseActionDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseActionDialog.kt index 143c9ee22a..de30b033c8 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseActionDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseActionDialog.kt @@ -5,7 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.RadioButton -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.automation.AutomationPlugin import info.nightscout.automation.actions.Action diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseOperationDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseOperationDialog.kt index e53b2e92a4..233319d3c3 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseOperationDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseOperationDialog.kt @@ -5,7 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.RadioButton -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.databinding.AutomationDialogChooseOperationBinding import info.nightscout.automation.triggers.TriggerConnector import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditActionDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditActionDialog.kt index 5747e3abea..58b16bbe07 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditActionDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditActionDialog.kt @@ -4,7 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.automation.actions.Action import info.nightscout.automation.actions.ActionDummy diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt index dbb4b6f8fa..d19ed178fd 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt @@ -10,9 +10,9 @@ import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.automation.AutomationEventObject import info.nightscout.automation.AutomationPlugin diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt index 9967efbe3a..3208d08ce4 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt @@ -5,8 +5,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.automation.databinding.AutomationDialogEditTriggerBinding import info.nightscout.automation.events.EventAutomationUpdateTrigger diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt index 851492dc62..ff6ae3c8c0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt @@ -7,7 +7,7 @@ import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.R class Comparator(private val rh: ResourceHelper) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt index 199d5d8acd..458496f647 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt @@ -7,7 +7,7 @@ import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.R class ComparatorConnect(private val rh: ResourceHelper) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt index c82714e445..b0831ae7fb 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt @@ -7,7 +7,7 @@ import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper class ComparatorExists(private val rh: ResourceHelper, var value: Compare = Compare.EXISTS) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt index d58501a6b7..d41802575f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt @@ -2,8 +2,8 @@ package info.nightscout.automation.elements import android.view.Gravity import android.widget.LinearLayout -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileFunction import info.nightscout.core.ui.elements.NumberPicker import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt index 44b4e2513a..7a2790d991 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt @@ -8,7 +8,7 @@ import android.widget.LinearLayout import android.widget.Spinner import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.database.entities.TherapyEvent class InputCarePortalMenu(private val rh: ResourceHelper) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt index 24e79dc28c..a86c192fa4 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt @@ -9,8 +9,8 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentManager -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt index 712e4aea61..2183fb4455 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt @@ -7,7 +7,7 @@ import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.R import info.nightscout.core.ui.elements.NumberPicker import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt index 42bae3839a..ddb3754dac 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt @@ -6,7 +6,7 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper class InputDropdownMenu(private val rh: ResourceHelper) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt index ad0593fce2..c6efc46d25 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt @@ -7,7 +7,7 @@ import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner import androidx.annotation.StringRes -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.R class InputLocationMode(private val rh: ResourceHelper) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt index 6353dc57ff..c7b74a78ec 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt @@ -6,8 +6,8 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.LinearLayout import android.widget.Spinner -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper class InputProfileName(private val rh: ResourceHelper, private val activePlugin: ActivePlugin, val name: String = "", private val addActive: Boolean = false) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt index 04413a8aa2..a29af844ea 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt @@ -2,9 +2,9 @@ package info.nightscout.automation.elements import android.view.Gravity import android.widget.LinearLayout -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileFunction import info.nightscout.core.ui.elements.NumberPicker import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt index 4721f52c1d..30d79bfa96 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt @@ -9,9 +9,9 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentManager -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt index 28df33bcd7..5a0b7a5586 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt @@ -10,9 +10,9 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentManager -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/LabelWithElement.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/LabelWithElement.kt index 06a8f378ae..73dc147001 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/LabelWithElement.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/LabelWithElement.kt @@ -4,7 +4,7 @@ import android.graphics.Typeface import android.view.Gravity import android.widget.LinearLayout import android.widget.TextView -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper class LabelWithElement( private val rh: ResourceHelper, diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt index ef5297a830..7e0a74d3f2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt @@ -4,7 +4,7 @@ import android.graphics.Typeface import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.triggers.Trigger class StaticLabel(private val rh: ResourceHelper) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationAddAction.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationAddAction.kt index ecbf7bf260..a7ec25904d 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationAddAction.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationAddAction.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.automation.actions.Action class EventAutomationAddAction(val action: Action) : Event() diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationDataChanged.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationDataChanged.kt index 89ce74b2bf..c42b4252f3 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationDataChanged.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationDataChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventAutomationDataChanged : Event() diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateAction.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateAction.kt index 8ffcb6a43c..a8efbf23de 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateAction.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateAction.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.automation.actions.Action class EventAutomationUpdateAction(val action: Action, val position: Int) : Event() \ No newline at end of file diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateGui.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateGui.kt index f495409027..f275e309c5 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateGui.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateGui.kt @@ -1,5 +1,5 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventAutomationUpdateGui : Event() diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateTrigger.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateTrigger.kt index a26f350cc8..8377e30092 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateTrigger.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateTrigger.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.automation.triggers.TriggerConnector class EventAutomationUpdateTrigger(val trigger: TriggerConnector) : Event() diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventLocationChange.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventLocationChange.kt index 378b9cbb0e..7911cac6b5 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventLocationChange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventLocationChange.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.events import android.location.Location -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventLocationChange(var location: Location) : Event() diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerChanged.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerChanged.kt index 12fb4d3f16..f37745c935 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerChanged.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventTriggerChanged : Event() \ No newline at end of file diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerClone.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerClone.kt index e936a45ca4..10b8649ccc 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerClone.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerClone.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.automation.triggers.Trigger class EventTriggerClone(val trigger: Trigger) : Event() \ No newline at end of file diff --git a/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerRemove.kt b/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerRemove.kt index 59ea482511..ae0c04b388 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerRemove.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerRemove.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.automation.triggers.Trigger class EventTriggerRemove(val trigger: Trigger) : Event() \ No newline at end of file diff --git a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt index 38fadd050f..19e64fce09 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt @@ -15,14 +15,14 @@ import android.os.Bundle import android.os.IBinder import androidx.core.app.ActivityCompat import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.NotificationHolder -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import com.google.android.gms.location.LocationServices import dagger.android.DaggerService import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt index a7f5dd0edc..f9113358d9 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.content.ServiceConnection import android.os.IBinder import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.notifications.NotificationHolder import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt index 6e9dd43169..55840115a2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt @@ -7,17 +7,17 @@ import android.widget.ImageButton import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt index 9739c08468..6de6e9455d 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt index 028b2f3ecf..711fff7e44 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt @@ -7,8 +7,8 @@ import android.content.pm.PackageManager import android.os.Build import android.widget.LinearLayout import androidx.core.app.ActivityCompat -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.events.EventBTChange +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.events.EventBTChange import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.AutomationPlugin diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt index 14d4666235..a9b2765b35 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt index 5dabfdb5e0..08e5753528 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -83,7 +83,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) { LayoutBuilder() .add(StaticLabel(rh, R.string.lastboluslabel, this)) .add(comparator) - .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(app.aaps.interfaces.R.string.unit_minutes), minutesAgo)) + .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(app.aaps.core.interfaces.R.string.unit_minutes), minutesAgo)) .build(root) } } \ No newline at end of file diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt index f23d2f50f4..da5bd7330b 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt index 2b6988ccd1..748306ea4c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.annotation.StringRes -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt index 949ef50384..e1e935dd3f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt index da555c180a..0b8977ffd2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt @@ -2,7 +2,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import androidx.annotation.VisibleForTesting -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt index d2d5905181..6787d9598e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt index 6cd3a17143..a8660c83eb 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt @@ -2,7 +2,7 @@ package info.nightscout.automation.triggers import android.location.Location import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt index b70e46aa24..8c356d9df0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt @@ -2,7 +2,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt index 1dc456140a..16f9555c39 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt index cb8b1e9910..11abd18652 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.MidnightTime import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt index 281507f552..0323c8e8b6 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt index e7b8708e2a..346399a150 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.LTag import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt index 07b4a8fbb1..55e16f3524 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.T import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt index 4c85193fbb..cb998cb8d1 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.MidnightTime import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt index 4bd5904a73..65bf80623d 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.receivers.ReceiverStatusStore import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R diff --git a/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt index a4ab1ab266..06e4dfddf4 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt @@ -1,8 +1,8 @@ package info.nightscout.automation -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt index de40515d71..a8a50e7d9a 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt @@ -2,15 +2,15 @@ package info.nightscout.automation import android.content.Context import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt index 5fb8a75490..8773dfe8a1 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt @@ -2,15 +2,15 @@ package info.nightscout.automation import android.content.Context import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt index 9b382915b0..61a4c74edb 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt @@ -1,11 +1,11 @@ package info.nightscout.automation.actions import android.content.Context -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt index 7ac4a69ea6..3058449c76 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.elements.InputCarePortalMenu import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.InputString diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt index f29cec2d66..53b8b46f2d 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt index 0467b68437..c43560c206 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt index 8fa5f1f82a..08bdeca126 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt index ea4b00289b..52c37a45b1 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration import org.junit.jupiter.api.Assertions diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt index d9990b4cd3..9e0f6bbd85 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt @@ -1,10 +1,10 @@ package info.nightscout.automation.actions import android.content.Context -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt index d7c1f98533..3e367751df 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.InputPercent diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt index 0ff29e7a3a..4ab3fdec2f 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputProfileName import org.junit.jupiter.api.Assertions diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionSendSMSTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionSendSMSTest.kt index b541be254b..53a496d06d 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionSendSMSTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionSendSMSTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import org.junit.jupiter.api.Assertions diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt index b3cce15f5a..e1d09111de 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.InputTempTarget diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopProcessingTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopProcessingTest.kt index 1abb6cf98f..aa84b96022 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopProcessingTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopProcessingTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt index e92a3898d5..3070a0c30f 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import app.aaps.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt index 3e4eaae013..b3246dc588 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt @@ -1,21 +1,21 @@ package info.nightscout.automation.actions import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/elements/InputBgTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/elements/InputBgTest.kt index 037374009a..1e137ea289 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/elements/InputBgTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/elements/InputBgTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.elements -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import info.nightscout.automation.triggers.TriggerTestBase import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/automation/src/test/java/info/nightscout/automation/elements/InputTempTargetTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/elements/InputTempTargetTest.kt index 9829f69b2f..306066c65f 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/elements/InputTempTargetTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/elements/InputTempTargetTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.elements -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import info.nightscout.automation.triggers.TriggerTestBase import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt index eec54ddace..6ee04b562e 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue import com.google.common.base.Optional import info.nightscout.automation.elements.Comparator import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt index 7b3fa6fce6..4f34ec1d37 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.iob.CobInfo +import app.aaps.core.interfaces.iob.CobInfo import com.google.common.base.Optional import info.nightscout.automation.elements.Comparator import org.json.JSONObject diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt index 9eb4deeab5..8c056aee44 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue import com.google.common.truth.Truth.assertThat import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerIobTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerIobTest.kt index a56794448a..8e225f8d44 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerIobTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerIobTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.iob.IobTotal +import app.aaps.core.interfaces.iob.IobTotal import com.google.common.base.Optional import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerRecurringTimeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerRecurringTimeTest.kt index 311ce246c1..e302103ee0 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerRecurringTimeTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerRecurringTimeTest.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import org.json.JSONObject import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTempTargetValueTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTempTargetValueTest.kt index f9f24dbdb6..c0acc86840 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTempTargetValueTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTempTargetValueTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import com.google.common.base.Optional import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt index 65e69a1a54..114437959a 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt @@ -1,7 +1,7 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.receivers.ReceiverStatusStore import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt index fed7344391..fe50e87911 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.MidnightTime import com.google.common.base.Optional import info.nightscout.automation.R import org.json.JSONObject diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt index 6b6233ffa9..909bd50f9f 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import com.google.common.base.Optional import info.nightscout.automation.R import org.json.JSONObject diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt index 637ecbb999..8c7b55e4b3 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.triggers -import app.aaps.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.rx.events.EventNetworkChange import com.google.common.base.Optional import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt index 6439a2db7d..e1f6801112 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt @@ -14,12 +14,12 @@ import android.provider.Settings import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt index b3f8e25d41..e337148acf 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt @@ -9,12 +9,12 @@ import androidx.core.app.ActivityCompat import app.aaps.configuration.R import app.aaps.configuration.maintenance.CustomWatchfaceFileContract import app.aaps.configuration.maintenance.PrefsFileContract -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventThemeSwitch +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventThemeSwitch import dagger.android.support.DaggerAppCompatActivity import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.locale.LocaleHelper diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt index b28ef43445..59ab69811e 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt @@ -7,10 +7,10 @@ import android.view.MenuInflater import android.view.MenuItem import androidx.core.view.MenuProvider import app.aaps.configuration.R -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.ui.UiInteraction import javax.inject.Inject class SingleFragmentActivity : DaggerAppCompatActivityWithResult() { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt index 143251d1da..019bc1d961 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt @@ -8,16 +8,16 @@ import app.aaps.configuration.R import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui import app.aaps.configuration.databinding.ConfigbuilderFragmentBinding import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.protection.ProtectionCheck.Protection.PREFERENCES -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.protection.ProtectionCheck.Protection.PREFERENCES +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.support.DaggerFragment import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt index 82ff8bd631..86fcf322d1 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt @@ -15,32 +15,32 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import app.aaps.configuration.R import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui -import app.aaps.interfaces.aps.APS -import app.aaps.interfaces.aps.Sensitivity -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppInitialized -import app.aaps.interfaces.rx.events.EventConfigBuilderChange -import app.aaps.interfaces.rx.events.EventRebuildTabs -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.smoothing.Smoothing -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.aps.APS +import app.aaps.core.interfaces.aps.Sensitivity +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppInitialized +import app.aaps.core.interfaces.rx.events.EventConfigBuilderChange +import app.aaps.core.interfaces.rx.events.EventRebuildTabs +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.database.entities.UserEntry.Action diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt index b13e36337c..2e671054f8 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt @@ -1,23 +1,23 @@ package app.aaps.configuration.configBuilder import app.aaps.configuration.R -import app.aaps.interfaces.aps.Sensitivity -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.smoothing.Smoothing -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.aps.Sensitivity +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.sdk.interfaces.RunningConfiguration import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus import org.json.JSONException diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/events/EventConfigBuilderUpdateGui.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/events/EventConfigBuilderUpdateGui.kt index a957dca1e7..75119a4f37 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/events/EventConfigBuilderUpdateGui.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/events/EventConfigBuilderUpdateGui.kt @@ -1,5 +1,5 @@ package app.aaps.configuration.configBuilder.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventConfigBuilderUpdateGui : EventUpdateGui() \ No newline at end of file diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt index 520639560d..7fe64f6486 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt @@ -12,10 +12,10 @@ import app.aaps.configuration.maintenance.activities.CustomWatchfaceImportListAc import app.aaps.configuration.maintenance.activities.LogSettingActivity import app.aaps.configuration.maintenance.activities.PrefImportListActivity import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.maintenance.PrefFileListProvider import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt index 9eeae2fa5d..78555d693c 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt @@ -28,32 +28,32 @@ import app.aaps.configuration.maintenance.data.PrefsStatusImpl import app.aaps.configuration.maintenance.dialogs.PrefImportSummaryDialog import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.maintenance.PrefMetadata -import app.aaps.interfaces.maintenance.PrefsFile -import app.aaps.interfaces.maintenance.PrefsMetadataKey -import app.aaps.interfaces.protection.PasswordCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventDiaconnG8PumpLogReset -import app.aaps.interfaces.rx.weardata.CwfData -import app.aaps.interfaces.rx.weardata.CwfMetadataKey -import app.aaps.interfaces.rx.weardata.ZipWatchfaceFormat -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.storage.Storage -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.userEntry.UserEntryPresentationHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.maintenance.PrefMetadata +import app.aaps.core.interfaces.maintenance.PrefsFile +import app.aaps.core.interfaces.maintenance.PrefsMetadataKey +import app.aaps.core.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventDiaconnG8PumpLogReset +import app.aaps.core.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey +import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.storage.Storage +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.dialogs.TwoMessagesAlertDialog diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt index 1ce7700260..843c6b0f44 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt @@ -11,25 +11,25 @@ import app.aaps.configuration.databinding.MaintenanceFragmentBinding import app.aaps.configuration.maintenance.activities.LogSettingActivity import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.extensions.runOnUiThread -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.OwnDatabasePlugin -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.protection.ProtectionCheck.Protection.PREFERENCES -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sync.DataSyncSelectorXdrip -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.protection.ProtectionCheck.Protection.PREFERENCES +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt index f1aed50ea8..c3f18bfe40 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt @@ -5,16 +5,16 @@ import android.content.Intent import android.net.Uri import androidx.core.content.FileProvider import app.aaps.configuration.R -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LoggerUtils -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LoggerUtils +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import java.io.BufferedInputStream import java.io.BufferedOutputStream diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt index ca374e19e7..db8e344688 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt @@ -7,20 +7,20 @@ import app.aaps.configuration.R import app.aaps.configuration.maintenance.data.PrefMetadataMap import app.aaps.configuration.maintenance.data.PrefsStatusImpl import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.maintenance.PrefMetadata -import app.aaps.interfaces.maintenance.PrefsFile -import app.aaps.interfaces.maintenance.PrefsImportDir -import app.aaps.interfaces.maintenance.PrefsMetadataKey -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.weardata.CwfData -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.rx.weardata.ZipWatchfaceFormat -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.storage.Storage -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.maintenance.PrefMetadata +import app.aaps.core.interfaces.maintenance.PrefsFile +import app.aaps.core.interfaces.maintenance.PrefsImportDir +import app.aaps.core.interfaces.maintenance.PrefsMetadataKey +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.storage.Storage +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import dagger.Lazy import dagger.Reusable import org.joda.time.DateTime diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt index 869fc0cd65..3c75c31fd3 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt @@ -5,7 +5,7 @@ import android.content.Intent import androidx.activity.result.contract.ActivityResultContract import androidx.fragment.app.FragmentActivity import app.aaps.configuration.maintenance.activities.PrefImportListActivity -import app.aaps.interfaces.maintenance.PrefsFile +import app.aaps.core.interfaces.maintenance.PrefsFile import info.nightscout.core.utils.extensions.safeGetParcelableExtra class PrefsFileContract : ActivityResultContract() { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsMetadataKeyImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsMetadataKeyImpl.kt index 7b796b90b8..c08e822e99 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsMetadataKeyImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsMetadataKeyImpl.kt @@ -5,7 +5,7 @@ import androidx.annotation.DrawableRes import androidx.annotation.StringRes import app.aaps.configuration.R import app.aaps.configuration.maintenance.data.PrefsFormat -import app.aaps.interfaces.maintenance.PrefsMetadataKey +import app.aaps.core.interfaces.maintenance.PrefsMetadataKey enum class PrefsMetadataKeyImpl(override val key: String, @DrawableRes override val icon: Int, @StringRes override val label: Int) : PrefsMetadataKey { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt index c4fccb69a1..7fb7e8c334 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt @@ -10,26 +10,26 @@ import androidx.recyclerview.widget.RecyclerView import app.aaps.configuration.R import app.aaps.configuration.databinding.CustomWatchfaceImportListActivityBinding import app.aaps.configuration.databinding.CustomWatchfaceImportListItemBinding -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventMobileDataToWear -import app.aaps.interfaces.rx.weardata.CUSTOM_VERSION -import app.aaps.interfaces.rx.weardata.CwfData -import app.aaps.interfaces.rx.weardata.CwfMetadataKey.CWF_AUTHOR -import app.aaps.interfaces.rx.weardata.CwfMetadataKey.CWF_AUTHOR_VERSION -import app.aaps.interfaces.rx.weardata.CwfMetadataKey.CWF_CREATED_AT -import app.aaps.interfaces.rx.weardata.CwfMetadataKey.CWF_FILENAME -import app.aaps.interfaces.rx.weardata.CwfMetadataKey.CWF_NAME -import app.aaps.interfaces.rx.weardata.CwfMetadataKey.CWF_VERSION -import app.aaps.interfaces.rx.weardata.CwfMetadataMap -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.rx.weardata.ResFileMap -import app.aaps.interfaces.rx.weardata.ZipWatchfaceFormat -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventMobileDataToWear +import app.aaps.core.interfaces.rx.weardata.CUSTOM_VERSION +import app.aaps.core.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey.CWF_AUTHOR +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey.CWF_AUTHOR_VERSION +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey.CWF_CREATED_AT +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey.CWF_FILENAME +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey.CWF_NAME +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey.CWF_VERSION +import app.aaps.core.interfaces.rx.weardata.CwfMetadataMap +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.rx.weardata.ResFileMap +import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject @@ -93,7 +93,7 @@ class CustomWatchfaceImportListActivity : TranslatedDaggerAppCompatActivity() { val drawable = customWatchfaceFile.resDatas[ResFileMap.CUSTOM_WATCHFACE.fileName]?.toDrawable(resources) with(holder.customWatchfaceImportListItemBinding) { val fileName = metadata[CWF_FILENAME]?.let { "$it${ZipWatchfaceFormat.CWF_EXTENTION}" } ?: "" - filelistName.text = rh.gs(app.aaps.interfaces.R.string.metadata_wear_import_filename, fileName) + filelistName.text = rh.gs(app.aaps.core.interfaces.R.string.metadata_wear_import_filename, fileName) filelistName.tag = customWatchfaceFile customWatchface.setImageDrawable(drawable) customName.text = rh.gs(CWF_NAME.label, metadata[CWF_NAME]) diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt index 0a78233521..a751296691 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt @@ -7,9 +7,9 @@ import android.widget.LinearLayout import android.widget.TextView import app.aaps.configuration.R import app.aaps.configuration.databinding.ActivityLogsettingBinding -import app.aaps.interfaces.logging.L -import app.aaps.interfaces.logging.LogElement -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.L +import app.aaps.core.interfaces.logging.LogElement +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt index 113677ff00..49524f2944 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt @@ -14,9 +14,9 @@ import app.aaps.configuration.databinding.MaintenanceImportListItemBinding import app.aaps.configuration.maintenance.PrefsFileContract import app.aaps.configuration.maintenance.PrefsMetadataKeyImpl import app.aaps.configuration.maintenance.data.PrefsStatusImpl -import app.aaps.interfaces.maintenance.PrefFileListProvider -import app.aaps.interfaces.maintenance.PrefsFile -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.maintenance.PrefFileListProvider +import app.aaps.core.interfaces.maintenance.PrefsFile +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/data/PrefsFormat.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/data/PrefsFormat.kt index 888df1b663..dfc9eb0b23 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/data/PrefsFormat.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/data/PrefsFormat.kt @@ -2,9 +2,9 @@ package app.aaps.configuration.maintenance.data import androidx.annotation.DrawableRes import app.aaps.configuration.R -import app.aaps.interfaces.maintenance.PrefMetadata -import app.aaps.interfaces.maintenance.PrefsMetadataKey -import app.aaps.interfaces.maintenance.PrefsStatus +import app.aaps.core.interfaces.maintenance.PrefMetadata +import app.aaps.core.interfaces.maintenance.PrefsMetadataKey +import app.aaps.core.interfaces.maintenance.PrefsStatus import kotlinx.parcelize.Parcelize import java.io.File diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt index 53701fbd3b..57d00a57fd 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt @@ -19,7 +19,7 @@ import androidx.appcompat.view.ContextThemeWrapper import app.aaps.configuration.R import app.aaps.configuration.maintenance.data.Prefs import app.aaps.configuration.maintenance.data.PrefsStatusImpl -import app.aaps.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.extensions.runOnUiThread import com.google.android.material.dialog.MaterialAlertDialogBuilder import info.nightscout.core.ui.toast.ToastUtils import java.util.LinkedList @@ -57,8 +57,8 @@ object PrefImportSummaryDialog { (rowLayout.findViewById(R.id.summary_icon) as ImageView).setImageResource(metaKey.icon) (rowLayout.findViewById(R.id.status_icon) as ImageView).setImageResource(metaEntry.status.icon) - if (metaEntry.status == PrefsStatusImpl.WARN) label.setTextColor(themedCtx.getColor(app.aaps.interfaces.R.color.metadataTextWarning)) - else if (metaEntry.status == PrefsStatusImpl.ERROR) label.setTextColor(themedCtx.getColor(app.aaps.interfaces.R.color.metadataTextError)) + if (metaEntry.status == PrefsStatusImpl.WARN) label.setTextColor(themedCtx.getColor(app.aaps.core.interfaces.R.color.metadataTextWarning)) + else if (metaEntry.status == PrefsStatusImpl.ERROR) label.setTextColor(themedCtx.getColor(app.aaps.core.interfaces.R.color.metadataTextError)) if (metaEntry.info != null) { details.add("${context.getString(metaKey.label)}: ${metaEntry.value}
${metaEntry.info}") diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt index 411b45ecf2..02838af979 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt @@ -10,11 +10,11 @@ import app.aaps.configuration.maintenance.data.Prefs import app.aaps.configuration.maintenance.data.PrefsFormat import app.aaps.configuration.maintenance.data.PrefsStatusImpl import app.aaps.core.main.utils.CryptoUtil -import app.aaps.interfaces.maintenance.PrefMetadata -import app.aaps.interfaces.maintenance.PrefsMetadataKey -import app.aaps.interfaces.maintenance.PrefsStatus -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.storage.Storage +import app.aaps.core.interfaces.maintenance.PrefMetadata +import app.aaps.core.interfaces.maintenance.PrefsMetadataKey +import app.aaps.core.interfaces.maintenance.PrefsStatus +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.storage.Storage import info.nightscout.core.utils.hexStringToByteArray import info.nightscout.core.utils.toHex import org.json.JSONException diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt index 9720933e63..23e6379e27 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt @@ -22,30 +22,30 @@ import app.aaps.configuration.setupwizard.elements.SWPreference import app.aaps.configuration.setupwizard.elements.SWRadioButton import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.CryptoUtil -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.Objectives -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.OmnipodDash -import app.aaps.interfaces.pump.OmnipodEros -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventSWRLStatus -import app.aaps.interfaces.rx.events.EventSWSyncStatus -import app.aaps.interfaces.rx.events.EventSWUpdate -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.Objectives +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.OmnipodDash +import app.aaps.core.interfaces.pump.OmnipodEros +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventSWRLStatus +import app.aaps.core.interfaces.rx.events.EventSWSyncStatus +import app.aaps.core.interfaces.rx.events.EventSWUpdate +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import info.nightscout.core.utils.isRunningTest import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWEventListener.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWEventListener.kt index ac27a72eb4..a98614d6a8 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWEventListener.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWEventListener.kt @@ -6,8 +6,8 @@ import android.view.View import android.widget.LinearLayout import android.widget.TextView import app.aaps.configuration.setupwizard.elements.SWItem -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.events.EventStatus +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.events.EventStatus import dagger.android.HasAndroidInjector import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWScreen.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWScreen.kt index 2a8dd17247..be32f6afec 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWScreen.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWScreen.kt @@ -1,7 +1,7 @@ package app.aaps.configuration.setupwizard import app.aaps.configuration.setupwizard.elements.SWItem -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt index 58eda5c4ff..dc8ffe7357 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt @@ -14,15 +14,15 @@ import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult import app.aaps.configuration.databinding.ActivitySetupwizardBinding import app.aaps.configuration.setupwizard.elements.SWItem import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.events.EventProfileStoreChanged -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventSWRLStatus -import app.aaps.interfaces.rx.events.EventSWSyncStatus -import app.aaps.interfaces.rx.events.EventSWUpdate -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.events.EventProfileStoreChanged +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventSWRLStatus +import app.aaps.core.interfaces.rx.events.EventSWSyncStatus +import app.aaps.core.interfaces.rx.events.EventSWUpdate +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.locale.LocaleHelper.update diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt index 686e43dd4d..ce7cfc7c66 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt @@ -10,7 +10,7 @@ import android.widget.EditText import android.widget.LinearLayout import android.widget.TextView import app.aaps.core.main.utils.CryptoUtil -import app.aaps.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.extensions.toVisibility import dagger.android.HasAndroidInjector class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUtil: CryptoUtil) : SWItem(injector, Type.STRING) { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt index 19147aed56..e7a95a5713 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt @@ -6,7 +6,7 @@ import android.text.TextWatcher import android.view.View import android.widget.LinearLayout import android.widget.TextView -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import info.nightscout.core.ui.elements.NumberPicker import java.text.DecimalFormat diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt index 95e857840c..bfa8b305c5 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt @@ -6,7 +6,7 @@ import android.text.TextWatcher import android.view.View import android.widget.LinearLayout import android.widget.TextView -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import info.nightscout.core.ui.elements.NumberPicker import java.text.DecimalFormat diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt index ea1581ad63..8fe5b31216 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt @@ -6,10 +6,10 @@ import android.text.TextWatcher import android.view.View import android.widget.LinearLayout import android.widget.TextView -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import info.nightscout.core.ui.elements.NumberPicker import java.text.DecimalFormat diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWItem.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWItem.kt index 40e8421fd8..0462caa8f5 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWItem.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWItem.kt @@ -6,14 +6,14 @@ import android.view.View import android.widget.LinearLayout import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.protection.PasswordCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventSWUpdate -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.protection.PasswordCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventSWUpdate +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import java.util.concurrent.Executors import java.util.concurrent.ScheduledFuture diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt index 5ea2a60122..1af96f14ba 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt @@ -5,11 +5,11 @@ import androidx.annotation.StringRes import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui import app.aaps.configuration.setupwizard.SWDefinition import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt index 308d6354c0..6af378f6ee 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt @@ -4,7 +4,7 @@ import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import app.aaps.configuration.setupwizard.SWDefinition -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/events/EventSWLabel.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/events/EventSWLabel.kt index cf98c43f45..42a5673929 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/events/EventSWLabel.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/events/EventSWLabel.kt @@ -1,5 +1,5 @@ package app.aaps.configuration.setupwizard.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventSWLabel(var label: String) : Event() \ No newline at end of file diff --git a/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt b/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt index 36adfef25b..023bbe21a9 100644 --- a/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt +++ b/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt @@ -6,8 +6,8 @@ import app.aaps.configuration.maintenance.data.Prefs import app.aaps.configuration.maintenance.data.PrefsFormat import app.aaps.configuration.maintenance.data.PrefsStatusImpl import app.aaps.core.main.utils.CryptoUtil -import app.aaps.interfaces.maintenance.PrefMetadata -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.maintenance.PrefMetadata +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase import com.google.common.truth.TruthJUnit.assume import org.junit.jupiter.api.Assertions diff --git a/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/SingleStringStorage.kt b/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/SingleStringStorage.kt index 809d7364fa..0af8015431 100644 --- a/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/SingleStringStorage.kt +++ b/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/SingleStringStorage.kt @@ -1,6 +1,6 @@ package app.aaps.configuration.maintenance.formats -import app.aaps.interfaces.storage.Storage +import app.aaps.core.interfaces.storage.Storage import java.io.File class SingleStringStorage(var contents: String) : Storage { diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt index dcda9e4c5c..7e84b9b4d9 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.constraints import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt index 86000b726a..961de52165 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt @@ -2,22 +2,22 @@ package info.nightscout.plugins.constraints.bgQualityCheck import androidx.annotation.DrawableRes import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventBucketedDataCreated -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventBucketedDataCreated +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt index 28853d174b..251f4a4464 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.constraints.di -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import dagger.Binds import dagger.Module import info.nightscout.plugins.constraints.ConstraintsCheckerImpl diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt index e370d7633b..f53dd139b8 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt @@ -1,18 +1,18 @@ package info.nightscout.plugins.constraints.dstHelper -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import java.util.Calendar diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt index 475b4e6e4c..e755909a74 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt @@ -17,16 +17,16 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNtpStatus -import app.aaps.interfaces.rx.events.EventSWUpdate -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNtpStatus +import app.aaps.core.interfaces.rx.events.EventSWUpdate +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt index 7c6ec336ff..aa1ad37018 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt @@ -1,23 +1,23 @@ package info.nightscout.plugins.constraints.objectives -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.Objectives -import app.aaps.interfaces.constraints.Objectives.Companion.AUTOSENS_OBJECTIVE -import app.aaps.interfaces.constraints.Objectives.Companion.AUTO_OBJECTIVE -import app.aaps.interfaces.constraints.Objectives.Companion.DYN_ISF_OBJECTIVE -import app.aaps.interfaces.constraints.Objectives.Companion.FIRST_OBJECTIVE -import app.aaps.interfaces.constraints.Objectives.Companion.MAXBASAL_OBJECTIVE -import app.aaps.interfaces.constraints.Objectives.Companion.MAXIOB_ZERO_CL_OBJECTIVE -import app.aaps.interfaces.constraints.Objectives.Companion.SMB_OBJECTIVE -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.Objectives +import app.aaps.core.interfaces.constraints.Objectives.Companion.AUTOSENS_OBJECTIVE +import app.aaps.core.interfaces.constraints.Objectives.Companion.AUTO_OBJECTIVE +import app.aaps.core.interfaces.constraints.Objectives.Companion.DYN_ISF_OBJECTIVE +import app.aaps.core.interfaces.constraints.Objectives.Companion.FIRST_OBJECTIVE +import app.aaps.core.interfaces.constraints.Objectives.Companion.MAXBASAL_OBJECTIVE +import app.aaps.core.interfaces.constraints.Objectives.Companion.MAXIOB_ZERO_CL_OBJECTIVE +import app.aaps.core.interfaces.constraints.Objectives.Companion.SMB_OBJECTIVE +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.objectives.objectives.Objective diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt index b7b6444bad..b8abcafb34 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.constraints.objectives import android.os.SystemClock -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.utils.DateUtil import java.net.DatagramPacket import java.net.DatagramSocket import java.net.InetAddress diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt index 9801da3ea6..06566cbd0e 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt @@ -4,10 +4,10 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerDialogFragment import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt index abead4ff4f..3879eee0a8 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt @@ -6,12 +6,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNtpStatus +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNtpStatus import dagger.android.support.DaggerDialogFragment import info.nightscout.plugins.constraints.databinding.DialogNtpProgressBinding import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt index a10cc409e5..4108467b05 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.constraints.objectives.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventObjectivesUpdateGui : EventUpdateGui() \ No newline at end of file diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt index e50dc6f058..2ec258e2c8 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt @@ -6,10 +6,10 @@ import android.widget.CheckBox import android.widget.TextView import androidx.annotation.StringRes import androidx.fragment.app.FragmentActivity -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import javax.inject.Inject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt index dec690b8d9..fe2c9164c1 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.sync.Tidepool +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.sync.Tidepool import dagger.android.HasAndroidInjector import info.nightscout.database.ValueWrapper import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt index f2b48df603..def521e4a9 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.actions.Actions -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.actions.Actions +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import javax.inject.Inject @@ -11,7 +11,7 @@ class Objective1 @Inject constructor(injector: HasAndroidInjector) : Objective(i @Inject lateinit var activePlugin: ActivePlugin val actionsPlugin: PluginBase - get() = activePlugin.getSpecificPluginsListByInterface(Actions::class.java)[0] + get() = activePlugin.getSpecificPluginsListByInterface(app.aaps.core.interfaces.actions.Actions::class.java)[0] init { tasks.add(object : Task(this, R.string.objectives_useprofileswitch) { diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt index a4163faaf2..3636ecbb55 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt index 466d241d4e..c5f514506a 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt index d9ffc29830..33faedadfb 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import javax.inject.Inject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt index 22268af9b3..ad7bdf86aa 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.constraints.objectives.objectives import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import javax.inject.Inject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt index ce1a2e8751..bed7e387a4 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.constraints.objectives.objectives import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.safety.SafetyPlugin diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt index c493308916..f69eed7f63 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import javax.inject.Inject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt index 8447003018..6fcabafacb 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt index 76c9ef1516..bfcaf443bb 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.constraints.objectives.objectives -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt index fedf5746b5..ebcbb45d04 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt @@ -2,12 +2,12 @@ package info.nightscout.plugins.constraints.phoneChecker import android.content.Context import android.os.Build -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper import com.scottyab.rootbeer.RootBeer import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt index f32ab4d1c4..71160a7185 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt @@ -7,28 +7,28 @@ import app.aaps.core.main.utils.extensions.putString import app.aaps.core.main.utils.extensions.storeDouble import app.aaps.core.main.utils.extensions.storeInt import app.aaps.core.main.utils.extensions.storeString -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.constraints.Safety -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.constraints.Safety +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.Round import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import org.json.JSONObject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt index e5e3239aac..416f007190 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt @@ -4,16 +4,16 @@ import android.content.Context import android.content.pm.PackageManager import android.os.Handler import android.os.HandlerThread -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import org.spongycastle.util.encoders.Hex diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt index 026a51e58a..7a1bab0a5e 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt @@ -3,17 +3,17 @@ package info.nightscout.plugins.constraints.storage import android.os.Environment import android.os.StatFs import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import javax.inject.Inject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index d15deac7d7..da48a3e034 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -1,19 +1,19 @@ package info.nightscout.plugins.constraints.versionChecker -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import java.util.concurrent.TimeUnit diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt index a2484be80a..01155ce2db 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt @@ -1,17 +1,17 @@ package info.nightscout.plugins.constraints.versionChecker import android.os.Build -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import dagger.Lazy import info.nightscout.plugins.constraints.R import java.io.IOException diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt index e6d16f5405..f109e238b5 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt @@ -1,22 +1,22 @@ package info.nightscout.plugins.constraints -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.Objectives -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profiling.Profiler -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.Objectives +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profiling.Profiler +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt index 5897dff875..a3e0857d43 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt @@ -2,14 +2,14 @@ package info.nightscout.plugins.constraints.bgQualityCheck import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt index 39ec1a7b5b..529e85027f 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.constraints.dstHelper -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt index 0119693d19..cf8d38b31e 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.constraints.objectives import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.Objectives -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.Objectives +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/SntpClientTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/SntpClientTest.kt index 1658cbe2e7..d0e5532962 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/SntpClientTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/SntpClientTest.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.constraints.objectives -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt index a677352ff4..251a34e610 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt @@ -1,17 +1,17 @@ package info.nightscout.plugins.constraints.safety import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profiling.Profiler -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profiling.Profiler +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt index 4f980ec25a..af3221042b 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.constraints.signatureVerifier -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.Lazy diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt index 78ec8201bc..67c31a4bc2 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.constraints.storage import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt index 3a19426281..6093fad6f4 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt @@ -4,8 +4,8 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.support.DaggerFragment import info.nightscout.insulin.databinding.InsulinFragmentBinding import javax.inject.Inject diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinLyumjevPlugin.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinLyumjevPlugin.kt index 9045b64d11..6abb4b9db4 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinLyumjevPlugin.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinLyumjevPlugin.kt @@ -1,13 +1,13 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefBasePlugin.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefBasePlugin.kt index 61419d6b16..066c677b82 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefBasePlugin.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefBasePlugin.kt @@ -1,19 +1,19 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.iob.Iob -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.iob.Iob +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InsulinConfiguration diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt index 0faf8c891b..094d00d918 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt @@ -2,15 +2,15 @@ package info.nightscout.insulin import app.aaps.core.main.utils.extensions.putInt import app.aaps.core.main.utils.extensions.storeInt -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefRapidActingPlugin.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefRapidActingPlugin.kt index 3c32ad0593..43d48e6666 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefRapidActingPlugin.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefRapidActingPlugin.kt @@ -1,13 +1,13 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPlugin.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPlugin.kt index 3cf96d4341..0caf244cfb 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPlugin.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPlugin.kt @@ -1,13 +1,13 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinLyumjevPluginTest.kt b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinLyumjevPluginTest.kt index 01411bf67f..be8f916b96 100644 --- a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinLyumjevPluginTest.kt +++ b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinLyumjevPluginTest.kt @@ -1,13 +1,13 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefBasePluginTest.kt b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefBasePluginTest.kt index ee1ef0d981..17898c8f4a 100644 --- a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefBasePluginTest.kt +++ b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefBasePluginTest.kt @@ -1,14 +1,14 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt index b90a4c5cee..194e14ab75 100644 --- a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt +++ b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt @@ -1,12 +1,12 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefRapidActingPluginTest.kt b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefRapidActingPluginTest.kt index f317c45a42..863cc89017 100644 --- a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefRapidActingPluginTest.kt +++ b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefRapidActingPluginTest.kt @@ -1,13 +1,13 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPluginTest.kt b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPluginTest.kt index 33efaacf51..134120cce6 100644 --- a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPluginTest.kt +++ b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPluginTest.kt @@ -1,13 +1,13 @@ package info.nightscout.insulin -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.HardLimits import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/OverviewModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/OverviewModule.kt index d0d15ef4a4..d1d9f01e46 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/di/OverviewModule.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/di/OverviewModule.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.di -import app.aaps.interfaces.overview.OverviewMenus +import app.aaps.core.interfaces.overview.OverviewMenus import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt index f5a24196ec..47d28c3743 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.di -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt index 8409b312cf..d5308746e2 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.di -import app.aaps.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.profile.ProfileSource import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt index 22e182ed8f..c5612f4a9a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt @@ -10,30 +10,30 @@ import androidx.core.content.ContextCompat import app.aaps.core.main.extensions.toStringMedium import app.aaps.core.main.extensions.toStringShort import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventCustomActionsChanged -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.rx.events.EventTherapyEventChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventCustomActionsChanged +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.rx.events.EventTherapyEventChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.support.DaggerFragment import info.nightscout.core.ui.UIRunnable import info.nightscout.core.ui.dialogs.OKDialog diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt index 155f56780f..b0329c6b14 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.general.actions -import app.aaps.interfaces.actions.Actions -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.actions.Actions +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import javax.inject.Inject @@ -29,4 +29,4 @@ class ActionsPlugin @Inject constructor( .shortName(R.string.actions_shortname) .description(R.string.description_actions), aapsLogger, rh, injector -), Actions +), app.aaps.core.interfaces.actions.Actions diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt index 0c94371ff8..3aac79dd07 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt @@ -12,16 +12,16 @@ import android.widget.ArrayAdapter import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventFoodDatabaseChanged -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventFoodDatabaseChanged +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.support.DaggerFragment import info.nightscout.core.ui.UIRunnable import info.nightscout.core.ui.dialogs.OKDialog diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt index f51e51be58..528726b125 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.general.food -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt index 6b2e1ba6ae..3b82059259 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt @@ -31,58 +31,58 @@ import app.aaps.core.main.iob.displayText import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.wizard.QuickWizard -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.aps.VariableSensitivityResult -import app.aaps.interfaces.automation.Automation -import app.aaps.interfaces.bgQualityCheck.BgQualityCheck -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.extensions.runOnUiThread -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.extensions.toVisibilityKeepSpace -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.overview.OverviewMenus -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAcceptOpenLoopChange -import app.aaps.interfaces.rx.events.EventBucketedDataCreated -import app.aaps.interfaces.rx.events.EventEffectiveProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventNewOpenLoopNotification -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.rx.events.EventScale -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.rx.events.EventTempTargetChange -import app.aaps.interfaces.rx.events.EventUpdateOverviewCalcProgress -import app.aaps.interfaces.rx.events.EventUpdateOverviewGraph -import app.aaps.interfaces.rx.events.EventUpdateOverviewIobCob -import app.aaps.interfaces.rx.events.EventUpdateOverviewSensitivity -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.DexcomBoyda -import app.aaps.interfaces.source.XDripSource -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.aps.VariableSensitivityResult +import app.aaps.core.interfaces.automation.Automation +import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.extensions.toVisibilityKeepSpace +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.overview.OverviewMenus +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAcceptOpenLoopChange +import app.aaps.core.interfaces.rx.events.EventBucketedDataCreated +import app.aaps.core.interfaces.rx.events.EventEffectiveProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventNewOpenLoopNotification +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.rx.events.EventScale +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.rx.events.EventTempTargetChange +import app.aaps.core.interfaces.rx.events.EventUpdateOverviewCalcProgress +import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph +import app.aaps.core.interfaces.rx.events.EventUpdateOverviewIobCob +import app.aaps.core.interfaces.rx.events.EventUpdateOverviewSensitivity +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.DexcomBoyda +import app.aaps.core.interfaces.source.XDripSource +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.TrendCalculator import com.jjoe64.graphview.GraphView import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt index 33d4bbb721..4a50de2714 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt @@ -11,15 +11,15 @@ import androidx.annotation.AttrRes import androidx.annotation.StringRes import androidx.appcompat.widget.PopupMenu import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.overview.OverviewMenus -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.rx.events.EventScale -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.overview.OverviewMenus +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.rx.events.EventScale +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.gson.Gson import info.nightscout.plugins.R import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt index 8fa836cfd4..e65daa34ee 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt @@ -15,22 +15,22 @@ import app.aaps.core.main.utils.extensions.storeDouble import app.aaps.core.main.utils.extensions.storeInt import app.aaps.core.main.utils.extensions.storeString import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.overview.Overview -import app.aaps.interfaces.overview.OverviewMenus -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventNewHistoryData -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventUpdateOverviewCalcProgress -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.overview.Overview +import app.aaps.core.interfaces.overview.OverviewMenus +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventNewHistoryData +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventUpdateOverviewCalcProgress +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.impl.rx.bus.RxBusImpl import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt index ff175db2f6..6f65b9b9e0 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt @@ -8,12 +8,12 @@ import app.aaps.core.main.graph.data.BolusDataPoint import app.aaps.core.main.graph.data.EffectiveProfileSwitchDataPoint import app.aaps.core.main.graph.data.GlucoseValueDataPoint import app.aaps.core.main.graph.data.TimeAsXAxisLabelFormatter -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.Round import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt index d5cf22a22a..a94d64c6ed 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.general.overview.notifications import android.content.Intent -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.DaggerIntentService import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt index 5721cd3b83..c39d02f162 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt @@ -12,16 +12,16 @@ import android.view.View import android.view.ViewGroup import androidx.core.app.NotificationCompat import androidx.recyclerview.widget.RecyclerView -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.notifications.NotificationHolder -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.IconsProvider -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.R import info.nightscout.plugins.databinding.OverviewNotificationItemBinding import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt index 2bc008a501..2811fb4ba1 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt @@ -1,13 +1,13 @@ package info.nightscout.plugins.general.overview.notifications -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.NSAlarm -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt index 6868a0f631..fbda5fafab 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.general.overview.notifications.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventUpdateOverviewNotification(val from: String) : Event() \ No newline at end of file diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt index 0cdd41e2fd..622cb3a8dc 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt @@ -5,16 +5,16 @@ import android.os.Handler import android.os.HandlerThread import android.widget.TextView import androidx.annotation.StringRes -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.runOnUiThread -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.WarnColors -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.runOnUiThread +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.WarnColors +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository @@ -176,11 +176,11 @@ class StatusLightHandler @Inject constructor( private fun TherapyEvent.age(useShortText: Boolean, rh: ResourceHelper, dateUtil: DateUtil): String { val diff = dateUtil.computeDiff(timestamp, System.currentTimeMillis()) - var days = " " + rh.gs(app.aaps.interfaces.R.string.days) + " " - var hours = " " + rh.gs(app.aaps.interfaces.R.string.hours) + " " + var days = " " + rh.gs(app.aaps.core.interfaces.R.string.days) + " " + var hours = " " + rh.gs(app.aaps.core.interfaces.R.string.hours) + " " if (useShortText) { - days = rh.gs(app.aaps.interfaces.R.string.shortday) - hours = rh.gs(app.aaps.interfaces.R.string.shorthour) + days = rh.gs(app.aaps.core.interfaces.R.string.shortday) + hours = rh.gs(app.aaps.core.interfaces.R.string.shorthour) } return diff[TimeUnit.DAYS].toString() + days + diff[TimeUnit.HOURS] + hours } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt index 85dee19241..74e77b4bcb 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt @@ -6,12 +6,12 @@ import android.content.Intent import android.os.Binder import android.os.IBinder import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.NotificationHolder -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit import dagger.android.DaggerService import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyServiceHelper.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyServiceHelper.kt index 0186751b2c..2f01c3007c 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyServiceHelper.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyServiceHelper.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.ServiceConnection import android.os.IBinder -import app.aaps.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.notifications.NotificationHolder import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt index 436643f0b7..903f99c94d 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt @@ -10,26 +10,26 @@ import app.aaps.core.main.extensions.toStringShort import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.NotificationHolder -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.ui.IconsProvider -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAutosensCalculationFinished +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt index 1b24c1518d..b6ef7ee289 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt @@ -1,15 +1,15 @@ package info.nightscout.plugins.general.smsCommunicator import android.os.SystemClock -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smsCommunicator.Sms -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smsCommunicator.Sms +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt index cf6d22e95f..9ddeaadf8c 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt @@ -5,11 +5,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.smsCommunicator.Sms -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.smsCommunicator.Sms +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.databinding.SmscommunicatorFragmentBinding diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt index dad9497b0e..5c083246c2 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -16,42 +16,42 @@ import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientRestart -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.smsCommunicator.Sms -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.sync.XDripBroadcast -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.SafeParse -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientRestart +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.smsCommunicator.Sms +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.sync.XDripBroadcast +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.validators.ValidatingEditTextPreference diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt index 667e610a80..29373a4741 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt @@ -11,9 +11,9 @@ import android.text.TextWatcher import android.view.View import android.view.WindowManager import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import com.google.common.primitives.Ints.min import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt index 71f36a2de0..1be6487fee 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.general.smsCommunicator.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui internal class EventSmsCommunicatorUpdateGui : EventUpdateGui() diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt index 05fc82f5f6..5841879b13 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt @@ -2,10 +2,10 @@ package info.nightscout.plugins.general.smsCommunicator.otp import android.util.Base64 import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import com.eatthepath.otp.HmacOneTimePasswordGenerator import com.google.common.io.BaseEncoding import info.nightscout.plugins.R diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt index 090cf74c8a..d8d0209176 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt @@ -4,15 +4,15 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventThemeSwitch -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventThemeSwitch +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt index 399245e1f3..8f48b57d88 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt @@ -6,20 +6,20 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventWearUpdateGui -import app.aaps.interfaces.rx.weardata.CwfData -import app.aaps.interfaces.rx.weardata.CwfMetadataKey -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.rx.weardata.ResFileMap -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventWearUpdateGui +import app.aaps.core.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.rx.weardata.ResFileMap +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.plugins.R diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt index fe14ee53ee..e24367d31f 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt @@ -2,25 +2,25 @@ package info.nightscout.plugins.general.wear import android.content.Context import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished -import app.aaps.interfaces.rx.events.EventDismissBolusProgressIfRunning -import app.aaps.interfaces.rx.events.EventLoopUpdateGui -import app.aaps.interfaces.rx.events.EventMobileDataToWear -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventWearUpdateGui -import app.aaps.interfaces.rx.weardata.CwfData -import app.aaps.interfaces.rx.weardata.CwfMetadataKey -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAutosensCalculationFinished +import app.aaps.core.interfaces.rx.events.EventDismissBolusProgressIfRunning +import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui +import app.aaps.core.interfaces.rx.events.EventMobileDataToWear +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventWearUpdateGui +import app.aaps.core.interfaces.rx.weardata.CwfData +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import info.nightscout.plugins.general.wear.wearintegration.DataHandlerMobile diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt index 7e0c2bd153..e9a54a4908 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt @@ -7,22 +7,22 @@ import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventWearUpdateGui -import app.aaps.interfaces.rx.weardata.CUSTOM_VERSION -import app.aaps.interfaces.rx.weardata.CwfMetadataKey -import app.aaps.interfaces.rx.weardata.CwfMetadataMap -import app.aaps.interfaces.rx.weardata.JsonKeyValues -import app.aaps.interfaces.rx.weardata.JsonKeys -import app.aaps.interfaces.rx.weardata.ResFileMap -import app.aaps.interfaces.rx.weardata.ViewKeys -import app.aaps.interfaces.rx.weardata.ZipWatchfaceFormat -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventWearUpdateGui +import app.aaps.core.interfaces.rx.weardata.CUSTOM_VERSION +import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey +import app.aaps.core.interfaces.rx.weardata.CwfMetadataMap +import app.aaps.core.interfaces.rx.weardata.JsonKeyValues +import app.aaps.core.interfaces.rx.weardata.JsonKeys +import app.aaps.core.interfaces.rx.weardata.ResFileMap +import app.aaps.core.interfaces.rx.weardata.ViewKeys +import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.plugins.R import info.nightscout.plugins.databinding.CwfInfosActivityBinding diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 6dbf81866f..9de405922e 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -13,43 +13,43 @@ import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.wizard.BolusWizard import app.aaps.core.main.wizard.QuickWizard import app.aaps.core.main.wizard.QuickWizardEntry -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventWearUpdateGui -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventWearUpdateGui +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.TrendCalculator import dagger.android.HasAndroidInjector import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.database.ValueWrapper @@ -750,8 +750,8 @@ class DataHandlerMobile @Inject constructor( bolusPercentage = sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100), maxCarbs = sp.getInt(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs, 48), maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0), - insulinButtonIncrement1 = sp.getDouble(app.aaps.interfaces.R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT), - insulinButtonIncrement2 = sp.getDouble(app.aaps.interfaces.R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT), + insulinButtonIncrement1 = sp.getDouble(app.aaps.core.interfaces.R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT), + insulinButtonIncrement2 = sp.getDouble(app.aaps.core.interfaces.R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT), carbsButtonIncrement1 = sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_1, Constants.CARBS_FAV1_DEFAULT), carbsButtonIncrement2 = sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_2, Constants.CARBS_FAV2_DEFAULT) ) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index f122e9be83..6ca4222827 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -4,21 +4,21 @@ import android.os.Binder import android.os.Handler import android.os.HandlerThread import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventMobileDataToWear -import app.aaps.interfaces.rx.events.EventMobileToWear -import app.aaps.interfaces.rx.events.EventWearUpdateGui -import app.aaps.interfaces.rx.weardata.EventData -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventMobileDataToWear +import app.aaps.core.interfaces.rx.events.EventMobileToWear +import app.aaps.core.interfaces.rx.events.EventWearUpdateGui +import app.aaps.core.interfaces.rx.weardata.EventData +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.android.gms.tasks.Tasks import com.google.android.gms.wearable.CapabilityClient import com.google.android.gms.wearable.CapabilityInfo @@ -77,8 +77,8 @@ class DataLayerListenerServiceMobile : WearableListenerService() { private val disposable = CompositeDisposable() - private val rxPath get() = getString(app.aaps.interfaces.R.string.path_rx_bridge) - private val rxDataPath get() = getString(app.aaps.interfaces.R.string.path_rx_data_bridge) + private val rxPath get() = getString(app.aaps.core.interfaces.R.string.path_rx_bridge) + private val rxDataPath get() = getString(app.aaps.core.interfaces.R.string.path_rx_data_bridge) @ExperimentalSerializationApi override fun onCreate() { diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt index 0407c98945..f74ae6d573 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.ServiceConnection import android.os.IBinder -import app.aaps.interfaces.notifications.NotificationHolder +import app.aaps.core.interfaces.notifications.NotificationHolder import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt index 66d54cde98..0c4d0e0c09 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt @@ -13,37 +13,37 @@ import app.aaps.core.main.iob.plus import app.aaps.core.main.iob.round import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.BasalData -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.iob.CobInfo -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.iob.MealData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event -import app.aaps.interfaces.rx.events.EventConfigBuilderChange -import app.aaps.interfaces.rx.events.EventEffectiveProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventNewBG -import app.aaps.interfaces.rx.events.EventNewHistoryData -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.MidnightTime -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.BasalData +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.iob.CobInfo +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.iob.MealData +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.EventConfigBuilderChange +import app.aaps.core.interfaces.rx.events.EventEffectiveProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventNewBG +import app.aaps.core.interfaces.rx.events.EventNewHistoryData +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt index 4310cb3c13..e3ebf1b1f5 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt @@ -1,14 +1,14 @@ package info.nightscout.plugins.iob.iobCobCalculator.data -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import java.util.Locale import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt index cefd36860e..09785f53c1 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt @@ -3,13 +3,13 @@ package info.nightscout.plugins.iob.iobCobCalculator.data import androidx.collection.LongSparseArray import androidx.collection.size import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.GlucoseValue import kotlin.math.abs import kotlin.math.roundToLong diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt index 034722f6db..a4d34abdbe 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt @@ -10,24 +10,24 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventLocalProfileChanged -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.HardLimits -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventLocalProfileChanged +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.SafeParse import com.google.android.material.tabs.TabLayout import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt index 26ec96f47d..22e8ca8d74 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt @@ -5,31 +5,31 @@ import app.aaps.annotations.OpenForTesting import app.aaps.core.main.extensions.blockFromJsonArray import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventLocalProfileChanged -import app.aaps.interfaces.rx.events.EventProfileStoreChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventLocalProfileChanged +import app.aaps.core.interfaces.rx.events.EventProfileStoreChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt index 3f6bea322c..a4bff832b4 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt @@ -12,9 +12,9 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.core.widget.TextViewCompat -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.SafeParse.stringToDouble +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.SafeParse.stringToDouble import info.nightscout.core.ui.elements.NumberPicker import info.nightscout.core.ui.elements.SpinnerHelper import org.json.JSONArray diff --git a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt index 5d3c3c764d..3464cf41b4 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.skins -import app.aaps.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Config import info.nightscout.plugins.R import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt index 7548eec22d..044b18ea4c 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.skins -import app.aaps.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Config import info.nightscout.plugins.R import info.nightscout.plugins.databinding.OverviewFragmentBinding import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt index 3655f81ed6..8116e203f3 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.skins -import app.aaps.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Config import info.nightscout.plugins.R import info.nightscout.plugins.databinding.OverviewFragmentBinding import javax.inject.Inject diff --git a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt index 166dd590cf..2b691a3a40 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.skins import android.view.View.GONE import android.view.ViewGroup -import app.aaps.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Config import info.nightscout.plugins.R import info.nightscout.plugins.databinding.ActionsFragmentBinding import info.nightscout.plugins.databinding.OverviewFragmentBinding diff --git a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt index 990e39834e..f85ff8788b 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.skins -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.plugins.R import info.nightscout.plugins.di.SkinsModule import java.util.Collections diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt index 5d04c5a09a..15a0b8e9be 100644 --- a/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt +++ b/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt @@ -1,10 +1,10 @@ package info.nightscout.core.extensions import app.aaps.core.main.extensions.iobCalc -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.Bolus diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt index 81a4a1e5f8..e540b3ddfe 100644 --- a/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt +++ b/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt @@ -3,12 +3,12 @@ package info.nightscout.core.extensions import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.extensions.isInProgress import app.aaps.core.main.extensions.toTemporaryBasal -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.ExtendedBolus diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt index 95edef938f..5893da9e54 100644 --- a/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt +++ b/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt @@ -3,8 +3,8 @@ package info.nightscout.core.extensions import app.aaps.core.main.R import app.aaps.core.main.extensions.directionToIcon import app.aaps.core.main.extensions.valueToUnits -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt index f92e5c0af4..774d7713f6 100644 --- a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt +++ b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt @@ -1,12 +1,12 @@ package info.nightscout.core.extensions import app.aaps.core.main.extensions.iobCalc -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.TemporaryBasal diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt index 0db2e971df..1fd5a5b7dc 100644 --- a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt +++ b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt @@ -3,7 +3,7 @@ package info.nightscout.core.extensions import app.aaps.core.main.extensions.highValueToUnitsToString import app.aaps.core.main.extensions.lowValueToUnitsToString import app.aaps.core.main.extensions.target -import app.aaps.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.TemporaryTarget diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt index 293328a51e..ee8e905e0c 100644 --- a/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt +++ b/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt @@ -1,7 +1,7 @@ package info.nightscout.core.extensions import app.aaps.core.main.extensions.isOlderThan -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.TherapyEvent diff --git a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt index 43cfe74432..5e67e32ef1 100644 --- a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt +++ b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.general.smsCommunicator -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smsCommunicator.Sms -import app.aaps.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smsCommunicator.Sms +import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt index 81435b06b3..ed60dfa6c7 100644 --- a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt +++ b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt @@ -2,24 +2,24 @@ package info.nightscout.plugins.general.smsCommunicator import android.telephony.SmsManager import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.aps.ApsMode -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.iob.CobInfo -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.smsCommunicator.Sms -import app.aaps.interfaces.sync.XDripBroadcast -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.ApsMode +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.iob.CobInfo +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.smsCommunicator.Sms +import app.aaps.core.interfaces.sync.XDripBroadcast +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt index 08ce5be1f8..60ca135e04 100644 --- a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt +++ b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.general.smsCommunicator import android.telephony.SmsMessage -import app.aaps.interfaces.smsCommunicator.Sms +import app.aaps.core.interfaces.smsCommunicator.Sms import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.Test diff --git a/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt index 29000ae6b1..fdc205bad1 100644 --- a/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt +++ b/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt @@ -2,12 +2,12 @@ package info.nightscout.plugins.iob import android.content.Context import androidx.collection.LongSparseArray -import app.aaps.interfaces.aps.AutosensData -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.AutosensData +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/AbstractSensitivityPlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/AbstractSensitivityPlugin.kt index 5dcd2b2221..ab191d1cac 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/AbstractSensitivityPlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/AbstractSensitivityPlugin.kt @@ -1,16 +1,16 @@ package info.nightscout.sensitivity -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.Sensitivity -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.Sensitivity +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import kotlin.math.max import kotlin.math.min diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt index fcf2d2a01d..02272aabcc 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt @@ -1,18 +1,18 @@ package info.nightscout.sensitivity import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.Sensitivity.SensitivityType -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.Sensitivity.SensitivityType +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.core.utils.MidnightUtils import info.nightscout.core.utils.Percentile diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt index 86917c83cf..73eae74a48 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt @@ -1,21 +1,21 @@ package info.nightscout.sensitivity import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.SMBDefaults -import app.aaps.interfaces.aps.Sensitivity.SensitivityType -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.SMBDefaults +import app.aaps.core.interfaces.aps.Sensitivity.SensitivityType +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.core.utils.MidnightUtils import info.nightscout.core.utils.Percentile diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt index c4f99a0747..ce403ff5e5 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt @@ -2,18 +2,18 @@ package info.nightscout.sensitivity import androidx.collection.LongSparseArray import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.Sensitivity.SensitivityType -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.Sensitivity.SensitivityType +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.entities.TherapyEvent diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/ProfileSwitchExtensions.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/ProfileSwitchExtensions.kt index 31fce3e182..1627b61317 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/ProfileSwitchExtensions.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/ProfileSwitchExtensions.kt @@ -1,6 +1,6 @@ package info.nightscout.sensitivity.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.ProfileSwitch fun List.isPSEvent5minBack(time: Long): Boolean { diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/TherapyEventExtensions.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/TherapyEventExtensions.kt index a6ccd5488a..d12d3e75c0 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/TherapyEventExtensions.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/TherapyEventExtensions.kt @@ -1,6 +1,6 @@ package info.nightscout.sensitivity.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TherapyEvent fun List.isTherapyEventEvent5minBack(time: Long): Boolean { diff --git a/plugins/sensitivity/src/test/java/info/nightscout/sensitivity/AbstractSensitivityPluginTest.kt b/plugins/sensitivity/src/test/java/info/nightscout/sensitivity/AbstractSensitivityPluginTest.kt index 61acf51b51..9ed5f2e319 100644 --- a/plugins/sensitivity/src/test/java/info/nightscout/sensitivity/AbstractSensitivityPluginTest.kt +++ b/plugins/sensitivity/src/test/java/info/nightscout/sensitivity/AbstractSensitivityPluginTest.kt @@ -1,12 +1,12 @@ package info.nightscout.sensitivity -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.AutosensResult -import app.aaps.interfaces.aps.Sensitivity -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.AutosensResult +import app.aaps.core.interfaces.aps.Sensitivity +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt index ee83e3ab6d..0d59739652 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt @@ -1,15 +1,15 @@ package info.nightscout.smoothing import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smoothing.Smoothing -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import javax.inject.Inject diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt index 1b3eb50536..7d02fef9d2 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt @@ -1,13 +1,13 @@ package info.nightscout.smoothing import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smoothing.Smoothing import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import javax.inject.Inject diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt index 6eeb548afa..7e69a603f6 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt @@ -1,13 +1,13 @@ package info.nightscout.smoothing import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.smoothing.Smoothing +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.smoothing.Smoothing import dagger.android.HasAndroidInjector import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt index e9b43bcddf..13835d0dc2 100644 --- a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt @@ -4,16 +4,16 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.receivers.Intents -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.receivers.Intents +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource import dagger.android.HasAndroidInjector import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt b/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt index baa7701871..70d7f565cd 100644 --- a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt +++ b/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt @@ -16,21 +16,21 @@ import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.extensions.directionToIcon import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.extensions.toVisibilityKeepSpace -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNewBG -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.extensions.toVisibilityKeepSpace +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNewBG +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt index 3c4daff687..bc2d477a7d 100644 --- a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt @@ -8,20 +8,20 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.extensions.fromConstant import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.source.DexcomBoyda -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.source.DexcomBoyda +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.impl.extensions.safeGetInstalledPackages import dagger.android.HasAndroidInjector import info.nightscout.core.utils.receivers.DataWorkerStorage diff --git a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt index 6d53c6b30d..a529fc5e7f 100644 --- a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt @@ -4,14 +4,14 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt index 0dfccdd979..90199aa6fb 100644 --- a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt @@ -5,13 +5,13 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.annotations.OpenForTesting import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository diff --git a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt index 3d57b9f3d5..cd225ee60b 100644 --- a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt @@ -5,18 +5,18 @@ import android.net.Uri import android.os.Handler import android.os.HandlerThread import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.TherapyEvent diff --git a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt index 93342787c5..5403205da2 100644 --- a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt @@ -7,18 +7,18 @@ import android.os.Handler import android.os.HandlerThread import android.util.Log import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import app.aaps.shared.impl.extensions.safeGetInstalledPackages import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt index 1208849e70..75acc88bc4 100644 --- a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt @@ -4,14 +4,14 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository diff --git a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt index 93449ffe3d..3e97e5177e 100644 --- a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt @@ -1,13 +1,13 @@ package info.nightscout.source -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.source.NSClientSource +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.source.NSClientSource import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import javax.inject.Inject diff --git a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt index 8a28a33b41..0f71eeb49d 100644 --- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt @@ -4,15 +4,15 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource import dagger.android.HasAndroidInjector import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt index 685392a4dd..088f225891 100644 --- a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt @@ -3,16 +3,16 @@ package info.nightscout.source import android.os.Handler import android.os.HandlerThread import android.os.SystemClock -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.utils.isRunningTest import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt index 0dd38fb555..b95b09640d 100644 --- a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt @@ -4,14 +4,14 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.BgSource +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.BgSource import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository diff --git a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt index b7e4eeea0a..b38481593e 100644 --- a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt @@ -4,15 +4,15 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.receivers.Intents -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.source.BgSource -import app.aaps.interfaces.source.XDripSource +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.receivers.Intents +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.interfaces.source.XDripSource import dagger.android.HasAndroidInjector import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt b/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt index f6c166b1dc..cd9656711a 100644 --- a/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt +++ b/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt @@ -1,8 +1,8 @@ package info.nightscout.source.di -import app.aaps.interfaces.source.DexcomBoyda -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.source.XDripSource +import app.aaps.core.interfaces.source.DexcomBoyda +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.source.XDripSource import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt b/plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt index a8bb6134a4..0afa695030 100644 --- a/plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt +++ b/plugins/source/src/test/java/info/nightscout/source/GlimpPluginTest.kt @@ -1,6 +1,6 @@ package info.nightscout.source -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt b/plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt index d9c5bd67d3..0d3ceb13c7 100644 --- a/plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt +++ b/plugins/source/src/test/java/info/nightscout/source/MM640GPluginTest.kt @@ -1,6 +1,6 @@ package info.nightscout.source -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt b/plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt index 5254cd41dc..017b2b507e 100644 --- a/plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt +++ b/plugins/source/src/test/java/info/nightscout/source/NSClientPluginTest.kt @@ -1,7 +1,7 @@ package info.nightscout.source -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt b/plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt index bac1ada22a..c8607b6ae5 100644 --- a/plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt +++ b/plugins/source/src/test/java/info/nightscout/source/XdripSourcePluginTest.kt @@ -1,6 +1,6 @@ package info.nightscout.source -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt index 0ac1fdb0f7..53e512884f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt @@ -8,30 +8,30 @@ import app.aaps.core.main.extensions.durationInMinutes import app.aaps.core.main.extensions.toStringFull import app.aaps.core.main.iob.round import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.receivers.Intents -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event -import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished -import app.aaps.interfaces.rx.events.EventLoopUpdateGui -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.receivers.Intents +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.EventAutosensCalculationFinished +import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers import dagger.android.HasAndroidInjector import info.nightscout.plugins.sync.R diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/SyncModule.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/SyncModule.kt index 7a3700a5ff..d326e9b2ab 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/SyncModule.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/SyncModule.kt @@ -2,11 +2,11 @@ package info.nightscout.plugins.sync.di import android.content.Context import androidx.work.WorkManager -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.sync.DataSyncSelectorXdrip -import app.aaps.interfaces.sync.XDripBroadcast +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip +import app.aaps.core.interfaces.sync.XDripBroadcast import dagger.Binds import dagger.Module import dagger.Provides diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt index bd05f854e4..8ee5ddbe3f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsShared -import app.aaps.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.nsclient.NSAlarm import info.nightscout.core.utils.JsonHelper import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt index f95d8eea46..9cc587aeaa 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt @@ -17,20 +17,20 @@ import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginFragment -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.rx.events.EventNSClientRestart -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginFragment +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.rx.events.EventNSClientRestart +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt index d1a138071b..6c33136fb5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsShared -import app.aaps.interfaces.nsclient.NSSgv +import app.aaps.core.interfaces.nsclient.NSSgv import info.nightscout.core.utils.JsonHelper import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt index 4afdaf31dc..98c8d4c13b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt @@ -1,22 +1,22 @@ package info.nightscout.plugins.sync.nsShared import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileSource -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileSource +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Food import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt index ba2487970d..214f616d68 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt @@ -1,20 +1,20 @@ package info.nightscout.plugins.sync.nsShared import android.os.SystemClock -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.Carbs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt index 4ea9eb520d..cefd342b4d 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.nsShared.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventConnectivityOptionChanged(val blockingReason: String) : Event() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt index acfa18d776..6b6617b8e3 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsShared.events import android.content.Context -import app.aaps.interfaces.rx.events.EventStatus +import app.aaps.core.interfaces.rx.events.EventStatus class EventNSClientStatus(var text: String) : EventStatus() { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt index 2930811ae3..61fcf4a8be 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.nsShared.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventNSClientUpdateGuiData : EventUpdateGui() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt index 9ff60f912b..bf4b549597 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.nsShared.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventNSClientUpdateGuiQueue : EventUpdateGui() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt index cf5a38721a..216b558127 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.nsShared.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventNSClientUpdateGuiStatus : EventUpdateGui() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt index a9f4a56dae..e9d4b9f1fe 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt @@ -1,15 +1,15 @@ package info.nightscout.plugins.sync.nsclient -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.waitMillis import info.nightscout.database.impl.AppRepository diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt index d0eb3a09c2..2ba7aefc02 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt @@ -10,30 +10,30 @@ import androidx.preference.PreferenceScreen import androidx.preference.SwitchPreference import app.aaps.core.main.extensions.toJson import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.NSAlarm -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventSWSyncStatus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.sync.Sync -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventSWSyncStatus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.sync.Sync +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.NSClientFragment diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt index 51a84d3075..072b6a493e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt @@ -2,14 +2,14 @@ package info.nightscout.plugins.sync.nsclient import app.aaps.annotations.OpenForTesting import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventChargingState -import app.aaps.interfaces.rx.events.EventNetworkChange -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventChargingState +import app.aaps.core.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt index 65f861d66c..fa965089d7 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.sync.nsclient.acks import androidx.work.OneTimeWorkRequest -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event -import app.aaps.interfaces.rx.events.EventNSClientRestart -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.EventNSClientRestart +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.services.NSClientService import info.nightscout.plugins.sync.nsclient.workers.NSClientAddAckWorker diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt index b7405093a2..8898b9da6e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.acks -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event import io.socket.client.Ack import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt index da57390bc2..c5d387a0dd 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.sync.nsclient.acks import androidx.work.OneTimeWorkRequest -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.services.NSClientService import info.nightscout.plugins.sync.nsclient.workers.NSClientUpdateRemoveAckWorker diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt index c8327bf075..feb3eef282 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.sync.nsclient.data import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.JsonHelper import info.nightscout.sdk.interfaces.RunningConfiguration diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt index d0e6235703..f5cbfa3662 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt @@ -4,18 +4,18 @@ package info.nightscout.plugins.sync.nsclient.data import android.content.Context import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt index 0343e7ebcf..1aff7b2eb3 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt @@ -1,15 +1,15 @@ package info.nightscout.plugins.sync.nsclient.data import android.text.Spanned -import app.aaps.interfaces.aps.APSResult -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.aps.APSResult +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.JsonHelper diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt index 0b2087ccad..f0914ab644 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.Gson import com.google.gson.JsonSyntaxException import info.nightscout.core.utils.JsonHelper diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt index e126093426..20964d5651 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt index 59ef690079..1d6e565481 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.TherapyEvent diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt index bd4bb93d71..9e2d6c03ea 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.database.entities.DeviceStatus import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt index 6d4b3014c0..85090c476c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt @@ -2,8 +2,8 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt index 52074f864a..c6536b6c9e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.main.extensions.toTemporaryBasal -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt index b8ee50eb80..85ef1ecb0c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt index 4e43a032f0..722737702a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt @@ -4,10 +4,10 @@ import app.aaps.core.main.extensions.fromConstant import app.aaps.core.main.extensions.getCustomizedName import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.TherapyEvent diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt index 6a79042ccd..2a0b86982e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.TemporaryBasal.Type.Companion.fromString diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt index 132affe6b3..d45eba196f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TemporaryTarget import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt index 4f274aa6d2..47eb6dab33 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.plugins.sync.nsclient.data.NSMbg diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt index 63e666daae..9d015efdbd 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt @@ -12,20 +12,20 @@ import android.os.SystemClock import androidx.work.OneTimeWorkRequest import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.NSSettingsStatus -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.* -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T.Companion.mins +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.NSSettingsStatus +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.* +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T.Companion.mins import com.google.common.base.Charsets import com.google.common.hash.Hashing import com.google.gson.GsonBuilder diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt index 41fa01bf14..e6ff42aa06 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt @@ -5,25 +5,25 @@ import android.os.SystemClock import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.sync.DataSyncSelector.PairBolus -import app.aaps.interfaces.sync.DataSyncSelector.PairBolusCalculatorResult -import app.aaps.interfaces.sync.DataSyncSelector.PairCarbs -import app.aaps.interfaces.sync.DataSyncSelector.PairEffectiveProfileSwitch -import app.aaps.interfaces.sync.DataSyncSelector.PairExtendedBolus -import app.aaps.interfaces.sync.DataSyncSelector.PairFood -import app.aaps.interfaces.sync.DataSyncSelector.PairGlucoseValue -import app.aaps.interfaces.sync.DataSyncSelector.PairOfflineEvent -import app.aaps.interfaces.sync.DataSyncSelector.PairProfileStore -import app.aaps.interfaces.sync.DataSyncSelector.PairProfileSwitch -import app.aaps.interfaces.sync.DataSyncSelector.PairTemporaryBasal -import app.aaps.interfaces.sync.DataSyncSelector.PairTemporaryTarget -import app.aaps.interfaces.sync.DataSyncSelector.PairTherapyEvent +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.sync.DataSyncSelector.PairBolus +import app.aaps.core.interfaces.sync.DataSyncSelector.PairBolusCalculatorResult +import app.aaps.core.interfaces.sync.DataSyncSelector.PairCarbs +import app.aaps.core.interfaces.sync.DataSyncSelector.PairEffectiveProfileSwitch +import app.aaps.core.interfaces.sync.DataSyncSelector.PairExtendedBolus +import app.aaps.core.interfaces.sync.DataSyncSelector.PairFood +import app.aaps.core.interfaces.sync.DataSyncSelector.PairGlucoseValue +import app.aaps.core.interfaces.sync.DataSyncSelector.PairOfflineEvent +import app.aaps.core.interfaces.sync.DataSyncSelector.PairProfileStore +import app.aaps.core.interfaces.sync.DataSyncSelector.PairProfileSwitch +import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryBasal +import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryTarget +import app.aaps.core.interfaces.sync.DataSyncSelector.PairTherapyEvent import info.nightscout.core.utils.notifyAll import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt index 321b59410c..417e68dc23 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt @@ -4,15 +4,15 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.Bolus diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt index f4580c34c2..9ad8d6cc35 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt @@ -4,9 +4,9 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.data.NSMbg import info.nightscout.plugins.sync.nsclient.extensions.therapyEventFromNsMbg diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt index 4bcdad456d..eacdfa803a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt @@ -4,21 +4,21 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sync.DataSyncSelector.PairBolus -import app.aaps.interfaces.sync.DataSyncSelector.PairBolusCalculatorResult -import app.aaps.interfaces.sync.DataSyncSelector.PairCarbs -import app.aaps.interfaces.sync.DataSyncSelector.PairEffectiveProfileSwitch -import app.aaps.interfaces.sync.DataSyncSelector.PairExtendedBolus -import app.aaps.interfaces.sync.DataSyncSelector.PairFood -import app.aaps.interfaces.sync.DataSyncSelector.PairGlucoseValue -import app.aaps.interfaces.sync.DataSyncSelector.PairOfflineEvent -import app.aaps.interfaces.sync.DataSyncSelector.PairProfileSwitch -import app.aaps.interfaces.sync.DataSyncSelector.PairTemporaryBasal -import app.aaps.interfaces.sync.DataSyncSelector.PairTemporaryTarget -import app.aaps.interfaces.sync.DataSyncSelector.PairTherapyEvent +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sync.DataSyncSelector.PairBolus +import app.aaps.core.interfaces.sync.DataSyncSelector.PairBolusCalculatorResult +import app.aaps.core.interfaces.sync.DataSyncSelector.PairCarbs +import app.aaps.core.interfaces.sync.DataSyncSelector.PairEffectiveProfileSwitch +import app.aaps.core.interfaces.sync.DataSyncSelector.PairExtendedBolus +import app.aaps.core.interfaces.sync.DataSyncSelector.PairFood +import app.aaps.core.interfaces.sync.DataSyncSelector.PairGlucoseValue +import app.aaps.core.interfaces.sync.DataSyncSelector.PairOfflineEvent +import app.aaps.core.interfaces.sync.DataSyncSelector.PairProfileSwitch +import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryBasal +import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryTarget +import app.aaps.core.interfaces.sync.DataSyncSelector.PairTherapyEvent import info.nightscout.core.utils.notifyAll import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt index b527cd7a1b..f29a7a7e3f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt @@ -1,17 +1,17 @@ package info.nightscout.plugins.sync.nsclientV3 import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.R diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt index 94503c0e25..70921b2c11 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -13,41 +13,41 @@ import androidx.work.WorkInfo import androidx.work.WorkManager import app.aaps.annotations.OpenForTesting import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.NSAlarm -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventDeviceStatusChange -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.rx.events.EventNewHistoryData -import app.aaps.interfaces.rx.events.EventOfflineChange -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventProfileStoreChanged -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventSWSyncStatus -import app.aaps.interfaces.rx.events.EventTempTargetChange -import app.aaps.interfaces.rx.events.EventTherapyEventChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.sync.Sync -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.NSAlarm +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventDeviceStatusChange +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.rx.events.EventNewHistoryData +import app.aaps.core.interfaces.rx.events.EventOfflineChange +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventProfileStoreChanged +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventSWSyncStatus +import app.aaps.core.interfaces.rx.events.EventTempTargetChange +import app.aaps.core.interfaces.rx.events.EventTherapyEventChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.sync.Sync +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import com.google.gson.Gson import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector @@ -158,12 +158,12 @@ class NSClientV3Plugin @Inject constructor( when { sp.getBoolean(R.string.key_ns_paused, false) -> rh.gs(info.nightscout.core.ui.R.string.paused) isAllowed.not() -> blockingReason - sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected -> "WS: " + rh.gs(app.aaps.interfaces.R.string.connected) + sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected -> "WS: " + rh.gs(app.aaps.core.interfaces.R.string.connected) sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && !wsConnected -> "WS: " + rh.gs(R.string.not_connected) lastOperationError != null -> rh.gs(info.nightscout.core.ui.R.string.error) nsAndroidClient?.lastStatus == null -> rh.gs(R.string.not_connected) workIsRunning() -> rh.gs(R.string.working) - nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(app.aaps.interfaces.R.string.connected) + nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(app.aaps.core.interfaces.R.string.connected) nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true -> rh.gs(R.string.read_only) else -> rh.gs(info.nightscout.core.ui.R.string.unknown) } diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt index 8789da2b9e..3f6ef7cc30 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import com.google.gson.Gson import com.google.gson.JsonSyntaxException import info.nightscout.database.entities.BolusCalculatorResult diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt index cbd1868e24..e8cd662eb1 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.treatment.EventType diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt index 62759db6ea..8c26692e7f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.treatment.EventType diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt index ce3c68e9a5..7dcfe21e7f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt @@ -2,8 +2,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.plugins.sync.nsclient.extensions.fromConstant diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt index 519616c918..206ce4afe1 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.main.extensions.toTemporaryBasal -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.treatment.EventType diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt index cef8140726..e6fa298ec4 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.transactions.TransactionGlucoseValue import info.nightscout.sdk.localmodel.entry.Direction diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt index c1573666c2..d3aa0bfccf 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.treatment.EventType diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt index 120479d552..9516f490d7 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt @@ -4,10 +4,10 @@ import app.aaps.core.main.extensions.fromConstant import app.aaps.core.main.extensions.getCustomizedName import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.treatment.EventType diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt index a9db5b6bd4..76952badea 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.treatment.EventType diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt index 811c1722e3..a0052c3cc3 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.entry.NsUnits diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt index 64adb1073f..2234825340 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.sdk.localmodel.entry.NsUnits diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt index 9ed3976901..348b901a15 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt @@ -4,9 +4,9 @@ import android.content.Context import androidx.work.WorkerParameters import app.aaps.annotations.OpenForTesting import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import kotlinx.coroutines.Dispatchers diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt index faffea4a41..75f0410047 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt @@ -4,14 +4,14 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.sdk.interfaces.NSAndroidClient diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt index 323ef04492..b83fa3d0e3 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt @@ -4,10 +4,10 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt index c628e9aa6b..2b11af9af9 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt @@ -4,11 +4,11 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.sdk.localmodel.food.NSFood diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt index 8b539d6dd7..f580769a93 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt @@ -4,9 +4,9 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt index c2cb84747b..026a4938c2 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt @@ -4,11 +4,11 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt index 87834005b1..be2c4153f1 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt @@ -4,9 +4,9 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import kotlinx.coroutines.Dispatchers diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt index 75783d782b..26c6025c31 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt @@ -4,12 +4,12 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.sync.NsClient -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.sync.NsClient +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.sdk.interfaces.NSAndroidClient diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt index 184220a58c..769aed7565 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt @@ -18,15 +18,15 @@ import androidx.work.NetworkType import androidx.work.OneTimeWorkRequestBuilder import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.sync.Sync +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sync.Sync import dagger.android.HasAndroidInjector import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.interfaces.TraceableDBEntry diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt index 45d5151642..916bf6ead5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.openhumans import android.content.Context import androidx.work.CoroutineWorker import androidx.work.WorkerParameters -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt index 33593f74ef..1831a3e9fa 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.openhumans.delegates -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import java.util.UUID import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt index ac8cfd5cd1..441d94987b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.openhumans.delegates -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import javax.inject.Inject import javax.inject.Singleton import kotlin.reflect.KProperty diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt index 7a29a6410b..2250ad0692 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.openhumans.delegates import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.plugins.sync.openhumans.OpenHumansState import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt index 52ac89ff4b..fa9034a704 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt @@ -12,10 +12,10 @@ import androidx.core.view.MenuCompat import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.support.DaggerFragment import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.databinding.TidepoolFragmentBinding diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt index 09f8e2f324..6c4150d9c0 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt @@ -5,24 +5,24 @@ import android.text.Spanned import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventNSClientNewLog -import app.aaps.interfaces.rx.events.EventNewBG -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventSWSyncStatus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.sync.Sync -import app.aaps.interfaces.sync.Tidepool -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventNSClientNewLog +import app.aaps.core.interfaces.rx.events.EventNewBG +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventSWSyncStatus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sync.Sync +import app.aaps.core.interfaces.sync.Tidepool +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.sync.R diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt index 21212e56a1..0e60756050 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.tidepool.comm -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import okhttp3.Interceptor import okhttp3.Response diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt index 1a1ad93b68..9e81f73bd6 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.tidepool.comm -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus import info.nightscout.plugins.sync.tidepool.events.EventTidepoolStatus import retrofit2.Call import retrofit2.Callback diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt index 1ab50e5d67..d2bf302040 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt @@ -3,14 +3,14 @@ package info.nightscout.plugins.sync.tidepool.comm import android.content.Context import android.os.PowerManager import android.os.SystemClock -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.ReceiverDelegate diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt index abc41d40c3..61c73eb04a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt @@ -1,14 +1,14 @@ package info.nightscout.plugins.sync.tidepool.comm -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.impl.AppRepository diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt index b8b2e4298f..c9c4392492 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.tidepool.elements import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose import info.nightscout.database.entities.TemporaryBasal import java.util.UUID diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt index 0a160e74a4..1c98f59b56 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.tidepool.elements -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose open class BaseElement(timestamp: Long, uuid: String, dateUtil: DateUtil) { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt index c9284a976d..f29d29f106 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.tidepool.elements -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose import info.nightscout.database.entities.TherapyEvent import info.nightscout.plugins.sync.nsclient.extensions.toMainUnit diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt index 42fb965339..84ddfc07a6 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.tidepool.elements -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose import info.nightscout.database.entities.Bolus import java.util.UUID diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt index 5af12fc676..51ede83d72 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.sync.tidepool.elements import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.plugins.sync.tidepool.comm.TidepoolUploader diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt index 576e313205..db7c6a1de5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.tidepool.elements -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose import info.nightscout.database.entities.GlucoseValue import java.util.LinkedList diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt index cb262f8671..bbe533f54d 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.tidepool.elements -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import com.google.gson.annotations.Expose import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt index 18055246e6..787a7086f5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.tidepool.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventTidepoolDoUpload : Event() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt index 1f6294b8b8..49dd9a9332 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.tidepool.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventTidepoolResetData : Event() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt index a4e4ffc427..4a91deb00a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.tidepool.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import java.text.SimpleDateFormat import java.util.Locale diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt index 8820790bbe..9fbaf02f5e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.tidepool.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventTidepoolUpdateGUI : Event() diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt index 300765f53d..4d9d3f8582 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.tidepool.messages -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.plugins.sync.R import okhttp3.Credentials diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt index bd477bc94f..50255719fd 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.tidepool.messages -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import com.google.gson.annotations.Expose import info.nightscout.plugins.sync.tidepool.comm.TidepoolUploader import java.util.TimeZone diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt index 7c5e7105e4..12e6a27109 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.tidepool.utils -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt index 65e73e7ff8..9f46a56ced 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt @@ -1,15 +1,15 @@ package info.nightscout.plugins.sync.xdrip -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.sync.DataSyncSelectorXdrip -import app.aaps.interfaces.sync.XDripBroadcast -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip +import app.aaps.core.interfaces.sync.XDripBroadcast +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.Lazy import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt index 87c35782fd..00a296a8a5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt @@ -13,14 +13,14 @@ import androidx.core.view.MenuCompat import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginFragment -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginFragment +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.plugins.sync.R diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt index 5f207d3f05..7906d3bafb 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt @@ -14,35 +14,35 @@ import app.aaps.core.main.extensions.toStringShort import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.PluginBase -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.receivers.Intents -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventAppInitialized -import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished -import app.aaps.interfaces.rx.events.EventNewBG -import app.aaps.interfaces.rx.events.EventNewHistoryData -import app.aaps.interfaces.rx.events.EventXdripNewLog -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.sync.Sync -import app.aaps.interfaces.sync.XDripBroadcast -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.PluginBase +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.receivers.Intents +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventAppInitialized +import app.aaps.core.interfaces.rx.events.EventAutosensCalculationFinished +import app.aaps.core.interfaces.rx.events.EventNewBG +import app.aaps.core.interfaces.rx.events.EventNewHistoryData +import app.aaps.core.interfaces.rx.events.EventXdripNewLog +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.sync.Sync +import app.aaps.core.interfaces.sync.XDripBroadcast +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers import dagger.android.HasAndroidInjector import info.nightscout.core.ui.toast.ToastUtils diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt index a8ce1b3cf2..e7303788ea 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt @@ -1,5 +1,5 @@ package info.nightscout.plugins.sync.xdrip.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventXdripUpdateGUI : EventUpdateGui() \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt index 025dc46e71..0dbbfcf991 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt @@ -4,9 +4,9 @@ import android.content.Context import androidx.work.WorkerParameters import app.aaps.annotations.OpenForTesting import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventXdripNewLog +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventXdripNewLog import info.nightscout.plugins.sync.xdrip.DataSyncSelectorXdripImpl import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI import kotlinx.coroutines.Dispatchers diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPluginTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPluginTest.kt index a0c47eadfe..bc8b885224 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPluginTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPluginTest.kt @@ -1,18 +1,18 @@ package info.nightscout.plugins.sync.dataBroadcaster -import app.aaps.interfaces.aps.AutosensDataStore -import app.aaps.interfaces.aps.Loop -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.CobInfo -import app.aaps.interfaces.iob.GlucoseStatus -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.InMemoryGlucoseValue -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.aps.AutosensDataStore +import app.aaps.core.interfaces.aps.Loop +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.CobInfo +import app.aaps.core.interfaces.iob.GlucoseStatus +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.InMemoryGlucoseValue +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import app.aaps.shared.tests.BundleMock import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt index 6ce7f5385e..2247515120 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.sync.nsclient import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.events.EventChargingState -import app.aaps.interfaces.rx.events.EventNetworkChange -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.events.EventChargingState +import app.aaps.core.interfaces.rx.events.EventNetworkChange +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import info.nightscout.plugins.sync.R diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt index ba17a2d059..c4cf2f5be5 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt @@ -1,14 +1,14 @@ package info.nightscout.plugins.sync.nsclientV3 import app.aaps.core.main.extensions.fromConstant -import app.aaps.interfaces.insulin.Insulin -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.sync.DataSyncSelector -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.insulin.Insulin +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.sync.DataSyncSelector +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt index d8d1beab38..2c83ae2510 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.DeviceStatus diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt index 6bd3e63461..f066496e95 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclientV3.extensions -import app.aaps.interfaces.insulin.Insulin +import app.aaps.core.interfaces.insulin.Insulin import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.EffectiveProfileSwitch diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt index 21b0e8a9fa..9c19a86934 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.main.extensions.fromConstant -import app.aaps.interfaces.insulin.Insulin +import app.aaps.core.interfaces.insulin.Insulin import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.ProfileSwitch diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt index 8903ea5b0f..6cb2b721db 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt @@ -4,8 +4,8 @@ import android.content.Context import androidx.work.ListenableWorker.Result.Success import androidx.work.testing.TestListenableWorkerBuilder import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.sync.NsClient +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.sync.NsClient import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt index d094bb3428..722bbe7272 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt @@ -7,15 +7,15 @@ import androidx.work.WorkContinuation import androidx.work.WorkManager import androidx.work.testing.TestListenableWorkerBuilder import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.nsclient.StoreDataForDb -import app.aaps.interfaces.receivers.ReceiverStatusStore -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.source.NSClientSource -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.nsclient.StoreDataForDb +import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.source.NSClientSource +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt index 7d652ee8ce..432f0b37f2 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt @@ -8,13 +8,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.pump.combo.data.ComboErrorUtil import info.nightscout.pump.combo.data.ComboErrorUtil.DisplayType diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java index 45254d3e20..068e12bb7e 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java @@ -19,34 +19,34 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.constraints.Constraint; -import app.aaps.interfaces.constraints.PluginConstraints; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.plugin.PluginDescription; -import app.aaps.interfaces.plugin.PluginType; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.profile.ProfileFunction; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.Pump; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpPluginBase; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.ManufacturerType; -import app.aaps.interfaces.pump.defs.PumpDescription; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventDismissNotification; -import app.aaps.interfaces.rx.events.EventInitializationChanged; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventRefreshOverview; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.T; +import app.aaps.core.interfaces.constraints.Constraint; +import app.aaps.core.interfaces.constraints.PluginConstraints; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.plugin.PluginDescription; +import app.aaps.core.interfaces.plugin.PluginType; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.profile.ProfileFunction; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.Pump; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpPluginBase; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.ManufacturerType; +import app.aaps.core.interfaces.pump.defs.PumpDescription; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventDismissNotification; +import app.aaps.core.interfaces.rx.events.EventInitializationChanged; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventRefreshOverview; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.T; import dagger.android.HasAndroidInjector; import info.nightscout.core.utils.fabric.InstanceId; import info.nightscout.pump.combo.events.EventComboPumpUpdateGUI; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/data/ComboErrorUtil.kt b/pump/combo/src/main/java/info/nightscout/pump/combo/data/ComboErrorUtil.kt index 069cf9baf6..0de94c1bd2 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/data/ComboErrorUtil.kt +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/data/ComboErrorUtil.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.combo.data -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.pump.combo.R import javax.inject.Inject import javax.inject.Singleton diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/events/EventComboPumpUpdateGUI.kt b/pump/combo/src/main/java/info/nightscout/pump/combo/events/EventComboPumpUpdateGUI.kt index 1b0c8c5a6a..191e9257cd 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/events/EventComboPumpUpdateGUI.kt +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/events/EventComboPumpUpdateGUI.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.combo.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventComboPumpUpdateGUI : EventUpdateGui() \ No newline at end of file diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/RuffyScripter.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/RuffyScripter.java index 9f70cf23be..ccdcdd1e32 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/RuffyScripter.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/RuffyScripter.java @@ -28,8 +28,8 @@ import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.data.ComboErrorUtil; import info.nightscout.pump.combo.ruffyscripter.commands.BolusCommand; import info.nightscout.pump.combo.ruffyscripter.commands.CancelTbrCommand; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/BolusCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/BolusCommand.java index df610b7b71..1096cf1c17 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/BolusCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/BolusCommand.java @@ -11,8 +11,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.BolusProgressReporter; import info.nightscout.pump.combo.ruffyscripter.PumpWarningCodes; import info.nightscout.pump.combo.ruffyscripter.RuffyScripter; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/CancelTbrCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/CancelTbrCommand.java index 1f553ece1b..9c593e75f1 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/CancelTbrCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/CancelTbrCommand.java @@ -4,8 +4,8 @@ import androidx.annotation.NonNull; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.PumpState; import info.nightscout.pump.combo.ruffyscripter.PumpWarningCodes; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java index 3b861d9bec..acf1bb25f7 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java @@ -9,8 +9,8 @@ import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime; import java.util.Arrays; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.BasalProfile; import info.nightscout.pump.combo.ruffyscripter.PumpState; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java index 018d99cf40..6da12525c3 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java @@ -10,8 +10,8 @@ import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime; import java.util.Calendar; import java.util.Date; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.history.Bolus; import info.nightscout.pump.combo.ruffyscripter.history.PumpAlert; import info.nightscout.pump.combo.ruffyscripter.history.PumpHistory; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java index c63d3fc2a7..cdd232ae36 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.history.Bolus; import info.nightscout.pump.combo.ruffyscripter.history.PumpHistory; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java index 3be005ce0a..c601a34d24 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java @@ -12,8 +12,8 @@ import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime; import java.util.ArrayList; import java.util.List; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.BasalProfile; import info.nightscout.pump.combo.ruffyscripter.PumpState; diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetTbrCommand.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetTbrCommand.java index 78ff2d8d1a..530cb33a91 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetTbrCommand.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ruffyscripter/commands/SetTbrCommand.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.pump.combo.ruffyscripter.PumpState; import info.nightscout.pump.combo.ruffyscripter.PumpWarningCodes; import info.nightscout.pump.combo.ruffyscripter.WarningOrErrorCode; diff --git a/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt b/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt index fb6db4eeb1..ae365b8403 100644 --- a/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt +++ b/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt @@ -2,15 +2,15 @@ package info.nightscout.pump.combo import android.content.Context import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSComboCtlLogger.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSComboCtlLogger.kt index 2df6f89f75..d62548cc0b 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSComboCtlLogger.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSComboCtlLogger.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.combov2 import android.util.Log -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.comboctl.base.LogLevel import info.nightscout.comboctl.base.LoggerBackend as ComboCtlLoggerBackend diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSPumpStateStore.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSPumpStateStore.kt index e753fc599c..b9a97119a0 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSPumpStateStore.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/AAPSPumpStateStore.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.combov2 -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.comboctl.base.BluetoothAddress import info.nightscout.comboctl.base.CurrentTbrState import info.nightscout.comboctl.base.InvariantPumpData diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt index 3879e38fb0..e268fc34ce 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt @@ -9,8 +9,8 @@ import androidx.databinding.DataBindingUtil import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.support.DaggerFragment import info.nightscout.comboctl.base.NullDisplayFrame import info.nightscout.comboctl.parser.BatteryState @@ -253,7 +253,7 @@ class ComboV2Fragment : DaggerFragment() { } in 60..(30 * 60) -> { - binding.combov2LastConnection.text = rh.gs(app.aaps.interfaces.R.string.minago, secondsPassed / 60) + binding.combov2LastConnection.text = rh.gs(app.aaps.core.interfaces.R.string.minago, secondsPassed / 60) binding.combov2LastConnection.setTextColor(Color.WHITE) } @@ -280,7 +280,7 @@ class ComboV2Fragment : DaggerFragment() { rh.gs(R.string.combov2_less_than_one_minute_ago) else -> - rh.gs(app.aaps.interfaces.R.string.minago, secondsPassed / 60) + rh.gs(app.aaps.core.interfaces.R.string.minago, secondsPassed / 60) } binding.combov2LastBolus.text = diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt index 0c23d0beee..60c23bc722 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt @@ -9,39 +9,39 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress.Treatment -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress.Treatment +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import info.nightscout.comboctl.android.AndroidBluetoothInterface import info.nightscout.comboctl.base.BasicProgressStage diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Delegates.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Delegates.kt index 8c8cecd98d..02bee43062 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Delegates.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Delegates.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.combov2 -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/InternalSP.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/InternalSP.kt index 5522cbca72..5c3e33b9b7 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/InternalSP.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/InternalSP.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.content.Context import android.content.SharedPreferences import androidx.annotation.StringRes -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.SafeParse // This is a copy of the AAPS SPImplementation. We keep this to be able // to set up a custom internal SP store for the Combo pump state. diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Utility.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Utility.kt index 0887f0aea5..d1679201cc 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Utility.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/Utility.kt @@ -2,16 +2,16 @@ package info.nightscout.pump.combov2 import android.content.Context import android.os.Build -import app.aaps.interfaces.androidPermissions.AndroidPermission -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.androidPermissions.AndroidPermission +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.comboctl.android.AndroidBluetoothPermissionException import info.nightscout.comboctl.base.ComboException import info.nightscout.comboctl.main.BasalProfile import info.nightscout.comboctl.main.NUM_COMBO_BASAL_PROFILE_FACTORS import kotlinx.coroutines.delay -import app.aaps.interfaces.profile.Profile as AAPSProfile +import app.aaps.core.interfaces.profile.Profile as AAPSProfile // Utility extension functions for clearer conversion between // ComboCtl units and AAPS units. ComboCtl uses integer-encoded diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt index bcc23aeb71..a50dff00fc 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt @@ -17,9 +17,9 @@ import androidx.databinding.DataBindingUtil import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.comboctl.base.BasicProgressStage import info.nightscout.comboctl.base.PAIRING_PIN_SIZE import info.nightscout.comboctl.base.PairingPIN diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt index 39575a3bac..89e35775f5 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt @@ -10,30 +10,30 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Dana -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.WarnColors -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.userEntry.UserEntryMapper.Action -import app.aaps.interfaces.userEntry.UserEntryMapper.Sources -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Dana +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.WarnColors +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.userEntry.UserEntryMapper.Action +import app.aaps.core.interfaces.userEntry.UserEntryMapper.Sources +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.dana.activities.DanaHistoryActivity @@ -207,7 +207,7 @@ class DanaFragment : DaggerFragment() { if (pump.lastConnection != 0L) { val agoMilliseconds = System.currentTimeMillis() - pump.lastConnection val agoMin = (agoMilliseconds.toDouble() / 60.0 / 1000.0).toInt() - binding.lastConnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(app.aaps.interfaces.R.string.minago, agoMin) + ")" + binding.lastConnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(app.aaps.core.interfaces.R.string.minago, agoMin) + ")" warnColors.setColor(binding.lastConnection, agoMin.toDouble(), 16.0, 31.0) } if (pump.lastBolusTime != 0L) { diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt index fa802d9c68..9e1500eb5f 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt @@ -1,19 +1,19 @@ package info.nightscout.pump.dana -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import org.joda.time.DateTime import org.joda.time.DateTimeZone import org.json.JSONArray diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt index b61b794a68..5a8a377d01 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt @@ -9,22 +9,22 @@ import android.widget.ArrayAdapter import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDanaRSyncStatus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDanaRSyncStatus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.dana.R import info.nightscout.pump.dana.comm.RecordTypes diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt index a7ca8015fe..fff58e96dd 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt @@ -3,18 +3,18 @@ package info.nightscout.pump.dana.activities import android.content.Context import android.os.Bundle import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.R diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/events/EventDanaRNewStatus.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/events/EventDanaRNewStatus.kt index 3a9689b7e4..ff150a1441 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/events/EventDanaRNewStatus.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/events/EventDanaRNewStatus.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.dana.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventDanaRNewStatus : Event() diff --git a/pump/dana/src/test/java/info/nightscout/pump/dana/DanaPumpTest.kt b/pump/dana/src/test/java/info/nightscout/pump/dana/DanaPumpTest.kt index 62d9b70b40..71ed62ee16 100644 --- a/pump/dana/src/test/java/info/nightscout/pump/dana/DanaPumpTest.kt +++ b/pump/dana/src/test/java/info/nightscout/pump/dana/DanaPumpTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.dana -import app.aaps.interfaces.objects.Instantiator +import app.aaps.core.interfaces.objects.Instantiator import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt index b01e7aa6d8..16c1ea983e 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt @@ -8,28 +8,28 @@ import android.os.IBinder import app.aaps.annotations.OpenForTesting import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.PumpSync.TemporaryBasalType -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpSync.TemporaryBasalType +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService import info.nightscout.androidaps.danar.AbstractDanaRPlugin diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt index aa67c902a8..a538545984 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt index 36ba59cca6..713950f921 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt index bffc1e07d3..6182ca982a 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt index bf03682f01..9692fee978 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.rx.events.EventRebuildTabs +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.rx.events.EventRebuildTabs import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt index e7c3760bd4..0241f91f03 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase import java.util.Locale diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt index 6a683eacb6..463464222e 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase import java.util.Locale diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt index 878f966360..98d3765ea6 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt index bacb2d3114..60cedb6d40 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRKorean.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java index 814ce8411e..555e20bdbc 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java @@ -8,28 +8,28 @@ import java.io.IOException; import javax.inject.Inject; -import app.aaps.interfaces.configuration.Constants; -import app.aaps.interfaces.constraints.ConstraintsChecker; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.profile.ProfileFunction; -import app.aaps.interfaces.pump.BolusProgressData; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.Command; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventInitializationChanged; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged; -import app.aaps.interfaces.rx.events.EventPumpStatusChanged; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.T; +import app.aaps.core.interfaces.configuration.Constants; +import app.aaps.core.interfaces.constraints.ConstraintsChecker; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.profile.ProfileFunction; +import app.aaps.core.interfaces.pump.BolusProgressData; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.Command; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventInitializationChanged; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged; +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.T; import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean; import info.nightscout.androidaps.danaRKorean.comm.MsgCheckValue_k; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java index 06fba41f84..5674883591 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java @@ -14,29 +14,29 @@ import javax.inject.Singleton; import app.aaps.annotations.OpenForTesting; import app.aaps.core.main.constraints.ConstraintObject; import app.aaps.core.main.utils.fabric.FabricPrivacy; -import app.aaps.interfaces.constraints.ConstraintsChecker; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.plugin.ActivePlugin; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.DetailedBolusInfoStorage; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.TemporaryBasalStorage; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventAppExit; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.DecimalFormatter; -import app.aaps.interfaces.utils.Round; -import app.aaps.interfaces.utils.T; +import app.aaps.core.interfaces.constraints.ConstraintsChecker; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.plugin.ActivePlugin; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.TemporaryBasalStorage; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventAppExit; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.DecimalFormatter; +import app.aaps.core.interfaces.utils.Round; +import app.aaps.core.interfaces.utils.T; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService; import info.nightscout.androidaps.danar.AbstractDanaRPlugin; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt index 9381fa31a4..f3a4083271 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.danaRv2.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.rx.events.EventRebuildTabs +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.rx.events.EventRebuildTabs import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt index b8a1f0b108..a6a69ea962 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.danaRv2.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt index 4e3f80aa05..171b290f81 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRv2.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt index 2b99390b25..2e3e90f213 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRv2.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase import java.util.Date diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt index 1f049bf318..9fd69356af 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danaRv2.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.comm.MessageBase diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java index 21a744146a..9f9b1f5553 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java @@ -9,31 +9,31 @@ import java.io.IOException; import javax.inject.Inject; -import app.aaps.interfaces.configuration.Constants; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.plugin.ActivePlugin; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.profile.ProfileFunction; -import app.aaps.interfaces.pump.BolusProgressData; -import app.aaps.interfaces.pump.Pump; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.Command; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventInitializationChanged; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged; -import app.aaps.interfaces.rx.events.EventPumpStatusChanged; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.T; +import app.aaps.core.interfaces.configuration.Constants; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.plugin.ActivePlugin; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.profile.ProfileFunction; +import app.aaps.core.interfaces.pump.BolusProgressData; +import app.aaps.core.interfaces.pump.Pump; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.Command; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventInitializationChanged; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged; +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.T; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.danaRv2.DanaRv2Plugin; @@ -405,7 +405,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService { rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.pump.dana.R.string.gettingbolusstatus))); mSerialIOThread.sendMessage(new MsgStatus(injector)); bolusingEvent.setPercent(100); - rxBus.send(new EventPumpStatusChanged(rh.gs(app.aaps.interfaces.R.string.disconnecting))); + rxBus.send(new EventPumpStatusChanged(rh.gs(app.aaps.core.interfaces.R.string.disconnecting))); } }); return !start.getFailed(); diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java index 542b3e0bde..3100716120 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java @@ -6,36 +6,36 @@ import org.json.JSONException; import org.json.JSONObject; import app.aaps.core.main.constraints.ConstraintObject; -import app.aaps.interfaces.constraints.Constraint; -import app.aaps.interfaces.constraints.ConstraintsChecker; -import app.aaps.interfaces.constraints.PluginConstraints; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.plugin.ActivePlugin; -import app.aaps.interfaces.plugin.OwnDatabasePlugin; -import app.aaps.interfaces.plugin.PluginDescription; -import app.aaps.interfaces.plugin.PluginType; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.pump.Dana; -import app.aaps.interfaces.pump.Pump; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpPluginBase; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.ManufacturerType; -import app.aaps.interfaces.pump.defs.PumpDescription; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventConfigBuilderChange; -import app.aaps.interfaces.rx.events.EventDismissNotification; -import app.aaps.interfaces.rx.events.EventPreferenceChange; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.DecimalFormatter; -import app.aaps.interfaces.utils.Round; +import app.aaps.core.interfaces.constraints.Constraint; +import app.aaps.core.interfaces.constraints.ConstraintsChecker; +import app.aaps.core.interfaces.constraints.PluginConstraints; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.plugin.ActivePlugin; +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin; +import app.aaps.core.interfaces.plugin.PluginDescription; +import app.aaps.core.interfaces.plugin.PluginType; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.pump.Dana; +import app.aaps.core.interfaces.pump.Pump; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpPluginBase; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.ManufacturerType; +import app.aaps.core.interfaces.pump.defs.PumpDescription; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventConfigBuilderChange; +import app.aaps.core.interfaces.rx.events.EventDismissNotification; +import app.aaps.core.interfaces.rx.events.EventPreferenceChange; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.DecimalFormatter; +import app.aaps.core.interfaces.utils.Round; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService; import info.nightscout.pump.dana.DanaFragment; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java index bff3d49598..d6dd640366 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java @@ -14,27 +14,27 @@ import javax.inject.Singleton; import app.aaps.annotations.OpenForTesting; import app.aaps.core.main.constraints.ConstraintObject; import app.aaps.core.main.utils.fabric.FabricPrivacy; -import app.aaps.interfaces.constraints.ConstraintsChecker; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.plugin.ActivePlugin; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventAppExit; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventPreferenceChange; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.DecimalFormatter; -import app.aaps.interfaces.utils.Round; +import app.aaps.core.interfaces.constraints.ConstraintsChecker; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.plugin.ActivePlugin; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventAppExit; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventPreferenceChange; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.DecimalFormatter; +import app.aaps.core.interfaces.utils.Round; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danar.services.DanaRExecutionService; import info.nightscout.pump.dana.DanaPump; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java index 39c83749e9..2352ea6c24 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java @@ -9,8 +9,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.danar.comm.MessageBase; import info.nightscout.androidaps.danar.comm.MessageHashTableBase; import info.nightscout.androidaps.utils.CRC; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt index fe2b85537f..2dcf6ac707 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt @@ -1,18 +1,18 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRv2.DanaRv2Plugin diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt index d9ea26a5d1..2fca128d83 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.HasAndroidInjector import kotlin.math.min diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt index 70bf51dd47..18b43d60e5 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgBolusStart( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt index 1a213e810a..d5f5831909 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgBolusStartWithSpeed( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt index 07d240af58..2d8970be61 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.HasAndroidInjector class MsgBolusStop( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt index ad62d80e75..89c3a82e28 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt index ddf687378d..dd1cfb2186 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.HasAndroidInjector class MsgError( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt index 67fedba3d6..5a8b82c86c 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryAlarm( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt index 88b8f480bc..1a0b4a03f9 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.events.EventDanaRSyncStatus -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.events.EventDanaRSyncStatus +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.comm.RecordTypes import info.nightscout.pump.dana.database.DanaHistoryRecord diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt index fdf73f8934..8903f925f2 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryAllDone( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt index fc0e88db23..6da10bda6c 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryBasalHour( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt index 8f09052607..2fc70acc93 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryBolus( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt index bd7b023c31..824f2c85df 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryCarbo( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt index 0c870ec52a..c92ddd9f3b 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryDailyInsulin( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt index f0c7fb4b70..78c4ed3be1 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryDone( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt index aa30883fa3..2b984b2fcf 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryError( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt index 228a5fb47b..0aa6497b43 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryGlucose( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt index cd52628a32..a470f1fbf8 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryNew( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt index 591698a3d6..36de9ad7db 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryNewDone( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt index 8a192d07a2..88405f8a0b 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistoryRefill( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt index f7ce57e0a1..cd717e577d 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgHistorySuspend( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt index e947f8b735..ffff3b22a6 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt index afc3b757e5..3c24a10efc 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector class MsgInitConnStatusBolus( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt index 43e9ec554c..af444f97ec 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector class MsgInitConnStatusOption( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt index 75540ab191..417ebff211 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.rx.events.EventRebuildTabs +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.rx.events.EventRebuildTabs import dagger.android.HasAndroidInjector class MsgInitConnStatusTime( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt index fbfdd1b956..8f9847aa6b 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgPCCommStart( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt index 09fcf6eff7..2c777fbf55 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgPCCommStop( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt index 0a4a4ce2e7..68d64869e0 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetActivateBasalProfile( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt index ea4aa7030e..cb92779531 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification import dagger.android.HasAndroidInjector class MsgSetBasalProfile( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt index f96e85b908..bd2467bad7 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.comm.RecordTypes import java.util.Calendar diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt index 38801a3ae3..2ce31021b2 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetExtendedBolusStart( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt index 3a8df7de93..a535b15496 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetExtendedBolusStop( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt index 8aa3bffe50..c53a172990 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification import dagger.android.HasAndroidInjector class MsgSetSingleBasalProfile( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt index c8fb774334..c823c6b508 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetTempBasalStart( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt index 12bb623a0f..c1fdfdb250 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetTempBasalStop( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt index 2a9ffba49e..671cd88eb4 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetTime( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt index 3e9f1c2df2..0db9291922 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSetUserOptions( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt index 85e3ff7691..b910e5279a 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSettingActiveProfile( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt index 71b79d4b0a..c7f49a12ab 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import java.util.Locale diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt index c3e4e2621a..31ec1e7cfb 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import java.util.Locale diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt index 1fefa623be..799ad84bc1 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt index 785d046900..782fe559e2 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSettingMaxValues( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt index 3ed70320ce..b153a13af4 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector class MsgSettingMeal( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt index fe148bf69a..74b39524b5 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt index 2c0312476b..9b4a3262e7 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt index 4483503041..9a6895ae9d 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import org.joda.time.DateTime import java.util.Date diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt index 25e140d6e5..71ac8ac4d3 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSettingShippingInfo( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt index 9412bb0009..fcb85ad9b3 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgSettingUserOptions( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt index 25b149e546..4948e76d19 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgStatus( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt index a43ef786e5..937d1791ea 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector class MsgStatusBasic( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt index 111c47aada..4f9cbe8910 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import kotlin.math.abs import kotlin.math.floor diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt index a9b7d1a0f4..4122f213b4 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt index b5a82d03c0..800465a77a 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.danar.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import kotlin.math.abs import kotlin.math.floor diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java index b73cc03307..04cddac32e 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java @@ -21,23 +21,23 @@ import java.util.UUID; import javax.inject.Inject; import app.aaps.core.main.utils.fabric.FabricPrivacy; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.plugin.ActivePlugin; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventAppExit; -import app.aaps.interfaces.rx.events.EventBTChange; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventPumpStatusChanged; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.plugin.ActivePlugin; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventAppExit; +import app.aaps.core.interfaces.rx.events.EventBTChange; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; import dagger.android.DaggerService; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danar.R; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java index 9b699e18f9..4c728aa425 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java @@ -8,21 +8,21 @@ import java.io.IOException; import javax.inject.Inject; -import app.aaps.interfaces.configuration.Constants; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.profile.ProfileFunction; -import app.aaps.interfaces.pump.BolusProgressData; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.Command; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.rx.events.EventInitializationChanged; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged; -import app.aaps.interfaces.rx.events.EventPumpStatusChanged; +import app.aaps.core.interfaces.configuration.Constants; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.profile.ProfileFunction; +import app.aaps.core.interfaces.pump.BolusProgressData; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.Command; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.rx.events.EventInitializationChanged; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged; +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged; import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.danar.DanaRPlugin; import info.nightscout.androidaps.danar.SerialIOThread; diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt index 27ff4eaa3b..4f1c268485 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt @@ -1,12 +1,12 @@ package info.nightscout.pump.danaR import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt index bbd18637da..54a0d486ed 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt @@ -1,12 +1,12 @@ package info.nightscout.pump.danaR.comm -import app.aaps.interfaces.configuration.ConfigBuilder -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.ConfigBuilder +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt index a40a98a1eb..62063e7dc7 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danaR.comm -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import info.nightscout.androidaps.danar.comm.MsgBolusProgress import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStopTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStopTest.kt index 19b56949ef..71709223b3 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStopTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStopTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danaR.comm -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import info.nightscout.androidaps.danar.comm.MsgBolusStop import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSettingBasalTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSettingBasalTest.kt index 7fffee38d5..2fccb68e1a 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSettingBasalTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSettingBasalTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danaR.comm -import app.aaps.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpDescription import info.nightscout.androidaps.danar.comm.MsgSettingBasal import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgStatusBolusExtendedTest.kt index 6c7b3c81ae..4fa62910c8 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgStatusBolusExtendedTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgStatusBolusExtendedTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danaR.comm -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.utils.T import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt index 639d718232..bd60bfc2cd 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt @@ -1,12 +1,12 @@ package info.nightscout.pump.danaRKorean import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt index 61fa692861..7108ad0411 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt @@ -1,14 +1,14 @@ package info.nightscout.pump.danaRv2 import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt index 0f96772a93..5944f25f26 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt @@ -9,42 +9,42 @@ import android.text.format.DateFormat import androidx.preference.Preference import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.OwnDatabasePlugin -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.Dana -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventConfigBuilderChange -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.Dana +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventConfigBuilderChange +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.dana.DanaFragment diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt index 250fab08bc..7d0d12e4c4 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt @@ -20,10 +20,10 @@ import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.TextView import androidx.core.app.ActivityCompat -import app.aaps.interfaces.pump.BlePreCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt index c5e33dfc7f..628ec98ea5 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt @@ -3,11 +3,11 @@ package info.nightscout.pump.danars.activities import android.os.Bundle import android.util.Base64 import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.hexStringToByteArray diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt index 8fe8e21a7f..8ad28393f0 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import org.joda.time.DateTime diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt index 866c863226..cfb40fcc05 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt index dac1a2be53..b5440e411d 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSHistoryEvents.kt @@ -1,15 +1,15 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt index 471d8ba3ef..c74dcf02d3 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketAPSSetEventHistory.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt index 7b6a5717b9..dfd99bbf06 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetBasalRate.kt @@ -1,10 +1,10 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt index 49df259a80..b055b8dbbd 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalGetProfileNumber.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt index 9fc4983d8f..e4f56c5f8e 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt index 220df72f13..aaca3e877e 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt index 7f37a83f17..e57f40219f 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetProfileNumber.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt index 9d6ccff7bb..e83e0e216d 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOff.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt index e8369f7dc0..f4ff2bd2e4 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetSuspendOn.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt index 271196860e..2f52408502 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt index bef1fa45ee..3d9c6c6971 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt index bc6883db2b..502387dacc 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetBolusOption.kt @@ -1,10 +1,10 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt index 10e55b4f7a..2d4d54a1e1 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt index 043b262b0c..fb177bfed7 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt index 3c3015d20e..aa770baa9c 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt index a67d65d9a2..092c1e3620 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt @@ -1,9 +1,9 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt index 672ba13dd0..72fb93fae5 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetBolusOption.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt index b269711184..1ac65a177e 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt index b77728b78b..1a149385cd 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt index 89413274c6..0f3036f3ac 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.danars.comm import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt index 0f86d02c0c..d687be3e8a 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt @@ -1,9 +1,9 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt index 8f1f680239..8ce374c033 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcKeepConnection.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt index d97283c385..08126278d6 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketEtcSetHistorySave.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt index 21251d826f..9c88b0b2a7 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt @@ -1,9 +1,9 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt index 3ac23ba883..45b1fb3100 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt index 7be2fc83a4..c5498c3737 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt index 14ac66cea3..68c84826cd 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt index 1bcbb14868..6fbcf7681b 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt index 8e5451ca12..0e38a9b6ec 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt index 9d7bcd64a5..ca391bceba 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt index 4911d48715..fd6f71f837 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistory.kt @@ -1,10 +1,10 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDanaRSyncStatus -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDanaRSyncStatus +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.comm.RecordTypes diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt index d798b1a24d..b54d8d4101 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAlarm.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt index 7a3f5ff58d..f1ecae705d 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryAllHistory.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt index 7a30b5ce45..99442c4d30 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBasal.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt index c556a415b1..dcd60153ad 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBloodGlucose.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt index 56eacde2c6..4504f60ff1 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryBolus.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt index 44d93da814..ab16d0bc62 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryCarbohydrate.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt index 95a9c779b1..5e1a396612 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryDaily.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt index 697e4957e2..4d93d9c2d9 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryPrime.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt index 033a44b192..a0d919fa7e 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryRefill.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt index f0d12734b3..d1cc455e14 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistorySuspend.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt index 385b6d25b1..3f5cd7c3bd 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketHistoryTemporary.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt index f07dd76c69..57b9421077 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyAlarm.kt @@ -1,10 +1,10 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt index ce3fe482eb..8d4f013499 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt @@ -1,9 +1,9 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt index d4c494b8f7..dff8395555 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt @@ -1,9 +1,9 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt index 3635f76bae..8c3dcaf69f 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt index 4687d4388c..3416429c78 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpTime.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt index 6025c23e00..4a1b1594fc 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt index 10595cf706..a1f755c53c 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionGetUserOption.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt index 38e29c0979..a1b0992285 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpTime.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import org.joda.time.DateTime diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt index f6f27c60a2..e8dd0def22 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import org.joda.time.DateTime diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt index a8c6e68635..87633ae5f6 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketOptionSetUserOption.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt index a35c5d9855..9fa7d143bc 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewBolusAvg.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt index c6a426ccf3..5807771446 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.pump.dana.DanaPump diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt index 62ccebc9f9..c0e7344801 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt @@ -10,9 +10,9 @@ import android.view.ViewGroup import android.view.Window import android.view.WindowManager import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.support.DaggerDialogFragment import info.nightscout.pump.danars.activities.PairingHelperActivity import info.nightscout.pump.danars.databinding.DanarsPairingProgressDialogBinding diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt index dd8de66e6e..1efa31e2fb 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSDeviceChange.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.danars.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventDanaRSDeviceChange : Event() \ No newline at end of file diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt index 538c112828..ff9885a78a 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/events/EventDanaRSPairingSuccess.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.danars.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventDanaRSPairingSuccess : Event() diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt index 6c3a7391a7..c3648eafff 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt @@ -18,18 +18,18 @@ import android.os.Build import android.os.SystemClock import android.util.Base64 import androidx.core.app.ActivityCompat -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.core.ui.toast.ToastUtils diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt index 530975c4b6..2b46587cc4 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt @@ -7,32 +7,32 @@ import android.os.Binder import android.os.IBinder import android.os.SystemClock import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.BolusProgressData -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump @@ -347,7 +347,7 @@ class DanaRSService : DaggerService() { rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus))) sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus bolusingEvent.percent = 100 - rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.interfaces.R.string.disconnecting))) + rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.core.interfaces.R.string.disconnecting))) } }) return !start.failed diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt index 16318199a1..01ca2e64c4 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt @@ -1,12 +1,12 @@ package info.nightscout.pump.danars import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.queue.CommandQueue import dagger.android.AndroidInjector import info.nightscout.pump.dana.database.DanaHistoryDatabase import org.junit.jupiter.api.Assertions diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt index 53976c5f68..17fe00963b 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.danars -import app.aaps.interfaces.objects.Instantiator -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.objects.Instantiator +import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt index a7d441e7c9..f1fc720420 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.danars.DanaRSTestBase diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt index f164cb10f1..962e5c3e51 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.danars.comm import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.ConstraintsChecker import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketApsHistoryEventsTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketApsHistoryEventsTest.kt index 0a3474b7c9..04603d5183 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketApsHistoryEventsTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketApsHistoryEventsTest.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.danars.DanaRSTestBase diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt index 552e4e8eba..7dd9085300 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt @@ -1,11 +1,11 @@ package info.nightscout.pump.danars.comm import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.queue.CommandQueue import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.database.DanaHistoryDatabase diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt index 7c18ffd325..0012942147 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.danars.DanaRSTestBase diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyAlarmTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyAlarmTest.kt index 1cc7c12f5e..d78f645eed 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyAlarmTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyAlarmTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpSync import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.danars.DanaRSTestBase diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt index 8e148a3f35..3ee0f9ecbc 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt @@ -1,11 +1,11 @@ package info.nightscout.pump.danars.comm -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.database.DanaHistoryDatabase diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt index a7f2868956..c24a836e92 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt @@ -9,24 +9,24 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.WarnColors -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.WarnColors +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity import info.nightscout.pump.diaconn.activities.DiaconnG8UserOptionsActivity @@ -162,7 +162,7 @@ class DiaconnG8Fragment : DaggerFragment() { if (pump.lastConnection != 0L) { val agoMsec = System.currentTimeMillis() - pump.lastConnection val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt() - binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(app.aaps.interfaces.R.string.minago, agoMin) + ")" + binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(app.aaps.core.interfaces.R.string.minago, agoMin) + ")" warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0) } if (pump.lastBolusTime != 0L) { diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt index 62533c3d63..2423ae4dac 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt @@ -10,44 +10,44 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.constraints.Constraint -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.OwnDatabasePlugin -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.Diaconn -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.pump.actions.CustomActionType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventConfigBuilderChange -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.constraints.Constraint +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.Diaconn +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventConfigBuilderChange +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Pump.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Pump.kt index 03262b5fa7..3599e29ce6 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Pump.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Pump.kt @@ -1,13 +1,13 @@ package info.nightscout.pump.diaconn -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import javax.inject.Inject import javax.inject.Singleton import kotlin.math.max diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt index 162169fabe..909fdbbb11 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt @@ -23,9 +23,9 @@ import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.TextView import androidx.core.app.ActivityCompat -import app.aaps.interfaces.pump.BlePreCheck -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt index 24cfa76a8a..8b3604aa0c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt @@ -10,17 +10,17 @@ import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.common.RecordTypes diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt index 2058dbd041..064f8ff954 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt @@ -6,14 +6,14 @@ import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.diaconn.DiaconnG8Pump diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnLogUploader.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnLogUploader.kt index fd4e3a0128..880f932873 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnLogUploader.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnLogUploader.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.diaconn.api -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8DeviceChange.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8DeviceChange.kt index 193eed3573..1eba035c37 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8DeviceChange.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8DeviceChange.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.diaconn.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventDiaconnG8DeviceChange : Event() \ No newline at end of file diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8NewStatus.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8NewStatus.kt index 43c4db99c1..c9df19ea9e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8NewStatus.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8NewStatus.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.diaconn.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventDiaconnG8NewStatus : Event() diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingPacket.kt index 230476a8c2..d27ccd569e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingResponsePacket.kt index 864e6b83d7..79cf6e80e6 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingPacket.kt index ed19d4859e..b4d35e94b6 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingResponsePacket.kt index a16007c4e8..31cb6932f5 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquirePacket.kt index 3a76857e10..c4a2d33af4 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquireResponsePacket.kt index 4be815918b..881ce7c6e9 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquireResponsePacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseReportPacket.kt index 36c6283980..daeb2b172a 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingPacket.kt index a041ef44be..682cf6767c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingResponsePacket.kt index 6ae517e1cd..2bd1f1ce27 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingPacket.kt index b4078ced33..d44f0a1116 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingReportPacket.kt index 0fb5218ea9..2b4081aa4f 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingResponsePacket.kt index b7f9201fe9..af77888eff 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BatteryWarningReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BatteryWarningReportPacket.kt index f1f5cd1377..8b42c7d3d7 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BatteryWarningReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BatteryWarningReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquirePacket.kt index ef915f9d50..c24d9831aa 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt index e2c1d9ca0f..24467c2ff9 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquirePacket.kt index 57c5cbf5a4..aa3624adc6 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquireResponsePacket.kt index 491ee9f07e..682cce0778 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquireResponsePacket.kt @@ -1,19 +1,19 @@ package info.nightscout.pump.diaconn.packet import android.content.Context -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.T import app.aaps.shared.impl.extensions.safeGetPackageInfo import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquirePacket.kt index 031c096509..b0a7292a57 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquireResponsePacket.kt index 3eeda81a9e..0ba1505a56 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquireResponsePacket.kt @@ -1,10 +1,10 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquirePacket.kt index 664c6a7dbe..2535fa016e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquireResponsePacket.kt index 443d5a4e8a..4095c19ccd 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquireResponsePacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingPacket.kt index 8eff3c9f1f..13eb891405 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingReportPacket.kt index b2398617f5..b9c9a08261 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingReportPacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingResponsePacket.kt index cae81cbff5..7cc15d680b 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/ConfirmReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/ConfirmReportPacket.kt index 174318fa2c..ad4b2804dc 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/ConfirmReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/ConfirmReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8Packet.java b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8Packet.java index a35e2d91ad..6e0840973c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8Packet.java +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8Packet.java @@ -5,9 +5,9 @@ import java.nio.ByteOrder; import javax.inject.Inject; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.utils.DateUtil; import dagger.android.HasAndroidInjector; public class DiaconnG8Packet { diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquirePacket.kt index 23e0bddeaa..18e4b73349 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquireResponsePacket.kt index 521b8b6c08..33d8338fc9 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingPacket.kt index c6c31a6207..54a1b02faf 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt index d6dd774a40..fcf512d051 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquirePacket.kt index 1cbd6ba6dc..f12562f30d 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquireResponsePacket.kt index 388036e829..e3b8ed8272 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquireResponsePacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalReportPacket.kt index 7ec45b3f7d..ef9c641c9d 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingPacket.kt index 181f19cca0..c1246a033a 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingResponsePacket.kt index d5e2afabbe..866905346d 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBlockReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBlockReportPacket.kt index 43ba98c5d4..2b351fcd1e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBlockReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBlockReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingPacket.kt index ee53197bd4..f2b15b6f32 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingResponsePacket.kt index 7cfc14378a..3867352cf8 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt index 2432577bf7..14d1c82f36 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingPacket.kt index e7b891cbee..d0affd4047 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt index 23c09ad777..b26a8e706a 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingPacket.kt index 29b597155f..b293cf26dd 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingResponsePacket.kt index 2010448578..4ee11e4625 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionProgressReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionProgressReportPacket.kt index fa85420653..bf148488a0 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionProgressReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionProgressReportPacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquirePacket.kt index 936f83daa4..f9a6cfc2cb 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquireResponsePacket.kt index 852efe8b37..760e0479b6 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackResultReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackResultReportPacket.kt index 2e6bfebb79..cef28e61f4 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackResultReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackResultReportPacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingPacket.kt index 89a7c49c65..fe841a9553 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingResponsePacket.kt index 0bda30aa7d..3aa4153b86 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InsulinLackReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InsulinLackReportPacket.kt index 9cce79ec0b..50c8cc9db2 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InsulinLackReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InsulinLackReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquirePacket.kt index 4c8133f81a..70ea80541d 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquireResponsePacket.kt index 75aa8249a1..ca8b2a7a30 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingPacket.kt index 175924bd24..c771f7ad9b 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingResponsePacket.kt index b95e9b51b7..5e1924eb77 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquirePacket.kt index 71ec9a9b5d..fdef8b104d 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquireResponsePacket.kt index f3189810d7..933f24d95b 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/RejectReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/RejectReportPacket.kt index 3bf307396f..63cc827c2c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/RejectReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/RejectReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquirePacket.kt index c6d41dd315..1389cb2def 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquireResponsePacket.kt index 7e93446c08..571394734a 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquireResponsePacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquirePacket.kt index 3de1569110..3213da263f 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquireResponsePacket.kt index 4ff27cdc1b..06ec4b7ff6 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquirePacket.kt index de5589f4c5..4704b95912 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquireResponsePacket.kt index ffb8caa3d6..11b409955c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingPacket.kt index 2d2117d9b2..cada3ee43c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingResponsePacket.kt index 1ab1185c83..4cce32f867 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquirePacket.kt index 8b3e7dde39..533891f9cb 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquireResponsePacket.kt index fda026c669..d46d38413f 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalInquireResponsePacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalReportPacket.kt index 54b82d6438..4818d7f6f4 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalReportPacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingPacket.kt index ffb0f2f2f9..33ee883208 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingResponsePacket.kt index f87e2c3f86..5eb5d61b04 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TempBasalSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquirePacket.kt index de092ccbe0..874bb0973c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquirePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquirePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquireResponsePacket.kt index d4da9a266d..3a33a9c3c4 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeInquireResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeReportPacket.kt index 0c929ae48e..613e20b9ba 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeReportPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeReportPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingPacket.kt index d5e39842af..ae86cc0b79 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingPacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import org.joda.time.DateTime diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingResponsePacket.kt index 893efa75be..0311987bda 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/TimeSettingResponsePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.diaconn.packet -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt index fffea71c31..9cbd210c69 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt @@ -16,12 +16,12 @@ import android.content.pm.PackageManager import android.os.Build import android.os.SystemClock import androidx.core.app.ActivityCompat -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.notifyAll diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt index 7ea22239f4..23c11b540c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt @@ -7,31 +7,31 @@ import android.os.Binder import android.os.IBinder import android.os.SystemClock import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.BolusProgressData -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventInitializationChanged -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventInitializationChanged +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Plugin @@ -538,7 +538,7 @@ class DiaconnG8Service : DaggerService() { if (!diaconnG8Pump.isPumpVersionGe3_53) { bolusingEvent.percent = 100 } - rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.interfaces.R.string.disconnecting))) + rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.core.interfaces.R.string.disconnecting))) } }) return !start.failed diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt index 7b89f434e6..8bcd1995b5 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt @@ -2,36 +2,36 @@ package info.nightscout.androidaps.plugins.pump.eopatch import android.os.SystemClock import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.pump.actions.CustomActionType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.queue.CustomCommand -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppInitialized -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppInitialized +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmManager import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/RxAction.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/RxAction.kt index 8e798c6006..96f08482ab 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/RxAction.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/RxAction.kt @@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.eopatch import android.os.SystemClock -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers import io.reactivex.rxjava3.core.Scheduler import io.reactivex.rxjava3.core.Single import java.util.concurrent.TimeUnit diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt index f21a25d429..5bab5f9096 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt @@ -3,18 +3,18 @@ package info.nightscout.androidaps.plugins.pump.eopatch.alarm import android.content.Context import android.content.Intent import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A005 diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmProcess.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmProcess.kt index 11c8f86d12..a44acd63f2 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmProcess.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmProcess.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.alarm import android.content.Context import android.content.DialogInterface import android.content.Intent -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.bus.RxBus import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A002 import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A003 diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt index 782411acaf..5f38ee43fc 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt @@ -5,12 +5,12 @@ import android.app.AlarmManager.AlarmClockInfo import android.app.PendingIntent import android.content.Context import android.content.Intent -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus import info.nightscout.androidaps.plugins.pump.eopatch.OsAlarmReceiver import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.Companion.getUri diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/IPatchManager.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/IPatchManager.java index a5d1eaac24..579b7e38c5 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/IPatchManager.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/IPatchManager.java @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble; -import app.aaps.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; import info.nightscout.androidaps.plugins.pump.eopatch.code.BolusExDuration; import info.nightscout.androidaps.plugins.pump.eopatch.code.DeactivationStatus; import info.nightscout.androidaps.plugins.pump.eopatch.code.PatchLifecycle; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java index b530c2fe64..42c3bfd94c 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java @@ -8,17 +8,17 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventCustomActionsChanged; -import app.aaps.interfaces.rx.events.EventPumpStatusChanged; -import app.aaps.interfaces.rx.events.EventRefreshOverview; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventCustomActionsChanged; +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged; +import app.aaps.core.interfaces.rx.events.EventRefreshOverview; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.utils.DateUtil; import info.nightscout.androidaps.plugins.pump.eopatch.R; import info.nightscout.androidaps.plugins.pump.eopatch.RxAction; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManagerImpl.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManagerImpl.java index c43eed7be1..517231343f 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManagerImpl.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManagerImpl.java @@ -33,11 +33,11 @@ import javax.crypto.KeyAgreement; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.sharedPreferences.SP; import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode; import info.nightscout.androidaps.plugins.pump.eopatch.ble.task.ActivateTask; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchStateManager.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchStateManager.java index 8e8f7b34b3..a3f6ed2ccc 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchStateManager.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchStateManager.java @@ -5,10 +5,10 @@ import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.rx.AapsSchedulers; import info.nightscout.androidaps.plugins.pump.eopatch.ble.task.FetchAlarmTask; import info.nightscout.androidaps.plugins.pump.eopatch.ble.task.InternalSuspendedTask; import info.nightscout.androidaps.plugins.pump.eopatch.ble.task.ReadBolusFinishTimeTask; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PreferenceManager.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PreferenceManager.kt index 816bd533ce..ca2055b1e4 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PreferenceManager.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PreferenceManager.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.GsonHelper import info.nightscout.androidaps.plugins.pump.eopatch.code.PatchLifecycle import info.nightscout.androidaps.plugins.pump.eopatch.code.SettingKeys diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ActivateTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ActivateTask.java index 90737f2e1f..54ee885796 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ActivateTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ActivateTask.java @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.SetKey; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BaseResponse; import info.nightscout.androidaps.plugins.pump.eopatch.vo.NormalBasal; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/DeactivateTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/DeactivateTask.java index 862ee6e099..5f89675277 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/DeactivateTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/DeactivateTask.java @@ -5,8 +5,8 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.AapsSchedulers; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; import info.nightscout.androidaps.plugins.pump.eopatch.code.DeactivationStatus; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.DeActivation; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/FetchAlarmTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/FetchAlarmTask.java index 4a8526ef62..1796d9a744 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/FetchAlarmTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/FetchAlarmTask.java @@ -5,8 +5,8 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.bus.RxBus; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmRegistry; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetErrorCodes; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.AeCodeResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/GetPatchInfoTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/GetPatchInfoTask.java index 6048c9f8ac..df340ab8d3 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/GetPatchInfoTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/GetPatchInfoTask.java @@ -5,7 +5,7 @@ import java.util.Arrays; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetFirmwareVersion; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetLOT; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetModelName; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InfoReminderTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InfoReminderTask.java index 5aa4a7fd2f..c6e7731be0 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InfoReminderTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InfoReminderTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.InfoReminderSet; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.PatchBooleanResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InternalSuspendedTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InternalSuspendedTask.java index e2fcd6060e..f931968b6d 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InternalSuspendedTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InternalSuspendedTask.java @@ -7,14 +7,14 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.logging.UserEntryLogger; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.Command; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.userEntry.UserEntryMapper; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.UserEntryLogger; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.Command; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.userEntry.UserEntryMapper; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetInternalSuspendTime; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.PatchInternalSuspendTimeResponse; import io.reactivex.rxjava3.core.Observable; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/NeedleSensingTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/NeedleSensingTask.java index f85774a6e4..54e6c9a5ed 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/NeedleSensingTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/NeedleSensingTask.java @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmRegistry; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.StartNeedleCheck; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PauseBasalTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PauseBasalTask.java index ce33f770f3..e4c6f91997 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PauseBasalTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PauseBasalTask.java @@ -9,14 +9,14 @@ import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.logging.UserEntryLogger; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.Command; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.userEntry.UserEntryMapper; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.UserEntryLogger; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.Command; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.userEntry.UserEntryMapper; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmRegistry; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PrimingTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PrimingTask.java index fe19f8899f..6c1bf06119 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PrimingTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PrimingTask.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.StartPriming; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.UpdateConnection; import info.nightscout.androidaps.plugins.pump.eopatch.vo.PatchState; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadBolusFinishTimeTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadBolusFinishTimeTask.java index 0712bab5da..f8b06ddbdc 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadBolusFinishTimeTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadBolusFinishTimeTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusFinishTimeGet; import info.nightscout.androidaps.plugins.pump.eopatch.core.code.BolusType; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BolusFinishTimeResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadTempBasalFinishTimeTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadTempBasalFinishTimeTask.java index 3590ec2414..9bfb9ee7fa 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadTempBasalFinishTimeTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ReadTempBasalFinishTimeTask.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.TempBasalFinishTimeGet; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.TempBasalFinishTimeResponse; import io.reactivex.rxjava3.core.Single; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ResumeBasalTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ResumeBasalTask.java index 5c8e134e67..c7b779c1f8 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ResumeBasalTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/ResumeBasalTask.java @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmRegistry; import info.nightscout.androidaps.plugins.pump.eopatch.ble.PatchStateManager; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SelfTestTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SelfTestTask.java index 066080a717..a6f15821c8 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SelfTestTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SelfTestTask.java @@ -5,7 +5,7 @@ import java.util.Arrays; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetGlobalTime; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetTemperature; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetVoltageLevelB4Priming; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetGlobalTimeTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetGlobalTimeTask.java index a6c38345c2..a1e6763c75 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetGlobalTimeTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetGlobalTimeTask.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetGlobalTime; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.SetGlobalTime; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.GlobalTimeResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetLowReservoirTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetLowReservoirTask.java index f4b1695e9a..99087f495a 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetLowReservoirTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/SetLowReservoirTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.SetLowReservoirLevelAndExpireAlert; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.PatchBooleanResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartCalcBolusTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartCalcBolusTask.java index fef331a872..41e3fabe67 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartCalcBolusTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartCalcBolusTask.java @@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusStart; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BolusResponse; import io.reactivex.rxjava3.core.Single; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartNormalBasalTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartNormalBasalTask.java index c0f4b5673f..7edd8b2046 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartNormalBasalTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartNormalBasalTask.java @@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.AapsSchedulers; import info.nightscout.androidaps.plugins.pump.eopatch.ble.PatchStateManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BasalScheduleSetBig; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BasalScheduleSetResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartQuickBolusTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartQuickBolusTask.java index 2ced516cbe..3960c0dc9a 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartQuickBolusTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartQuickBolusTask.java @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.code.BolusExDuration; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusStart; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.ComboBolusStart; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartTempBasalTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartTempBasalTask.java index 82e647c940..6b951bc65f 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartTempBasalTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartTempBasalTask.java @@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.AapsSchedulers; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.TempBasalScheduleStart; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.TempBasalScheduleSetResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopBasalTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopBasalTask.java index bfe4efb0e2..6b5a24eb12 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopBasalTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopBasalTask.java @@ -7,14 +7,14 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.logging.UserEntryLogger; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.Command; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.userEntry.UserEntryMapper; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.UserEntryLogger; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.Command; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.userEntry.UserEntryMapper; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BasalStop; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BasalStopResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopComboBolusTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopComboBolusTask.java index 02ad3fe059..a1d5cc26db 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopComboBolusTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopComboBolusTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusStop; import info.nightscout.androidaps.plugins.pump.eopatch.core.code.PatchBleResultCode; import info.nightscout.androidaps.plugins.pump.eopatch.core.define.IPatchConstant; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopExtBolusTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopExtBolusTask.java index 40e9914cf5..a62b89a4f4 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopExtBolusTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopExtBolusTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusStop; import info.nightscout.androidaps.plugins.pump.eopatch.core.define.IPatchConstant; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BolusStopResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopNowBolusTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopNowBolusTask.java index 3e4514b5a1..8a5957b17c 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopNowBolusTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopNowBolusTask.java @@ -5,8 +5,8 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.AapsSchedulers; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusStop; import info.nightscout.androidaps.plugins.pump.eopatch.core.define.IPatchConstant; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BolusStopResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopTempBasalTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopTempBasalTask.java index 528635d3a8..71bc381216 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopTempBasalTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopTempBasalTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.TempBasalScheduleStop; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.PatchBooleanResponse; import io.reactivex.rxjava3.core.Single; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskBase.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskBase.java index 90a3570328..923f2e9ece 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskBase.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskBase.java @@ -5,7 +5,7 @@ import java.util.HashMap; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.AAPSLogger; import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.Patch; import info.nightscout.androidaps.plugins.pump.eopatch.core.exception.NoActivatedPatchException; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskQueue.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskQueue.java index 16fad1b83c..2285d72745 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskQueue.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/TaskQueue.java @@ -7,9 +7,9 @@ import java.util.Queue; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.AapsSchedulers; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/UpdateConnectionTask.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/UpdateConnectionTask.java index 89eb09b008..b579f2e3f3 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/UpdateConnectionTask.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/UpdateConnectionTask.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.eopatch.ble.PatchStateManager; import info.nightscout.androidaps.plugins.pump.eopatch.core.api.UpdateConnection; import info.nightscout.androidaps.plugins.pump.eopatch.core.response.UpdateConnectionResponse; diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/event/EoPatchEvents.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/event/EoPatchEvents.kt index 027f13236f..3c83b214b2 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/event/EoPatchEvents.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/event/EoPatchEvents.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.event import androidx.annotation.StringRes import androidx.fragment.app.DialogFragment -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode class EventEoPatchAlarm(var alarmCodes: Set, var isFirst: Boolean = false) : Event() diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/ObservableExtension.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/ObservableExtension.kt index e96722f237..ffe885593b 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/ObservableExtension.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/ObservableExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.extension -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Observable diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/SingleExtension.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/SingleExtension.kt index 88d40adf47..235232f2b6 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/SingleExtension.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/extension/SingleExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.extension -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Single diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt index 5c14d97201..d2c7aaeaa1 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt @@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui import android.os.Bundle import androidx.appcompat.app.AlertDialog -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode import info.nightscout.androidaps.plugins.pump.eopatch.event.EventDialog import info.nightscout.androidaps.plugins.pump.eopatch.event.EventProgressDialog diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt index 70ff795754..f5a3546040 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt @@ -7,7 +7,7 @@ import androidx.annotation.LayoutRes import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.AapsSchedulers import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchPluginQualifier import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt index ed745306c9..d6fb052607 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt @@ -6,9 +6,9 @@ import android.view.View import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.support.DaggerAppCompatActivity import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.code.EventType diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/ActivationNotCompleteDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/ActivationNotCompleteDialog.kt index fc87d41acc..4dfbff02cb 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/ActivationNotCompleteDialog.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/ActivationNotCompleteDialog.kt @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.support.DaggerDialogFragment import info.nightscout.androidaps.plugins.pump.eopatch.bindingadapters.setOnSafeClickListener import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt index e0935b2ed9..9f3811b5c8 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt @@ -8,11 +8,11 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerDialogFragment import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmProcess diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt index 26acf5623a..014ef999e7 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import dagger.android.support.DaggerDialogFragment import info.nightscout.androidaps.plugins.pump.eopatch.R import javax.inject.Inject diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt index b2791410ee..b52cd5a5f3 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt @@ -3,15 +3,15 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchViewModel.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchViewModel.kt index 62538099f1..f5e6626b19 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchViewModel.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchViewModel.kt @@ -5,11 +5,11 @@ import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.CommonUtils import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.RxAction diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/Alarms.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/Alarms.kt index ea708b20dd..f69c00d570 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/Alarms.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/Alarms.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.GsonHelper import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode import info.nightscout.androidaps.plugins.pump.eopatch.code.SettingKeys diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/BolusCurrent.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/BolusCurrent.kt index 4168d58cb9..88d4c04471 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/BolusCurrent.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/BolusCurrent.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.AppConstant import info.nightscout.androidaps.plugins.pump.eopatch.GsonHelper import info.nightscout.androidaps.plugins.pump.eopatch.code.SettingKeys diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/IPreference.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/IPreference.kt index 9ecbbd527a..f9cad5756c 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/IPreference.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/IPreference.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import io.reactivex.rxjava3.core.Observable interface IPreference { diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/NormalBasalManager.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/NormalBasalManager.kt index 7cf4bb812d..b56493fbc4 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/NormalBasalManager.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/NormalBasalManager.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.CommonUtils import info.nightscout.androidaps.plugins.pump.eopatch.GsonHelper import info.nightscout.androidaps.plugins.pump.eopatch.code.BasalStatus diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchConfig.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchConfig.kt index 01dcc4acd4..550fed78d1 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchConfig.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchConfig.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.android.gms.common.internal.Preconditions import info.nightscout.androidaps.plugins.pump.eopatch.AppConstant import info.nightscout.androidaps.plugins.pump.eopatch.CommonUtils diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchState.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchState.kt index f7a4cea114..f4b76cdf56 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchState.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/PatchState.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.eopatch.AppConstant import info.nightscout.androidaps.plugins.pump.eopatch.GsonHelper import info.nightscout.androidaps.plugins.pump.eopatch.code.SettingKeys diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/TempBasalManager.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/TempBasalManager.kt index e6bcdee171..51a8f6baea 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/TempBasalManager.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/vo/TempBasalManager.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.vo -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.common.base.Preconditions import info.nightscout.androidaps.plugins.pump.eopatch.CommonUtils import info.nightscout.androidaps.plugins.pump.eopatch.GsonHelper diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt index f11ebe6209..67d626e5eb 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt @@ -9,23 +9,23 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.WarnColors -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.rx.events.EventRefreshButtonState -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.WarnColors +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.rx.events.EventRefreshButtonState +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState @@ -275,7 +275,7 @@ class MedtronicFragment : DaggerFragment() { } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) { if (min < 60) { - binding.lastConnection.text = rh.gs(app.aaps.interfaces.R.string.minago, min) + binding.lastConnection.text = rh.gs(app.aaps.core.interfaces.R.string.minago, min) } else if (min < 1440) { val h = (min / 60).toInt() binding.lastConnection.text = (rh.gq(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R.plurals.duration_hours, h, h) + " " diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt index 29bc5f8643..c643520267 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt @@ -7,34 +7,34 @@ import android.os.IBinder import android.os.SystemClock import androidx.preference.Preference import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.PumpSync.TemporaryBasalType -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.pump.actions.CustomActionType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshButtonState -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.rx.events.EventSWRLStatus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpSync.TemporaryBasalType +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshButtonState +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.rx.events.EventSWRLStatus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt index e2dca53d55..cbb35f6529 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm import android.os.SystemClock -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.PumpType import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt index 3bb21b2a62..53734a2d88 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.PumpType import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt index cd6ebd67a5..2bd28b815d 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.pump.common.utils.StringUtil import org.apache.commons.lang3.StringUtils diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt index 749b5733eb..c1aeb9e600 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.common.utils.CRC import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.pump.common.utils.ByteUtil diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt index c237b914a4..4ca8e4fca3 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms.CGMSHistoryEntryType.Companion.getByCode diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt index a16fa9618b..2efd85cb9d 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType.Companion.getByCode diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt index c282d2e342..eee75ce9aa 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.core.utils.DateTimeUtil /** diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt index df351380ce..6e1eccd746 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.message -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType import info.nightscout.pump.common.utils.ByteUtil diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt index e15907a6f8..40e44fade2 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt index 4ea293421f..647ea54ede 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt index ff79855571..add2018d90 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt index 7867f4ee22..1562d13407 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt @@ -1,16 +1,16 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction import com.google.gson.Gson import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt index 7a74d85e95..bc8d249968 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.PumpType import com.google.gson.annotations.Expose import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.pump.common.utils.ByteUtil diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt index e6cb7f66e6..0a4caf5e3b 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import org.joda.time.LocalTime import java.util.Locale diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt index 40e1bfbfa1..549833db38 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt index 9476a44e83..92c66e22d0 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.pump.common.defs.TempBasalPair import info.nightscout.pump.common.utils.ByteUtil diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt index 4edd974d3a..bac3452444 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType import info.nightscout.core.utils.DateTimeUtil diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt index d0b59534b7..734bf333e6 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.defs -import app.aaps.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.actions.CustomActionType /** * Created by andy on 11/3/18. diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt index 1e6e5c89d2..809e6a2d58 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.defs -import app.aaps.interfaces.notifications.Notification +import app.aaps.core.interfaces.notifications.Notification import info.nightscout.androidaps.plugins.pump.medtronic.R /** diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt index 4519abdefb..0c29f38e8d 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt @@ -11,7 +11,7 @@ import android.widget.Spinner import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.DaggerActivity import info.nightscout.androidaps.plugins.pump.medtronic.R import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt index 025c9e802f..622c57d7b4 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt @@ -1,10 +1,10 @@ package info.nightscout.androidaps.plugins.pump.medtronic.driver import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt index 0bd996f73d..b01c5a4b5f 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.androidaps.plugins.pump.medtronic.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventMedtronicPumpConfigurationChanged : Event() diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt index 8dc5581c69..24fcd8f5ca 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.androidaps.plugins.pump.medtronic.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventMedtronicPumpValuesChanged : Event() diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt index 2cbfc1c450..b6f90398b2 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.content.res.Configuration import android.os.Binder import android.os.IBinder -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt index 0bfbf0fb35..b83f8902af 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt @@ -1,11 +1,11 @@ package info.nightscout.androidaps.plugins.pump.medtronic.util -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.ui.UiInteraction import com.google.gson.Gson import com.google.gson.GsonBuilder import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt index 99d2552564..03cfe9d431 100644 --- a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt +++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.medtronic -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt index af798675df..3df24ebad4 100644 --- a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt +++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm import android.util.Log -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicTestBase import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt index 8999bda475..9d3cd74fef 100644 --- a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt +++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.ui.UiInteraction import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicTestBase import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt index 8c6168ab4d..d36c40d1ba 100644 --- a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt +++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.ui.UiInteraction import com.google.gson.Gson import com.google.gson.internal.LinkedTreeMap import com.google.gson.reflect.TypeToken diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt index cc22262086..f0982d19b5 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt @@ -13,39 +13,39 @@ import androidx.preference.ListPreference import androidx.preference.PreferenceFragmentCompat import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Medtrum -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.pump.actions.CustomActionType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.queue.CustomCommand -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Medtrum +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt index 8942f2a611..48cba7b7a9 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt @@ -1,18 +1,18 @@ package info.nightscout.pump.medtrum import android.util.Base64 -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.pump.medtrum.code.ConnectionState import info.nightscout.pump.medtrum.comm.enums.AlarmSetting import info.nightscout.pump.medtrum.comm.enums.AlarmState diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/ActivatePacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/ActivatePacket.kt index 60be31597e..9638ceb7c1 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/ActivatePacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/ActivatePacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.stats.TddCalculator import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.BasalType diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/AuthorizePacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/AuthorizePacket.kt index 9b41157610..8c4dc0a9f7 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/AuthorizePacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/AuthorizePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.CommandType.AUTH_REQ diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/CancelTempBasalPacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/CancelTempBasalPacket.kt index 009b435ffa..b729d6b1e9 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/CancelTempBasalPacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/CancelTempBasalPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.BasalType diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacket.kt index a5116f132c..75fac9a5c4 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacket.kt @@ -1,11 +1,11 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.BasalEndReason diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/MedtrumPacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/MedtrumPacket.kt index 37516b8434..9033116b08 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/MedtrumPacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/MedtrumPacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.extension.toInt import javax.inject.Inject diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacket.kt index 85c1a96e4a..cc3d1c9178 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacket.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.AlarmState diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTempBasalPacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTempBasalPacket.kt index 45611d8751..0533fc8b6b 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTempBasalPacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTempBasalPacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.BasalType diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTimeZonePacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTimeZonePacket.kt index 3a442f41f2..d104d0881b 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTimeZonePacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SetTimeZonePacket.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.CommandType.SET_TIME_ZONE diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SynchronizePacket.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SynchronizePacket.kt index 09b752d9e8..97e8d15222 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SynchronizePacket.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/SynchronizePacket.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LTag import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.comm.enums.CommandType.SYNCHRONIZE diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt index 010dca674e..9076e0a521 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt @@ -22,8 +22,8 @@ import android.os.Handler import android.os.HandlerThread import android.os.SystemClock import androidx.core.app.ActivityCompat -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.comm.ManufacturerData import info.nightscout.pump.medtrum.comm.ReadDataPacket diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt index 4742c5e6c9..dc247ca830 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt @@ -7,31 +7,31 @@ import android.os.Binder import android.os.IBinder import android.os.SystemClock import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.BolusProgressData -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPlugin diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt index b3037db85a..fb2eeba19b 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.databinding.FragmentMedtrumActivateCompleteBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt index 4f44287b34..44093b2456 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt index 5b585f206f..1fb4dcd6ef 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt index a0b23c89a9..11976db381 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt @@ -7,7 +7,7 @@ import androidx.annotation.LayoutRes import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.AapsSchedulers import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.medtrum.di.MedtrumPluginQualifier import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt index b2f77d65c8..df9a3086b8 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt index 02ddd267ee..7ec12d9c6e 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt @@ -3,8 +3,8 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.databinding.FragmentMedtrumDeactivationCompleteBinding import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt index 5a9ad931c1..cc2d0ffab2 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt @@ -3,10 +3,10 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt index 7c8b098fe8..5c30a5405f 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt index 1c6d4a05b3..181391392f 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt @@ -3,8 +3,8 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPreparePatchBinding import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt index 3977f038bb..aa5660dc78 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt index 6beba5ce6d..54f473376f 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt index 0a0c5dced1..bc6fb43876 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt index e3ccebe015..7145e25c22 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt index 129e11c441..fafa37e183 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt index 34961efeaa..b743d9aaf4 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt @@ -3,9 +3,9 @@ package info.nightscout.pump.medtrum.ui import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt index 7a54152308..0697b710dc 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt @@ -1,13 +1,13 @@ package info.nightscout.pump.medtrum.ui.viewmodel import androidx.lifecycle.LiveData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.R @@ -179,7 +179,7 @@ class MedtrumOverviewViewModel @Inject constructor( if (medtrumPump.lastConnection != 0L) { val agoMilliseconds = System.currentTimeMillis() - medtrumPump.lastConnection val agoMinutes = agoMilliseconds / 1000 / 60 - _lastConnectionMinAgo.postValue(rh.gs(app.aaps.interfaces.R.string.minago, agoMinutes)) + _lastConnectionMinAgo.postValue(rh.gs(app.aaps.core.interfaces.R.string.minago, agoMinutes)) } if (medtrumPump.lastBolusTime != 0L) { val agoMilliseconds = System.currentTimeMillis() - medtrumPump.lastBolusTime diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt index d75839c2e1..a5e38c7c22 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt @@ -3,10 +3,10 @@ package info.nightscout.pump.medtrum.ui.viewmodel import android.os.SystemClock import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.R diff --git a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt index 83f78e41af..a59124713a 100644 --- a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt +++ b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt @@ -2,11 +2,11 @@ package info.nightscout.pump.medtrum import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.utils.T import info.nightscout.pump.medtrum.comm.enums.BasalType import info.nightscout.pump.medtrum.util.MedtrumSnUtil import org.json.JSONObject diff --git a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumTestBase.kt b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumTestBase.kt index f9fc59df69..49f842dccd 100644 --- a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumTestBase.kt +++ b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumTestBase.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.medtrum -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.TemporaryBasalStorage -import app.aaps.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.TemporaryBasalStorage +import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.shared.tests.TestBaseWithProfile import org.junit.jupiter.api.BeforeEach import org.mockito.Mock diff --git a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacketTest.kt b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacketTest.kt index b30c0adbce..3b062a2770 100644 --- a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacketTest.kt +++ b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetRecordPacketTest.kt @@ -1,9 +1,9 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.DetailedBolusInfoStorage -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.utils.T import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumTestBase diff --git a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacketTest.kt b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacketTest.kt index 374214d0cb..7e17be2c76 100644 --- a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacketTest.kt +++ b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacketTest.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.medtrum.comm.packets -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumTestBase diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java index 42bd94ca4c..b0cb84e3dc 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandDeactivatePod implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt index f172687cfa..552b4a026e 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command -import app.aaps.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.queue.CustomCommand class CommandDisableSuspendAlerts : CustomCommand { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java index 096e1b4970..bd0eaec3f7 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandHandleTimeChange implements CustomCommand { private final boolean requestedByUser; diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java index b9c3998bcd..fb943627e2 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public class CommandPlayTestBeep implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java index ca0c1cbfe7..e8ccc0e03b 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandResumeDelivery implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java index ab386416ac..46338a5ec7 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandSilenceAlerts implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java index ba90112e49..cb18cf3ca3 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandSuspendDelivery implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java index c88fe2a406..9a8bb0bedf 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandUpdateAlertConfiguration implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt index 0b60989e37..a3d8ade1cb 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector abstract class InitializePodViewModel( diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt index b61f94c29a..45e80088c0 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector abstract class InsertCannulaViewModel( diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt index 3a05842f28..6d6797be83 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt index f35e7c28cf..0010d26517 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt @@ -8,7 +8,7 @@ import android.widget.ImageView import android.widget.ProgressBar import android.widget.TextView import androidx.annotation.LayoutRes -import app.aaps.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.extensions.toVisibility import info.nightscout.androidaps.plugins.pump.omnipod.common.R import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt index 483a6ff541..9021b859d0 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt @@ -9,7 +9,7 @@ import androidx.annotation.IdRes import androidx.annotation.LayoutRes import androidx.annotation.StringRes import androidx.navigation.fragment.findNavController -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.omnipod.common.R import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonWizardBaseFragmentBinding diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt index 15b3329a33..330c7d04cc 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt @@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common. import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt index 9714577a9a..0bafddf91c 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt index 2815daabf8..d317324fa6 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventOmnipodDashPumpValuesChanged : Event() diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt index f998748c9c..213d0ef7b9 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt @@ -4,44 +4,44 @@ import android.os.Handler import android.os.HandlerThread import android.text.format.DateFormat import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.OwnDatabasePlugin -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.OmnipodDash -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.actions.CustomAction -import app.aaps.interfaces.pump.actions.CustomActionType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.Command -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.queue.CustomCommand -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventRefreshOverview -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.Round -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.OmnipodDash +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.actions.CustomAction +import app.aaps.core.interfaces.pump.actions.CustomActionType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.Command +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.queue.CustomCommand +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt index 67d8e223e0..d4059e5240 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.di import android.content.Context -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import dagger.Module import dagger.Provides import dagger.Reusable diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt index 7c6db3d1cb..6186d7634b 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt @@ -1,10 +1,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver import android.os.SystemClock -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.utils.Round import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.DeactivateCommand diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt index 59f5313021..e37b1703fb 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt @@ -3,9 +3,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothManager import android.content.Context -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.BusyException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ConnectException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotSendCommandException diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt index 3a896f11da..3e6fbfbf1a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt @@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ConnectException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt index b90a8a18e4..92f0d14f9c 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt @@ -5,8 +5,8 @@ import android.bluetooth.BluetoothGattCallback import android.bluetooth.BluetoothGattCharacteristic import android.bluetooth.BluetoothGattDescriptor import android.bluetooth.BluetoothProfile -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType.Companion.byValue import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.IncomingPackets import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.DisconnectHandler diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt index 0246b443e0..08e7f81707 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket import info.nightscout.core.utils.toHex import org.spongycastle.crypto.engines.AESEngine diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt index ef1464b334..da41502c48 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt @@ -5,8 +5,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic import android.bluetooth.BluetoothGattDescriptor -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.WriteConfirmationError import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.WriteConfirmationSuccess diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt index 69181543e0..b0b6b90fa7 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManagerImpl import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommand diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt index 5c0363ea38..e806b67d0a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks import java.util.concurrent.BlockingQueue diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt index 0a41ab1d01..921bd5e302 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommand import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandAbort import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandCTS diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt index 86ba723fe1..f19171df6e 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt index 2dbe06c220..ae6739517c 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.PairingException diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt index 7c6a2c4c19..a2dea8ffa4 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt @@ -4,8 +4,8 @@ import android.bluetooth.BluetoothAdapter import android.bluetooth.le.ScanFilter import android.bluetooth.le.ScanSettings import android.os.ParcelUuid -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanFailFoundTooManyException import java.util.Arrays diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt index 0e646ff1ae..df58a5b01d 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt @@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan import android.bluetooth.le.ScanCallback import android.bluetooth.le.ScanResult -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanException import java.util.Collections import java.util.concurrent.ConcurrentHashMap diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt index fcabe4c310..94b933afb2 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt @@ -6,10 +6,10 @@ import android.bluetooth.BluetoothManager import android.bluetooth.BluetoothProfile import android.content.Context import android.os.SystemClock -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.ServiceDiscoverer import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt index 59ea99b842..08b0d4ccc3 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException import info.nightscout.core.utils.toHex import java.nio.ByteBuffer diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt index 6c03ae2d81..8865598ca8 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import android.annotation.SuppressLint -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.core.utils.toHex import org.spongycastle.util.encoders.Hex import java.security.SecureRandom diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt index 4afb6efb2d..374afe28e4 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.EnDecrypt import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotParseResponseException diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt index b30fad4cdd..8d6074d7d4 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.Nonce import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.SessionEstablishmentException diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt index 17950b493d..8872a82cc5 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state -import app.aaps.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfo import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair.PairResult import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt index 45b18162f3..b56360f11b 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt @@ -1,12 +1,12 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state import android.os.SystemClock -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.Round import com.google.gson.Gson import info.nightscout.androidaps.plugins.pump.omnipod.dash.EventOmnipodDashPumpValuesChanged import info.nightscout.androidaps.plugins.pump.omnipod.dash.R diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt index 6f3537d1fb..d9e2d1e16c 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.history -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType.SET_BOLUS import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType.SET_TEMPORARY_BASAL diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt index 3595967b70..e1eb81b730 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo sealed class Record diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt index 844a41c027..759fe5081b 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database import androidx.room.TypeConverter -import app.aaps.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile import com.google.gson.GsonBuilder import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusType diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt index 2270179773..a2e2ceab86 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt @@ -11,11 +11,11 @@ import android.widget.Spinner import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.dash.R import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt index 20536b03c0..bfd298cb08 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt @@ -4,14 +4,14 @@ import android.content.Context import android.content.Intent import android.os.Bundle import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt index 2b0c17046f..fd588549d7 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt @@ -9,22 +9,22 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewPodInfoBinding diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt index 072c486083..1c02b3f9eb 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation import android.os.Bundle -import app.aaps.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.pump.BlePreCheck import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity import javax.inject.Inject diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt index 09b1930969..70568b1388 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt @@ -1,12 +1,12 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action import androidx.annotation.StringRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt index 07d8f06b38..ca94c110ae 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt @@ -2,19 +2,19 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activatio import androidx.annotation.StringRes import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt index 73c2582a15..9f1f4cc90a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt @@ -1,14 +1,14 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.action import androidx.annotation.StringRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.R import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt index cc9105523b..ba0e631a1e 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.util -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.defs.PumpType import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram import kotlin.math.roundToInt diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt index c0a371c7d3..3ec527e27a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.util -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.androidaps.plugins.pump.omnipod.dash.R import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.FailedToConnectException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.NotConnectedException diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt index 5bc89fc2cd..e54016f79a 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair -import app.aaps.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Config import app.aaps.shared.tests.AAPSLoggerTest import app.aaps.shared.tests.TestBase import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt index 013b1de8d0..55629fc0c3 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session -import app.aaps.interfaces.configuration.Config +import app.aaps.core.interfaces.configuration.Config import app.aaps.shared.tests.AAPSLoggerTest import app.aaps.shared.tests.TestBase import info.nightscout.core.utils.toHex diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt index 427ff9acdc..52ebcf240b 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.util -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.Profile.ProfileValue +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile.ProfileValue import com.google.common.truth.Truth.assertThat import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram import org.junit.jupiter.api.Assertions diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java index dd4d177d6a..42896d00fe 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java @@ -31,43 +31,43 @@ import javax.inject.Inject; import javax.inject.Singleton; import app.aaps.core.main.utils.fabric.FabricPrivacy; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.plugin.OwnDatabasePlugin; -import app.aaps.interfaces.plugin.PluginDescription; -import app.aaps.interfaces.plugin.PluginType; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.profile.ProfileFunction; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.OmnipodEros; -import app.aaps.interfaces.pump.Pump; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpPluginBase; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.actions.CustomActionType; -import app.aaps.interfaces.pump.defs.ManufacturerType; -import app.aaps.interfaces.pump.defs.PumpDescription; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.queue.Callback; -import app.aaps.interfaces.queue.CommandQueue; -import app.aaps.interfaces.queue.CustomCommand; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventAppExit; -import app.aaps.interfaces.rx.events.EventAppInitialized; -import app.aaps.interfaces.rx.events.EventDismissNotification; -import app.aaps.interfaces.rx.events.EventPreferenceChange; -import app.aaps.interfaces.rx.events.EventRefreshOverview; -import app.aaps.interfaces.rx.events.EventSWRLStatus; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.DateUtil; -import app.aaps.interfaces.utils.DecimalFormatter; -import app.aaps.interfaces.utils.Round; -import app.aaps.interfaces.utils.T; -import app.aaps.interfaces.utils.TimeChangeType; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.plugin.OwnDatabasePlugin; +import app.aaps.core.interfaces.plugin.PluginDescription; +import app.aaps.core.interfaces.plugin.PluginType; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.profile.ProfileFunction; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.OmnipodEros; +import app.aaps.core.interfaces.pump.Pump; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpPluginBase; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.actions.CustomActionType; +import app.aaps.core.interfaces.pump.defs.ManufacturerType; +import app.aaps.core.interfaces.pump.defs.PumpDescription; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.queue.Callback; +import app.aaps.core.interfaces.queue.CommandQueue; +import app.aaps.core.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventAppExit; +import app.aaps.core.interfaces.rx.events.EventAppInitialized; +import app.aaps.core.interfaces.rx.events.EventDismissNotification; +import app.aaps.core.interfaces.rx.events.EventPreferenceChange; +import app.aaps.core.interfaces.rx.events.EventRefreshOverview; +import app.aaps.core.interfaces.rx.events.EventSWRLStatus; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.DecimalFormatter; +import app.aaps.core.interfaces.utils.Round; +import app.aaps.core.interfaces.utils.T; +import app.aaps.core.interfaces.utils.TimeChangeType; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java index 2dc8b5fff8..daa624cc05 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java @@ -4,7 +4,7 @@ import org.joda.time.LocalDateTime; import javax.inject.Inject; -import app.aaps.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.resources.ResourceHelper; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.kt index e903b923fb..89fe7c6b75 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.MessageBlock import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.AssignAddressCommand diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java index 7cceecb705..7fb107f1ee 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java @@ -4,7 +4,7 @@ import org.joda.time.DateTime; import java.util.Collections; -import app.aaps.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.AAPSLogger; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetupPodCommand; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.VersionResponse; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java index 504fa0c983..ff2d4aaa11 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.CancelDeliveryCommand; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.GetStatusCommand; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java index 796a44b270..49044972d7 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java @@ -19,8 +19,8 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.OmnipodMessage; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusUpdatableResponse; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoDetailedStatus; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java index 0f0931f3bd..ebb5854c6c 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java @@ -11,9 +11,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Supplier; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.rx.AapsSchedulers; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.AcknowledgeAlertsAction; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.AssignAddressAction; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.BolusAction; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt index a70c64b913..4094ceef37 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.event -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event /** * Created by andy on 04.06.2018. diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt index be816d5c6e..c3c89ae226 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.event -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event /** * Created by andy on 04.06.2018. diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt index 89d8e6d862..de835f6125 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.event -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event /** * Created by andy on 04.06.2018. diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt index 7566ff27da..3ac26fb9ce 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.event -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event /** * Created by andy on 04.06.2018. diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt index bda0484cde..248792f4cc 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.event -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event /** * Created by andy on 04.06.2018. diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/DetailedBolusInfoExtension.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/DetailedBolusInfoExtension.kt index d51dfa4cdf..dc70102041 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/DetailedBolusInfoExtension.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/DetailedBolusInfoExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.extensions -import app.aaps.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.DetailedBolusInfo import com.google.gson.Gson fun DetailedBolusInfo.toJsonString(): String = Gson().toJson(this) diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/PumpStateExtension.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/PumpStateExtension.kt index 6d89a2d92a..e84bd7cafa 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/PumpStateExtension.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/extensions/PumpStateExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.extensions -import app.aaps.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpSync import kotlin.math.ceil import kotlin.math.max diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java index 65d12b0847..069b581286 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java @@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventDismissNotification; -import app.aaps.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventDismissNotification; +import app.aaps.core.interfaces.sharedPreferences.SP; import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodErosStorageKeys; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager; import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosActiveAlertsChanged; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java index 688ae7d323..3638f34a98 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java @@ -13,24 +13,24 @@ import java.util.function.Supplier; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.notifications.Notification; -import app.aaps.interfaces.profile.Profile; -import app.aaps.interfaces.pump.DetailedBolusInfo; -import app.aaps.interfaces.pump.PumpEnactResult; -import app.aaps.interfaces.pump.PumpSync; -import app.aaps.interfaces.pump.defs.PumpType; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.AapsSchedulers; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.Event; -import app.aaps.interfaces.rx.events.EventDismissNotification; -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress; -import app.aaps.interfaces.rx.events.EventRefreshOverview; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.ui.UiInteraction; -import app.aaps.interfaces.utils.T; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.notifications.Notification; +import app.aaps.core.interfaces.profile.Profile; +import app.aaps.core.interfaces.pump.DetailedBolusInfo; +import app.aaps.core.interfaces.pump.PumpEnactResult; +import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.interfaces.pump.defs.PumpType; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.AapsSchedulers; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.Event; +import app.aaps.core.interfaces.rx.events.EventDismissNotification; +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress; +import app.aaps.core.interfaces.rx.events.EventRefreshOverview; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.ui.UiInteraction; +import app.aaps.core.interfaces.utils.T; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType; import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java index 48e7660fc3..d3707a4e73 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandGetPodStatus implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java index 11517a8f3a..a1f68a5d09 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command; import org.jetbrains.annotations.NotNull; -import app.aaps.interfaces.queue.CustomCommand; +import app.aaps.core.interfaces.queue.CustomCommand; public final class CommandReadPulseLog implements CustomCommand { @NotNull @Override public String getStatusDescription() { diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java index cc0f9a3c8a..ffff60d8a3 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java @@ -8,7 +8,7 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java index bfc284e9f8..7a5207fe66 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java @@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils; import javax.inject.Inject; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt index e5f9f08c1d..b5544a5ef4 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt @@ -12,11 +12,11 @@ import android.widget.Spinner import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.profile.Profile.ProfileValue -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.profile.Profile.ProfileValue +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.androidaps.plugins.pump.omnipod.eros.R import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt index b6063e59fd..407861fa5a 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt @@ -6,15 +6,15 @@ import android.os.Bundle import android.os.Handler import android.os.HandlerThread import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt index b7010a8634..c30f2caae8 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt @@ -9,21 +9,21 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Constants -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissNotification -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.rx.events.EventQueueChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Constants +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissNotification +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.rx.events.EventQueueChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt index 089f23a763..d570028b25 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.action import androidx.annotation.StringRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel import info.nightscout.androidaps.plugins.pump.omnipod.eros.R diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt index ced7b3dd11..f5731cd498 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt @@ -1,10 +1,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.action import androidx.annotation.StringRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt index d5b183c680..ea5a48ff1b 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt @@ -1,11 +1,11 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.viewmodel.action import androidx.annotation.StringRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.rx.AapsSchedulers import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.R import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java index 66a7552bb9..58792efb66 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java @@ -16,7 +16,7 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.resources.ResourceHelper; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertType; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java index d6c07dad45..a6f956041d 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java @@ -5,7 +5,7 @@ import org.joda.time.Duration; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.sharedPreferences.SP; import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodErosStorageKeys; import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants; diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt index bc61e9afde..cc4a74bb26 100644 --- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt +++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt @@ -1,13 +1,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.rx.TestAapsSchedulers import dagger.android.AndroidInjector diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.kt index 9d128d86d1..319949317b 100644 --- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.kt +++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.Profile.ProfileValue +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile.ProfileValue import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager import org.joda.time.Duration import org.junit.jupiter.api.Assertions diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt index 5e981086ed..8880aa2ae6 100644 --- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt +++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.tests.TestBase import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt index 6bfd0fd002..4fa4621620 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt @@ -5,31 +5,31 @@ import android.content.Intent import android.content.ServiceConnection import android.text.format.DateFormat import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.constraints.PluginConstraints -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.PumpSync.TemporaryBasalType -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventAppExit -import app.aaps.interfaces.rx.events.EventCustomActionsChanged -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.constraints.PluginConstraints +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.PumpSync.TemporaryBasalType +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventAppExit +import app.aaps.core.interfaces.rx.events.EventCustomActionsChanged +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter import com.google.gson.Gson import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt index 30acbfc4ad..f130bfb76d 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt @@ -4,11 +4,11 @@ import android.bluetooth.BluetoothDevice import android.content.Context import android.content.Intent import androidx.annotation.StringRes -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.gson.Gson import dagger.android.DaggerBroadcastReceiver import info.nightscout.core.utils.extensions.safeGetParcelableExtra diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt index 553eadcf01..5e5f930c7b 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.data -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.pump.defs.PumpType import info.nightscout.pump.common.defs.PumpRunningState import java.util.Date diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt index 933f52166a..11a5ffafaa 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt @@ -9,14 +9,14 @@ enum class PumpDriverState(var resourceId: Int) { NotInitialized(R.string.pump_status_not_initialized), // this state should be set only when driver is created Connecting(info.nightscout.core.ui.R.string.connecting), // - Connected(app.aaps.interfaces.R.string.connected), // + Connected(app.aaps.core.interfaces.R.string.connected), // Initialized(R.string.pump_status_initialized), // this is weird state that probably won't be used, since its more driver centric that communication centric EncryptCommunication(R.string.pump_status_encrypt), // Ready(R.string.pump_status_ready), Busy(R.string.pump_status_busy), // Suspended(R.string.pump_status_suspended), // ExecutingCommand(R.string.pump_status_executing_command), - Disconnecting(app.aaps.interfaces.R.string.disconnecting), + Disconnecting(app.aaps.core.interfaces.R.string.disconnecting), Disconnected(info.nightscout.core.ui.R.string.disconnected); fun isConnected(): Boolean = this == Connected || this == Initialized || this == Busy || this == Suspended diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt index 0c1782d3cb..c03747dda1 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.defs -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.pump.common.R import kotlin.streams.toList diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt index 1cdcf65a25..61689bcfe9 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.common.di -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.Module import dagger.Provides import info.nightscout.pump.common.sync.PumpSyncStorage diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt index 8c4e44c5e2..13aca89b75 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt @@ -5,11 +5,11 @@ import android.bluetooth.le.ScanFilter import android.bluetooth.le.ScanSettings import android.content.Context import android.widget.Toast -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.pump.common.R abstract class PumpBLESelectorAbstract( diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt index fb0f6cb08d..59a5d4f6c5 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.driver.history -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.pump.common.defs.PumpHistoryEntryGroup interface PumpHistoryEntry { diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt index 5d14e0a90b..9d7c389d59 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventBondChanged( var connectionAddress: String, diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt index b437f40c34..2926cf193f 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventPumpChanged( var serialNumber: String, diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt index cbfeba1eb9..a3a51f2aa3 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.common.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event class EventPumpConnectionParametersChanged : Event() \ No newline at end of file diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt index 6b1496da0b..34d114cedc 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.events -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.rx.events.Event import info.nightscout.pump.common.defs.PumpUpdateFragmentType class EventPumpFragmentValuesChanged : Event { diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt index 80a3b8e6a1..ffc4401cd5 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.common.sync -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType // data class PumpDbEntry constructor(var temporaryId: Long, // var date: Long, diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt index 1c133e50fa..2478a17e68 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.common.sync -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.pump.defs.PumpType interface PumpSyncEntriesCreator { diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt index b7ad416e71..8bb06a7ad9 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt @@ -1,11 +1,11 @@ package info.nightscout.pump.common.sync import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.sharedPreferences.SP import com.thoughtworks.xstream.XStream import com.thoughtworks.xstream.security.AnyTypePermission import javax.inject.Inject diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt index 3c287034c0..a232d4dc2c 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt @@ -19,12 +19,12 @@ import android.widget.AdapterView import android.widget.AdapterView.OnItemClickListener import android.widget.BaseAdapter import android.widget.TextView -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.BlePreCheck -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.pump.common.R diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt index 701519734b..d64b2b6e23 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt @@ -11,9 +11,9 @@ import android.widget.ArrayAdapter import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.common.R import info.nightscout.pump.common.databinding.PumpHistoryActivityBinding diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt index 89a1571208..56f4e9a94e 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt @@ -1,8 +1,8 @@ package info.nightscout.pump.common.utils -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.Profile.ProfileValue -import app.aaps.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.Profile.ProfileValue +import app.aaps.core.interfaces.pump.defs.PumpType import java.util.Locale object ProfileUtil { diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt index 02915d4486..066d62091c 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt @@ -25,12 +25,12 @@ import android.widget.BaseAdapter import android.widget.TextView import android.widget.Toast import androidx.core.app.ActivityCompat -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.pump.BlePreCheck -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.pump.BlePreCheck +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt index 35e22732a9..b5b61141bd 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.common.events import android.content.Context -import app.aaps.interfaces.rx.events.EventStatus +import app.aaps.core.interfaces.rx.events.EventStatus import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java index bce34d333f..49b75232fa 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java @@ -4,11 +4,11 @@ import java.util.Locale; import javax.inject.Inject; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.plugin.ActivePlugin; -import app.aaps.interfaces.sharedPreferences.SP; -import app.aaps.interfaces.utils.Round; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.plugin.ActivePlugin; +import app.aaps.core.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.utils.Round; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java index 22fd2ebacb..4cfbe32ff9 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java @@ -15,7 +15,7 @@ import java.util.UUID; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.AAPSLogger; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.encoding.Encoding4b6b; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.encoding.Encoding4b6bGeoff; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java index 846740b502..b5f6cac780 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java @@ -11,12 +11,12 @@ import java.util.UUID; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; -import app.aaps.interfaces.resources.ResourceHelper; -import app.aaps.interfaces.rx.bus.RxBus; -import app.aaps.interfaces.rx.events.EventRefreshOverview; -import app.aaps.interfaces.sharedPreferences.SP; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; +import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.rx.bus.RxBus; +import app.aaps.core.interfaces.rx.events.EventRefreshOverview; +import app.aaps.core.interfaces.sharedPreferences.SP; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt index ea80548f71..aa273b5fca 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble import android.os.SystemClock -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.BLECommOperationResult diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt index 924ce82e0f..a9638b5d03 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt @@ -15,10 +15,10 @@ import android.content.pm.PackageManager import android.os.Build import android.os.SystemClock import androidx.core.content.ContextCompat -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java index be43360c1a..9e6ff65cdc 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java @@ -4,8 +4,8 @@ import org.apache.commons.lang3.NotImplementedException; import javax.inject.Inject; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java index 3619f0bb81..6b055f60e1 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.encoding; -import app.aaps.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.AAPSLogger; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException; import info.nightscout.pump.common.utils.ByteUtil; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java index ff37096e46..42099af034 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import app.aaps.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.AAPSLogger; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError; import info.nightscout.pump.common.utils.ByteUtil; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java index 23c39f3c09..130ca7302b 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs; import java.util.HashMap; import java.util.Map; -import app.aaps.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.resources.ResourceHelper; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R; public enum RileyLinkEncodingType { diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt index ed8a1470df..b806ded1a0 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt @@ -9,9 +9,9 @@ import android.bluetooth.le.ScanSettings import android.os.Handler import android.os.HandlerThread import android.os.Message -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java index 4ef6b3404c..8f0e10361b 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java @@ -7,8 +7,8 @@ import android.os.SystemClock; import java.util.UUID; import java.util.concurrent.TimeUnit; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java index 3b216cd0e0..448f83495e 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java @@ -7,8 +7,8 @@ import android.os.SystemClock; import java.util.UUID; import java.util.concurrent.TimeUnit; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java index 969ebad26e..8dfbb43a83 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java @@ -7,8 +7,8 @@ import android.os.SystemClock; import java.util.UUID; import java.util.concurrent.TimeUnit; -import app.aaps.interfaces.logging.AAPSLogger; -import app.aaps.interfaces.logging.LTag; +import app.aaps.core.interfaces.logging.AAPSLogger; +import app.aaps.core.interfaces.logging.LTag; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE; /** diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java index c919b11fb5..7e989bcc6a 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data; import org.joda.time.LocalDateTime; -import app.aaps.interfaces.resources.ResourceHelper; +import app.aaps.core.interfaces.resources.ResourceHelper; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice; diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt index 9f0d3a5c41..86bd3e596a 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.resources.ResourceHelper import com.google.android.material.tabs.TabLayoutMediator import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileylinkStatusBinding diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt index 16d1bcd703..d8f4eff251 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileylinkStatusGeneralBinding diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt index 810c59bc21..4454b0a6ce 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt index 5582a45b00..238dce2450 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt @@ -4,8 +4,8 @@ import android.bluetooth.BluetoothAdapter import android.content.Context import android.content.Intent import android.content.IntentFilter -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin import dagger.android.DaggerBroadcastReceiver import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt index 5d77354952..268464ded3 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt @@ -7,10 +7,10 @@ import android.content.IntentFilter import android.os.Handler import android.os.HandlerThread import androidx.localbroadcastmanager.content.LocalBroadcastManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.DaggerBroadcastReceiver import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt index 63fe0a9310..d3ede32cec 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt @@ -4,12 +4,12 @@ import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothManager import android.content.Context import android.content.Intent -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt index 1f670e89d2..4468c3ea9d 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.bus.RxBus import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt index abbadbe91c..c3b1bbf16c 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks -import app.aaps.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.AAPSLogger import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt index 108bf69487..568394bf38 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt @@ -1,11 +1,11 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks import android.content.Context -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.Round import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt index c25d3ab86d..8f87de09e8 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshButtonState +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshButtonState import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy import javax.inject.Inject diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt index 2176540242..51540716b7 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks -import app.aaps.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.plugin.ActivePlugin import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice import javax.inject.Inject diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt index e436a8709f..0ff8e86d43 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.ThreadPoolExecutor diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt index 7e7d54b9cd..8eeab7be1b 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventRefreshButtonState +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventRefreshButtonState import dagger.android.HasAndroidInjector import javax.inject.Inject diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt index 77434113a3..35ee40b0cd 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt @@ -8,19 +8,19 @@ import android.view.View import android.view.ViewGroup import app.aaps.core.main.extensions.toStringFull import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.defs.DoseStepSize -import app.aaps.interfaces.pump.defs.PumpTempBasalType -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.defs.DoseStepSize +import app.aaps.core.interfaces.pump.defs.PumpTempBasalType +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.pump.virtual.databinding.VirtualPumpFragmentBinding import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt index 0c5d184486..3d673c0741 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt @@ -7,37 +7,37 @@ import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.plannedRemainingMinutes import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.notifications.Notification -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.plugin.PluginDescription -import app.aaps.interfaces.plugin.PluginType -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.BolusProgressData -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpPluginBase -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.VirtualPump -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.notifications.Notification +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.plugin.PluginDescription +import app.aaps.core.interfaces.plugin.PluginType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpPluginBase +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import info.nightscout.core.utils.fabric.InstanceId import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/di/VirtualPumpModule.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/di/VirtualPumpModule.kt index 0cb31e4ebb..28da6e32f7 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/di/VirtualPumpModule.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/di/VirtualPumpModule.kt @@ -1,6 +1,6 @@ package info.nightscout.pump.virtual.di -import app.aaps.interfaces.pump.VirtualPump +import app.aaps.core.interfaces.pump.VirtualPump import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/events/EventVirtualPumpUpdateGui.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/events/EventVirtualPumpUpdateGui.kt index c4e42eeb69..33c9ccf81f 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/events/EventVirtualPumpUpdateGui.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/events/EventVirtualPumpUpdateGui.kt @@ -1,5 +1,5 @@ package info.nightscout.pump.virtual.events -import app.aaps.interfaces.rx.events.EventUpdateGui +import app.aaps.core.interfaces.rx.events.EventUpdateGui class EventVirtualPumpUpdateGui : EventUpdateGui() \ No newline at end of file diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt index bad0328670..8361ef781d 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.pump.virtual.extensions -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.resources.ResourceHelper fun PumpEnactResult.toText(rh: ResourceHelper): String { var ret = rh.gs(info.nightscout.core.ui.R.string.success) + ": " + success diff --git a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt index 9586fb10bc..87d569ab52 100644 --- a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt +++ b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt @@ -1,17 +1,17 @@ package info.nightscout.pump.virtual import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.PersistenceLayer -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.PersistenceLayer +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import org.junit.jupiter.api.Assertions diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/di/SharedImplModule.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/di/SharedImplModule.kt index 879bbe84e8..bc831551a0 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/di/SharedImplModule.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/di/SharedImplModule.kt @@ -2,12 +2,12 @@ package app.aaps.shared.impl.di import android.content.Context import androidx.preference.PreferenceManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.L -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.L +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import app.aaps.shared.impl.logging.AAPSLoggerProduction import app.aaps.shared.impl.logging.LImpl import app.aaps.shared.impl.rx.AapsSchedulersImpl diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/AAPSLoggerProduction.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/AAPSLoggerProduction.kt index 961ae68137..02f55f8a70 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/AAPSLoggerProduction.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/AAPSLoggerProduction.kt @@ -1,8 +1,8 @@ package app.aaps.shared.impl.logging -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.L -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.L +import app.aaps.core.interfaces.logging.LTag import org.slf4j.LoggerFactory /** diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/LImpl.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/LImpl.kt index 711eb22ac3..5fc9d95831 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/LImpl.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/logging/LImpl.kt @@ -1,9 +1,9 @@ package app.aaps.shared.impl.logging -import app.aaps.interfaces.logging.L -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.LogElement -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.L +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.LogElement +import app.aaps.core.interfaces.sharedPreferences.SP import javax.inject.Inject import javax.inject.Singleton diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/AapsSchedulersImpl.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/AapsSchedulersImpl.kt index 8943dcbcf9..4ceaa7d271 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/AapsSchedulersImpl.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/AapsSchedulersImpl.kt @@ -1,6 +1,6 @@ package app.aaps.shared.impl.rx -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.AapsSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Scheduler import io.reactivex.rxjava3.schedulers.Schedulers diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt index 9f070aff13..5610ef5c5f 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt @@ -1,11 +1,11 @@ package app.aaps.shared.impl.rx.bus import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.Event +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.Event import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.subjects.PublishSubject import javax.inject.Inject diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/sharedPreferences/SPImplementation.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/sharedPreferences/SPImplementation.kt index eece02b7b8..3c4cf0bb19 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/sharedPreferences/SPImplementation.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/sharedPreferences/SPImplementation.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.content.Context import android.content.SharedPreferences import androidx.annotation.StringRes -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.SafeParse import javax.inject.Inject import javax.inject.Singleton diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt index cd8501ea6d..da6c52e2ba 100644 --- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt +++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt @@ -5,11 +5,11 @@ import android.os.Build import androidx.annotation.RequiresApi import androidx.collection.LongSparseArray import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.R -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.SafeParse -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.R +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.T import org.apache.commons.lang3.time.DateUtils.isSameDay import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat diff --git a/shared/impl/src/test/kotlin/app/aaps/shared/impl/logging/LImplTest.kt b/shared/impl/src/test/kotlin/app/aaps/shared/impl/logging/LImplTest.kt index 7dd44326bd..bcf5c76fc7 100644 --- a/shared/impl/src/test/kotlin/app/aaps/shared/impl/logging/LImplTest.kt +++ b/shared/impl/src/test/kotlin/app/aaps/shared/impl/logging/LImplTest.kt @@ -1,7 +1,7 @@ package app.aaps.shared.impl.logging -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.sharedPreferences.SP import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/AAPSLoggerTest.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/AAPSLoggerTest.kt index 2b801aa0b5..c78a287d5f 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/AAPSLoggerTest.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/AAPSLoggerTest.kt @@ -1,7 +1,7 @@ package app.aaps.shared.tests -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag /** * Created by adrian on 2019-12-27. diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/HardLimitsMock.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/HardLimitsMock.kt index 57683a716a..1222891de4 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/HardLimitsMock.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/HardLimitsMock.kt @@ -1,8 +1,8 @@ package app.aaps.shared.tests -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.HardLimits import javax.inject.Inject import kotlin.math.max import kotlin.math.min diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBase.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBase.kt index 1bec473eab..cc0ca96980 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBase.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBase.kt @@ -1,8 +1,8 @@ package app.aaps.shared.tests import android.annotation.SuppressLint -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.shared.impl.rx.bus.RxBusImpl import app.aaps.shared.tests.rx.TestAapsSchedulers import org.junit.jupiter.api.BeforeEach diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt index 56ce97de9a..f24b275692 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt @@ -4,18 +4,18 @@ import android.content.Context import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.ProfileStore -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.HardLimits +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.ProfileStore +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.HardLimits import app.aaps.shared.impl.utils.DateUtilImpl import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt index ac6f2ca80e..7f8dfe3e1d 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt @@ -1,15 +1,15 @@ package app.aaps.shared.tests import app.aaps.annotations.OpenForTesting -import app.aaps.interfaces.profile.Profile -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.pump.Pump -import app.aaps.interfaces.pump.PumpEnactResult -import app.aaps.interfaces.pump.PumpSync -import app.aaps.interfaces.pump.defs.ManufacturerType -import app.aaps.interfaces.pump.defs.PumpDescription -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.profile.Profile +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.pump.Pump +import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.interfaces.pump.PumpSync +import app.aaps.core.interfaces.pump.defs.ManufacturerType +import app.aaps.core.interfaces.pump.defs.PumpDescription +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.utils.TimeChangeType import dagger.android.HasAndroidInjector import org.json.JSONObject diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/rx/TestAapsSchedulers.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/rx/TestAapsSchedulers.kt index 5e3319fdfa..41b3778ac4 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/rx/TestAapsSchedulers.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/rx/TestAapsSchedulers.kt @@ -1,6 +1,6 @@ package app.aaps.shared.tests.rx -import app.aaps.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.AapsSchedulers import io.reactivex.rxjava3.core.Scheduler import io.reactivex.rxjava3.schedulers.Schedulers diff --git a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt index f65e961d00..129724ba7c 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt @@ -1,7 +1,7 @@ package info.nightscout.ui.activities import android.os.Bundle -import app.aaps.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.sharedPreferences.SP import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction diff --git a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt index 705b91f486..284dc58cb1 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt @@ -8,18 +8,18 @@ import android.widget.ArrayAdapter import android.widget.TextView import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventLocalProfileChanged -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventLocalProfileChanged +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import com.google.android.material.tabs.TabLayout import com.google.common.collect.Lists import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity diff --git a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt index 1a180a948d..d465375182 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt @@ -20,12 +20,12 @@ import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.wizard.QuickWizard import app.aaps.core.main.wizard.QuickWizardEntry -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter diff --git a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt index 80d3ef1fea..0eb28bbe0c 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt @@ -6,12 +6,12 @@ import android.os.Handler import android.os.HandlerThread import android.widget.TextView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.stats.DexcomTirCalculator -import app.aaps.interfaces.stats.TddCalculator -import app.aaps.interfaces.stats.TirCalculator +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.stats.DexcomTirCalculator +import app.aaps.core.interfaces.stats.TddCalculator +import app.aaps.core.interfaces.stats.TirCalculator import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.database.entities.UserEntry.Action diff --git a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt index bbf5ea0ab4..8e6b832426 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt @@ -2,11 +2,11 @@ package info.nightscout.ui.activities import android.os.Bundle import android.widget.ArrayAdapter -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.SafeParse +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.SafeParse import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.fabric.InstanceId diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt index dffc740ba1..5cd62c54bb 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt @@ -15,20 +15,20 @@ import android.widget.TableLayout import android.widget.TableRow import android.widget.TextView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.pump.defs.PumpType -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDanaRSyncStatus -import app.aaps.interfaces.rx.events.EventPumpStatusChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.SafeParse -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDanaRSyncStatus +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.T import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.entities.TotalDailyDose import info.nightscout.database.impl.AppRepository diff --git a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt index e3094f251e..058e317673 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt @@ -3,10 +3,10 @@ package info.nightscout.ui.activities import android.os.Bundle import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper import com.google.android.material.tabs.TabLayout import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.ui.R diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt index 68d26e8534..4b6bb05bb1 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -18,20 +18,20 @@ import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventTreatmentChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventTreatmentChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import com.google.gson.Gson import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt index de5add1cf1..04a9d7f1cd 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt @@ -15,19 +15,19 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventTherapyEventChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.Translator +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventTherapyEventChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.Translator import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt index e562f95fc3..60631385b2 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt @@ -18,18 +18,18 @@ import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.extensions.isInProgress import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventExtendedBolusChange -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt index db0f9d8507..6e48405837 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt @@ -19,23 +19,23 @@ import app.aaps.core.main.extensions.getCustomizedName import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventEffectiveProfileSwitchChanged -import app.aaps.interfaces.rx.events.EventLocalProfileChanged -import app.aaps.interfaces.rx.events.EventProfileSwitchChanged -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventEffectiveProfileSwitchChanged +import app.aaps.core.interfaces.rx.events.EventLocalProfileChanged +import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt index 20c7c50d21..75bf212bcb 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt @@ -19,21 +19,21 @@ import app.aaps.core.main.extensions.highValueToUnitsToString import app.aaps.core.main.extensions.lowValueToUnitsToString import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.configuration.Config -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventTempTargetChange -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T -import app.aaps.interfaces.utils.Translator +import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventTempTargetChange +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.Translator import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt index 567dda7cc8..4da850bd64 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt @@ -19,20 +19,20 @@ import app.aaps.core.main.extensions.toStringFull import app.aaps.core.main.extensions.toTemporaryBasal import app.aaps.core.main.utils.ActionModeHelper import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.iob.IobTotal -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.plugin.ActivePlugin -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventTempBasalChange -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.iob.IobTotal +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventTempBasalChange +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt index 13eb8b8d2b..337cf21a9e 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt @@ -12,17 +12,17 @@ import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.interfaces.extensions.toVisibility -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.maintenance.ImportExportPrefs -import app.aaps.interfaces.profile.ProfileFunction -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventPreferenceChange -import app.aaps.interfaces.userEntry.UserEntryPresentationHelper -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.extensions.toVisibility +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.maintenance.ImportExportPrefs +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventPreferenceChange +import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils diff --git a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt index 7b72cf0b3d..478cbf55b5 100644 --- a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt +++ b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt @@ -10,13 +10,13 @@ import android.view.ViewGroup import android.widget.TableLayout import android.widget.TableRow import android.widget.TextView -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sharedPreferences.SP -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.SafeParse -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.T import info.nightscout.ui.R import javax.inject.Inject import javax.inject.Singleton @@ -102,7 +102,7 @@ class ActivityMonitor @Inject constructor( row.gravity = Gravity.CENTER_HORIZONTAL row.addView(TextView(context).apply { layoutParams = lp.apply { column = 0 }; text = activity }) row.addView(TextView(context).apply { layoutParams = lp.apply { column = 1 }; text = duration }) - row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 }; text = rh.gs(app.aaps.interfaces.R.string.in_days, days.toDouble()) }) + row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 }; text = rh.gs(app.aaps.core.interfaces.R.string.in_days, days.toDouble()) }) } ) } diff --git a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt b/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt index 6df97ebd76..0f1262aa85 100644 --- a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt @@ -9,10 +9,10 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerDialogFragment import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.entities.UserEntry.Action diff --git a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt index 664094b782..19b5d92377 100644 --- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt +++ b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt @@ -1,11 +1,11 @@ package info.nightscout.ui.defaultProfile import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.utils.DateUtil -import app.aaps.interfaces.utils.Round +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.Round import org.json.JSONArray import org.json.JSONObject import java.util.Locale diff --git a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt index 4bd1a7c244..36a7898288 100644 --- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt +++ b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt @@ -1,10 +1,10 @@ package info.nightscout.ui.defaultProfile import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.profile.PureProfile -import app.aaps.interfaces.utils.DateUtil +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.profile.PureProfile +import app.aaps.core.interfaces.utils.DateUtil import dagger.android.HasAndroidInjector import org.json.JSONArray import org.json.JSONObject diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt index 55fb625bee..e224519fec 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt @@ -7,17 +7,17 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import app.aaps.interfaces.logging.AAPSLogger -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.pump.BolusProgressData -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.rx.AapsSchedulers -import app.aaps.interfaces.rx.bus.RxBus -import app.aaps.interfaces.rx.events.EventDismissBolusProgressIfRunning -import app.aaps.interfaces.rx.events.EventOverviewBolusProgress -import app.aaps.interfaces.rx.events.EventPumpStatusChanged +import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.pump.BolusProgressData +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.rx.events.EventDismissBolusProgressIfRunning +import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress +import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import dagger.android.support.DaggerDialogFragment import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.entities.UserEntry.Action diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt index 71a3b3d306..1b5bb45e75 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt @@ -4,12 +4,12 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.sync.XDripBroadcast +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.sync.XDripBroadcast import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index 715ed5bdf1..70c461121e 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -9,27 +9,27 @@ import android.view.View import android.view.ViewGroup import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.extensions.formatColor -import app.aaps.interfaces.automation.Automation -import app.aaps.interfaces.configuration.Constants.CARBS_FAV1_DEFAULT -import app.aaps.interfaces.configuration.Constants.CARBS_FAV2_DEFAULT -import app.aaps.interfaces.configuration.Constants.CARBS_FAV3_DEFAULT -import app.aaps.interfaces.constraints.ConstraintsChecker -import app.aaps.interfaces.db.GlucoseUnit -import app.aaps.interfaces.iob.GlucoseStatusProvider -import app.aaps.interfaces.iob.IobCobCalculator -import app.aaps.interfaces.logging.LTag -import app.aaps.interfaces.logging.UserEntryLogger -import app.aaps.interfaces.profile.DefaultValueHelper -import app.aaps.interfaces.profile.ProfileUtil -import app.aaps.interfaces.protection.ProtectionCheck -import app.aaps.interfaces.protection.ProtectionCheck.Protection.BOLUS -import app.aaps.interfaces.pump.DetailedBolusInfo -import app.aaps.interfaces.queue.Callback -import app.aaps.interfaces.queue.CommandQueue -import app.aaps.interfaces.resources.ResourceHelper -import app.aaps.interfaces.ui.UiInteraction -import app.aaps.interfaces.utils.DecimalFormatter -import app.aaps.interfaces.utils.T +import app.aaps.core.interfaces.automation.Automation +import app.aaps.core.interfaces.configuration.Constants.CARBS_FAV1_DEFAULT +import app.aaps.core.interfaces.configuration.Constants.CARBS_FAV2_DEFAULT +import app.aaps.core.interfaces.configuration.Constants.CARBS_FAV3_DEFAULT +import app.aaps.core.interfaces.constraints.ConstraintsChecker +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.iob.GlucoseStatusProvider +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.logging.UserEntryLogger +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.protection.ProtectionCheck +import app.aaps.core.interfaces.protection.ProtectionCheck.Protection.BOLUS +import app.aaps.core.interfaces.pump.DetailedBolusInfo +import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.T import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog @@ -278,7 +278,7 @@ class CarbsDialog : DialogFragmentWithDate() { actions.add(rh.gs(info.nightscout.core.ui.R.string.alarminxmin, timeOffset).formatColor(context, rh, info.nightscout.core.ui.R.attr.infoColor)) val duration = binding.duration.value.toInt() if (duration > 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(app.aaps.interfaces.R.string.shorthour)) + actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(app.aaps.core.interfaces.R.string.shorthour)) if (carbsAfterConstraints > 0) { actions.add( rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "