From b30fb687db6c34443dbc98014fdc5ac59f2eb9ca Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 6 Nov 2022 18:21:10 +0100 Subject: [PATCH] move interfaces --- .../info/nightscout/androidaps/MainActivity.kt | 4 ++-- .../java/info/nightscout/androidaps/MainApp.kt | 6 +++--- .../activities/HistoryBrowseActivity.kt | 2 +- .../activities/MyPreferenceFragment.kt | 2 +- .../info/nightscout/androidaps/di/AppModule.kt | 8 ++++---- .../androidaps/dialogs/InsulinDialog.kt | 2 +- .../androidaps/dialogs/LoopDialog.kt | 2 +- .../androidaps/dialogs/ProfileSwitchDialog.kt | 2 +- .../androidaps/dialogs/TreatmentDialog.kt | 2 +- .../androidaps/plugins/aps/loop/LoopPlugin.kt | 4 ++-- .../plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt | 2 +- .../aps/openAPSSMB/DetermineBasalResultSMB.kt | 2 +- .../plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt | 2 +- .../OpenAPSSMBDynamicISFPlugin.kt | 2 +- .../configBuilder/ConfigBuilderFragment.kt | 6 +++--- .../configBuilder/ConfigBuilderPlugin.kt | 2 +- .../plugins/configBuilder/PluginStore.kt | 9 +++++---- .../configBuilder/ProfileFunctionImpl.kt | 2 +- .../constraints/objectives/ObjectivesPlugin.kt | 4 ++-- .../objectives/objectives/Objective1.kt | 1 - .../plugins/constraints/safety/SafetyPlugin.kt | 8 ++++---- .../plugins/general/actions/ActionsFragment.kt | 4 ++-- .../plugins/general/actions/ActionsPlugin.kt | 4 ++-- .../dataBroadcaster/DataBroadcastPlugin.kt | 4 ++-- .../maintenance/ImportExportPrefsImpl.kt | 18 +++++++++--------- .../general/maintenance/MaintenancePlugin.kt | 6 +++--- .../nsclient/NSClientAddUpdateWorker.kt | 4 ++-- .../general/nsclient/NSClientMbgWorker.kt | 4 ++-- .../plugins/general/nsclient/NSClientPlugin.kt | 6 +++--- .../general/nsclient/data/NSDeviceStatus.kt | 2 +- .../general/nsclient/data/NSSettingsStatus.kt | 2 +- .../nsclient/services/NSClientService.kt | 4 ++-- .../general/overview/OverviewFragment.kt | 4 ++-- .../plugins/general/overview/OverviewMenus.kt | 4 ++-- .../plugins/general/overview/OverviewPlugin.kt | 4 ++-- .../general/overview/StatusLightHandler.kt | 2 +- .../notifications/NotificationStore.kt | 2 +- .../persistentNotification/DummyService.kt | 2 +- .../DummyServiceHelper.kt | 2 +- .../PersistentNotificationPlugin.kt | 4 ++-- .../plugins/general/tidepool/TidepoolPlugin.kt | 2 +- .../plugins/general/wear/WearPlugin.kt | 2 +- .../wear/wearintegration/DataHandlerMobile.kt | 1 + .../DataLayerListenerServiceMobile.kt | 2 +- .../DataLayerListenerServiceMobileHelper.kt | 2 +- .../iobCobCalculator/IobCobCalculatorPlugin.kt | 2 +- .../iob/iobCobCalculator/IobCobOref1Worker.kt | 2 +- .../iob/iobCobCalculator/IobCobOrefWorker.kt | 2 +- .../plugins/pump/virtual/VirtualPumpPlugin.kt | 4 ++-- .../sensitivity/SensitivityAAPSPlugin.kt | 2 +- .../sensitivity/SensitivityOref1Plugin.kt | 2 +- .../SensitivityWeightedAveragePlugin.kt | 2 +- .../androidaps/plugins/source/AidexPlugin.kt | 6 +++--- .../androidaps/plugins/source/DexcomPlugin.kt | 4 ++-- .../plugins/source/EversensePlugin.kt | 2 +- .../androidaps/plugins/source/GlimpPlugin.kt | 2 +- .../androidaps/plugins/source/GlunovoPlugin.kt | 2 +- .../plugins/source/IntelligoPlugin.kt | 2 +- .../androidaps/plugins/source/MM640gPlugin.kt | 2 +- .../plugins/source/NSClientSourcePlugin.kt | 4 ++-- .../androidaps/plugins/source/PoctechPlugin.kt | 2 +- .../plugins/source/RandomBgPlugin.kt | 4 ++-- .../androidaps/plugins/source/TomatoPlugin.kt | 2 +- .../androidaps/plugins/source/XdripPlugin.kt | 2 +- .../androidaps/receivers/KeepAliveWorker.kt | 4 ++-- .../androidaps/setupwizard/SWDefinition.kt | 4 ++-- .../setupwizard/elements/SWPlugin.kt | 2 +- .../androidaps/skins/SkinButtonsOn.kt | 2 +- .../nightscout/androidaps/skins/SkinClassic.kt | 4 +--- .../androidaps/skins/SkinLargeDisplay.kt | 2 +- .../nightscout/androidaps/skins/SkinLowRes.kt | 3 +-- .../alertDialogs/PrefImportSummaryDialog.kt | 4 ++-- .../NotificationHolderImpl.kt | 2 +- .../utils/buildHelper/BuildHelperImpl.kt | 4 ++-- .../androidaps/utils/buildHelper/ConfigImpl.kt | 2 +- .../resources/IconsProviderImplementation.kt | 2 +- .../androidaps/utils/wizard/BolusWizard.kt | 2 +- .../workflow/PreparePredictionsWorker.kt | 2 +- .../androidaps/TestBaseWithProfile.kt | 2 +- .../interfaces/ConstraintsCheckerTest.kt | 2 ++ .../plugins/aps/loop/LoopPluginTest.kt | 4 ++-- .../objectives/ObjectivesPluginTest.kt | 2 +- .../constraints/safety/SafetyPluginTest.kt | 2 +- .../maintenance/MaintenancePluginTest.kt | 4 ++-- .../pump/virtual/VirtualPumpPluginUTest.kt | 2 +- .../plugins/source/NSClientPluginTest.kt | 2 +- .../nightscout/automation/AutomationPlugin.kt | 4 ++-- .../automation/actions/ActionLoopDisable.kt | 2 +- .../automation/actions/ActionLoopEnable.kt | 2 +- .../automation/services/LocationService.kt | 2 +- .../services/LocationServiceHelper.kt | 2 +- .../androidaps/TestBaseWithProfile.kt | 2 +- .../actions/ActionLoopDisableTest.kt | 2 +- .../automation/actions/ActionLoopEnableTest.kt | 2 +- .../androidaps/data/ProfileSealed.kt | 2 +- .../androidaps/dialogs/ProfileViewerDialog.kt | 2 +- .../androidaps/interfaces/ActivePlugin.kt | 2 ++ .../androidaps/interfaces/BuildHelper.kt | 7 ------- .../androidaps/interfaces/CarbTimer.kt | 2 -- .../nightscout/androidaps/interfaces/Config.kt | 12 ------------ .../androidaps/interfaces/ConfigBuilder.kt | 2 ++ .../androidaps/interfaces/Insulin.kt | 1 + .../androidaps/interfaces/Overview.kt | 1 + .../androidaps/interfaces/PluginBase.kt | 1 + .../androidaps/interfaces/PluginDescription.kt | 1 + .../androidaps/interfaces/Profile.kt | 1 + .../androidaps/interfaces/ProfileStore.kt | 1 + .../androidaps/interfaces/PumpPluginBase.kt | 1 + .../nightscout/androidaps/interfaces/Safety.kt | 3 --- .../androidaps/interfaces/Sensitivity.kt | 1 + .../configBuilder/RunningConfiguration.kt | 4 ++-- .../versionChecker/VersionCheckerUtils.kt | 2 +- .../maintenance/PrefFileListProvider.kt | 7 ++++++- .../plugins/general/maintenance/PrefsFile.kt | 5 +++-- .../general/maintenance/PrefsImportDir.kt | 6 ------ .../activities/PrefImportListActivity.kt | 4 ++-- .../formats/EncryptedPrefsFormat.kt | 18 ++++++++++++------ .../androidaps/services/AlarmSoundService.kt | 2 +- .../services/AlarmSoundServiceHelper.kt | 2 +- core/src/main/res/values/strings.xml | 10 ---------- .../androidaps/TestBaseWithProfile.kt | 2 +- .../nightscout/androidaps/data/ProfileTest.kt | 2 +- .../interfaces/PluginDescriptionTest.kt | 1 + .../VersionCheckerUtilsKtTest.kt | 2 +- .../formats/EncryptedPrefsFormatTest.kt | 5 +++++ .../implementation/LocalAlertUtilsImpl.kt | 4 ++-- .../queue/CommandQueueImplementation.kt | 4 ++-- .../implementation/queue/QueueThread.kt | 2 +- .../queue/commands/CommandReadStatus.kt | 2 +- .../queue/commands/CommandSetProfile.kt | 2 +- .../androidaps/TestBaseWithProfile.kt | 2 +- .../implementation/BolusTimerImplTest.kt | 2 +- .../implementation/CarbTimerImplTest.kt | 2 +- .../queue/CommandQueueImplementationTest.kt | 4 ++-- .../implementation/queue/QueueThreadTest.kt | 2 +- .../pump/insight/LocalInsightPlugin.java | 4 ++-- interfaces/build.gradle | 1 + .../info/nightscout/interfaces/BuildHelper.kt | 9 +++++++++ .../java/info/nightscout/interfaces/Config.kt | 14 ++++++++++++++ .../interfaces/ConfigExportImport.kt | 2 +- .../nightscout}/interfaces/LocalAlertUtils.kt | 2 +- .../interfaces/NotificationHolder.kt | 4 ++-- .../info/nightscout}/interfaces/PluginType.kt | 2 +- .../java/info/nightscout/interfaces/Safety.kt | 3 +++ .../interfaces/VariableSensitivityResult.kt | 2 +- .../interfaces/data/PrefsImportDir.kt | 2 ++ .../data/maintenance}/PrefsFormat.kt | 13 +++++++++---- .../data/maintenance/PrefsImportDir.kt | 6 ++++++ .../src/main/res/drawable/ic_meta_date.xml | 0 .../main/res/drawable/ic_meta_encryption.xml | 0 .../src/main/res/drawable/ic_meta_error.xml | 0 .../src/main/res/drawable/ic_meta_flavour.xml | 0 .../src/main/res/drawable/ic_meta_format.xml | 0 .../src/main/res/drawable/ic_meta_model.xml | 0 .../src/main/res/drawable/ic_meta_name.xml | 0 .../src/main/res/drawable/ic_meta_ok.xml | 0 .../src/main/res/drawable/ic_meta_version.xml | 0 .../src/main/res/drawable/ic_meta_warning.xml | 0 interfaces/src/main/res/values/strings.xml | 15 +++++++++++++++ openhumans/build.gradle | 1 + .../general/openhumans/OpenHumansUploader.kt | 4 ++-- .../bgQualityCheck/BgQualityCheckPlugin.kt | 2 +- .../constraints/dstHelper/DstHelperPlugin.kt | 2 +- .../phoneChecker/PhoneCheckerPlugin.kt | 2 +- .../SignatureVerifierPlugin.kt | 2 +- .../storage/StorageConstraintPlugin.kt | 2 +- .../versionChecker/VersionCheckerPlugin.kt | 4 ++-- .../plugins/general/autotune/AutotunePlugin.kt | 4 ++-- .../plugins/general/autotune/data/ATProfile.kt | 2 +- .../plugins/general/food/FoodPlugin.kt | 2 +- .../smsCommunicator/SmsCommunicatorPlugin.kt | 4 ++-- .../general/themes/ThemeSwitcherPlugin.kt | 2 +- .../xdripStatusline/StatusLinePlugin.kt | 2 +- .../plugins/insulin/InsulinLyumjevPlugin.kt | 2 +- .../plugins/insulin/InsulinOrefBasePlugin.kt | 4 ++-- .../insulin/InsulinOrefFreePeakPlugin.kt | 2 +- .../insulin/InsulinOrefRapidActingPlugin.kt | 2 +- .../InsulinOrefUltraRapidActingPlugin.kt | 2 +- .../plugins/profile/ProfilePlugin.kt | 4 ++-- .../androidaps/TestBaseWithProfile.kt | 2 +- .../SmsCommunicatorPluginTest.kt | 1 + .../insulin/InsulinLyumjevPluginTest.kt | 2 +- .../insulin/InsulinOrefBasePluginTest.kt | 2 +- .../insulin/InsulinOrefFreePeakPluginTest.kt | 2 +- .../InsulinOrefRapidActingPluginTest.kt | 2 +- .../InsulinOrefUltraRapidActingPluginTest.kt | 2 +- .../plugins/pump/combo/ComboPlugin.java | 2 +- .../plugins/pump/combo/ComboPluginTest.kt | 1 + .../androidaps/TestBaseWithProfile.kt | 2 +- .../danaRKorean/DanaRKoreanPlugin.kt | 2 +- .../comm/MsgInitConnStatusTime_k.kt | 2 +- .../danaRv2/comm/MsgCheckValue_v2.kt | 2 +- .../androidaps/danar/AbstractDanaRPlugin.java | 2 +- .../androidaps/danar/DanaRPlugin.java | 2 +- .../danar/comm/MsgInitConnStatusTime.kt | 2 +- .../androidaps/TestBaseWithProfile.kt | 2 +- .../plugins/pump/danaR/DanaRPluginTest.kt | 2 +- .../pump/danaRKorean/DanaRKoreanPluginTest.kt | 2 +- .../plugins/pump/danaRv2/DanaRv2PluginTest.kt | 2 +- .../androidaps/danars/DanaRSPlugin.kt | 2 +- .../androidaps/TestBaseWithProfile.kt | 2 +- .../androidaps/danars/DanaRSPluginTest.kt | 2 +- .../androidaps/diaconn/DiaconnG8Plugin.kt | 2 +- .../plugins/pump/eopatch/EopatchPumpPlugin.kt | 2 +- .../pump/medtronic/MedtronicPumpPlugin.kt | 2 +- .../pump/omnipod/dash/OmnipodDashPumpPlugin.kt | 2 +- .../driver/comm/OmnipodDashBleManagerImpl.kt | 2 +- .../dash/driver/comm/pair/KeyExchange.kt | 2 +- .../dash/driver/comm/pair/LTKExchanger.kt | 2 +- .../dash/driver/comm/session/Connection.kt | 2 +- .../dash/driver/comm/session/Milenage.kt | 2 +- .../driver/comm/session/SessionEstablisher.kt | 2 +- .../dash/ui/OmnipodDashOverviewFragment.kt | 2 +- .../omnipod/eros/OmnipodErosPumpPlugin.java | 2 +- .../eros/ui/ErosPodManagementActivity.kt | 2 +- .../common/hw/rileylink/ble/RileyLinkBLE.kt | 2 +- .../ui/activities/TreatmentsActivity.kt | 2 +- .../fragments/TreatmentsBolusCarbsFragment.kt | 2 +- .../fragments/TreatmentsCareportalFragment.kt | 2 +- .../TreatmentsProfileSwitchFragment.kt | 2 +- .../fragments/TreatmentsTempTargetFragment.kt | 2 +- .../java/info/nightscout/ui/widget/Widget.kt | 4 ++-- .../androidaps/TestBaseWithProfile.kt | 2 +- 223 files changed, 348 insertions(+), 300 deletions(-) delete mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/CarbTimer.kt delete mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt delete mode 100644 core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsImportDir.kt create mode 100644 interfaces/src/main/java/info/nightscout/interfaces/BuildHelper.kt create mode 100644 interfaces/src/main/java/info/nightscout/interfaces/Config.kt rename {core/src/main/java/info/nightscout/androidaps => interfaces/src/main/java/info/nightscout}/interfaces/ConfigExportImport.kt (87%) rename {core/src/main/java/info/nightscout/androidaps => interfaces/src/main/java/info/nightscout}/interfaces/LocalAlertUtils.kt (90%) rename {core/src/main/java/info/nightscout/androidaps => interfaces/src/main/java/info/nightscout}/interfaces/NotificationHolder.kt (86%) rename {core/src/main/java/info/nightscout/androidaps => interfaces/src/main/java/info/nightscout}/interfaces/PluginType.kt (82%) create mode 100644 interfaces/src/main/java/info/nightscout/interfaces/Safety.kt rename {core/src/main/java/info/nightscout/androidaps => interfaces/src/main/java/info/nightscout}/interfaces/VariableSensitivityResult.kt (60%) create mode 100644 interfaces/src/main/java/info/nightscout/interfaces/data/PrefsImportDir.kt rename {core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats => interfaces/src/main/java/info/nightscout/interfaces/data/maintenance}/PrefsFormat.kt (86%) create mode 100644 interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsImportDir.kt rename {core => interfaces}/src/main/res/drawable/ic_meta_date.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_encryption.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_error.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_flavour.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_format.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_model.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_name.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_ok.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_version.xml (100%) rename {core => interfaces}/src/main/res/drawable/ic_meta_warning.xml (100%) create mode 100644 interfaces/src/main/res/values/strings.xml diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt index 500a917e0e..716453efd0 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt @@ -41,8 +41,8 @@ import info.nightscout.androidaps.databinding.ActivityMainBinding import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.AndroidPermission -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.IconsProvider import info.nightscout.androidaps.interfaces.Loop diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt index 01e64ff8cd..aaf6a74c00 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt @@ -23,10 +23,10 @@ import info.nightscout.androidaps.database.transactions.VersionChangeTransaction import info.nightscout.androidaps.db.CompatDBHelper import info.nightscout.androidaps.di.DaggerAppComponent import info.nightscout.androidaps.di.StaticInjector -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ConfigBuilder -import info.nightscout.androidaps.interfaces.LocalAlertUtils +import info.nightscout.interfaces.LocalAlertUtils import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt index 3679196f3c..11df4a9bf5 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt @@ -16,7 +16,7 @@ import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.extensions.toVisibilityKeepSpace import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.plugins.general.overview.OverviewMenus import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewGraph import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt index b84d1898e2..8d3db01287 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt @@ -23,7 +23,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin import info.nightscout.androidaps.danars.DanaRSPlugin import info.nightscout.androidaps.diaconn.DiaconnG8Plugin import info.nightscout.androidaps.events.EventPreferenceChange -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt index b544c47072..d9b07a1ecb 100644 --- a/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt @@ -14,19 +14,19 @@ import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.AndroidPermission import info.nightscout.androidaps.interfaces.Autotune import info.nightscout.androidaps.interfaces.BolusTimer -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.interfaces.CarbTimer import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.DataSyncSelector import info.nightscout.androidaps.interfaces.IconsProvider import info.nightscout.androidaps.interfaces.ImportExportPrefs import info.nightscout.androidaps.interfaces.IobCobCalculator -import info.nightscout.androidaps.interfaces.LocalAlertUtils +import info.nightscout.interfaces.LocalAlertUtils import info.nightscout.androidaps.interfaces.Loop -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.PumpSync diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt index 16eb3aaf2a..99b26092da 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt @@ -23,7 +23,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.BolusTimer import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.GlucoseUnit diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt index 99d6571065..21d19c8d9f 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt @@ -31,7 +31,7 @@ import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.PumpDescription import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt index 06dce558ef..40853409ba 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt @@ -21,7 +21,7 @@ import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTe import info.nightscout.androidaps.databinding.DialogProfileswitchBinding import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt index c1dd82b8ca..ec9e889a9f 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt @@ -19,7 +19,7 @@ import info.nightscout.androidaps.extensions.formatColor import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt index 2977b07339..7ebc636587 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt @@ -34,7 +34,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.IobCobCalculator @@ -42,7 +42,7 @@ import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.Loop.LastRun import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.PumpDescription diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt index 631db8e535..ddeb29cfc9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt @@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt index 04ab453fc8..59784e761e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.VariableSensitivityResult +import info.nightscout.interfaces.VariableSensitivityResult import info.nightscout.androidaps.plugins.aps.loop.APSResult import info.nightscout.rx.logging.LTag import org.json.JSONException diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt index 03f062359e..6d729d935e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt @@ -17,7 +17,7 @@ import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt index 158537157a..1581f7ed59 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.annotations.OpenForTesting import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface import info.nightscout.androidaps.interfaces.IobCobCalculator diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt index f491ecc191..e68d37f28a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt @@ -21,10 +21,10 @@ import info.nightscout.androidaps.activities.SingleFragmentActivity import info.nightscout.androidaps.databinding.ConfigbuilderFragmentBinding import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui import info.nightscout.androidaps.utils.FabricPrivacy diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt index f3036ff34b..3e0d1815f9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt @@ -13,7 +13,7 @@ import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileSource import info.nightscout.androidaps.interfaces.Pump import info.nightscout.androidaps.interfaces.PumpSync diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt index a64246dad7..d00bd1f231 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt @@ -3,15 +3,15 @@ package info.nightscout.androidaps.plugins.configBuilder import info.nightscout.androidaps.interfaces.APS import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.BgSource -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.Overview import info.nightscout.androidaps.interfaces.PluginBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileSource import info.nightscout.androidaps.interfaces.Pump -import info.nightscout.androidaps.interfaces.Safety +import info.nightscout.interfaces.Safety import info.nightscout.androidaps.interfaces.Sensitivity import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag @@ -134,7 +134,8 @@ class PluginStore @Inject constructor( } private fun setFragmentVisibilities(activePluginName: String, pluginsInCategory: ArrayList, - pluginType: PluginType) { + pluginType: PluginType + ) { aapsLogger.debug(LTag.CONFIGBUILDER, "Selected interface: $activePluginName") for (p in pluginsInCategory) if (p.name != activePluginName) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt index e691ef748d..39a72f1d93 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.transactions.InsertOrUpdateProfileSwi import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged import info.nightscout.androidaps.extensions.fromConstant import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt index 3f01b3fd8d..f6b81b0953 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt @@ -9,12 +9,12 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.database.entities.UserEntry.Action import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt index 936065ee0f..8a3abb5817 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt @@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.PluginType import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt index 58795e277f..d632e9b657 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt @@ -9,18 +9,18 @@ import info.nightscout.androidaps.extensions.storeDouble import info.nightscout.androidaps.extensions.storeInt import info.nightscout.androidaps.extensions.storeString import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.PumpDescription import info.nightscout.androidaps.interfaces.ResourceHelper -import info.nightscout.androidaps.interfaces.Safety +import info.nightscout.interfaces.Safety import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt index 2a4df62023..104bb19f85 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt @@ -27,9 +27,9 @@ import info.nightscout.androidaps.extensions.toStringShort import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt index 3f0866657f..4acf8fe673 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt @@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.general.actions import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.rx.logging.AAPSLogger import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt index 3f981a0a06..12c501dd01 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt @@ -10,12 +10,12 @@ import info.nightscout.androidaps.extensions.durationInMinutes import info.nightscout.androidaps.extensions.safeQueryBroadcastReceivers import info.nightscout.androidaps.extensions.toStringFull import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt index a8e43b7aac..a7456ddb9d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt @@ -30,19 +30,19 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset import info.nightscout.androidaps.interfaces.AndroidPermission -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ImportExportPrefs import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefFileNotFoundError -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefIOError -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefMetadata -import info.nightscout.androidaps.plugins.general.maintenance.formats.Prefs -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsFormat -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsMetadataKey -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus +import info.nightscout.interfaces.data.maintenance.PrefFileNotFoundError +import info.nightscout.interfaces.data.maintenance.PrefIOError +import info.nightscout.interfaces.data.maintenance.PrefMetadata +import info.nightscout.interfaces.data.maintenance.Prefs +import info.nightscout.interfaces.data.maintenance.PrefsFormat +import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefsStatus import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.MidnightTime import info.nightscout.androidaps.utils.T diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt index bd6def8186..cc3ba1c05d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt @@ -7,11 +7,11 @@ import androidx.core.content.FileProvider import dagger.android.HasAndroidInjector import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus import info.nightscout.plugins.general.maintenance.LoggerUtils diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt index d022facb19..6aafad005b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt @@ -34,8 +34,8 @@ import info.nightscout.androidaps.extensions.temporaryBasalFromJson import info.nightscout.androidaps.extensions.temporaryTargetFromJson import info.nightscout.androidaps.extensions.therapyEventFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt index 7a2fb9adf4..d28234a4dc 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt @@ -9,8 +9,8 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.transactions.SyncNsTherapyEventTransaction import info.nightscout.androidaps.extensions.therapyEventFromNsMbg -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.rx.logging.AAPSLogger diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt index 032c064bdb..e07919ce25 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt @@ -14,11 +14,11 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.Constants import info.nightscout.androidaps.R import info.nightscout.androidaps.events.EventPreferenceChange -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt index 59c154a297..53ef1342e8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.data import android.text.Spanned import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.aps.loop.APSResult import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt index 33d136edd2..ce8b8c11e2 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt @@ -5,7 +5,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.annotations.OpenForTesting import info.nightscout.androidaps.database.entities.UserEntry import info.nightscout.androidaps.database.entities.UserEntry.Action -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt index d527167917..44971db2b5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt @@ -17,8 +17,8 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.events.EventPreferenceChange -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.DataSyncSelector import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.nsclient.NSClientAddAckWorker diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 229b506349..e801e71763 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -51,9 +51,9 @@ import info.nightscout.androidaps.extensions.runOnUiThread import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.GlucoseUnit diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt index b33f684b4d..055f579deb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt @@ -12,8 +12,8 @@ import androidx.annotation.StringRes import androidx.appcompat.widget.PopupMenu import com.google.gson.Gson import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.utils.FabricPrivacy diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt index 69ceeab2f0..98904a576c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt @@ -13,11 +13,11 @@ import info.nightscout.androidaps.extensions.putString import info.nightscout.androidaps.extensions.storeDouble import info.nightscout.androidaps.extensions.storeInt import info.nightscout.androidaps.extensions.storeString -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Overview import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt index 45c83ef7cb..954ff03ce8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.ValueWrapper import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.extensions.age import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.plugins.pump.common.defs.PumpType import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt index 23b0f6e579..a5fd3ce935 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt @@ -16,7 +16,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.OverviewNotificationItemBinding import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.IconsProvider -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewNotification import info.nightscout.androidaps.services.AlarmSoundServiceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt index 3ab7771f31..69e856b6d0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.os.Binder import android.os.IBinder import dagger.android.DaggerService -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt index f5373abec0..bb87856e93 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt +++ b/app/src/main/java/info/nightscout/androidaps/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 info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt index be83b44f8a..4af725244e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt @@ -15,10 +15,10 @@ import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.IconsProvider import info.nightscout.androidaps.interfaces.IobCobCalculator -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt index 76b7fec541..87c52b126c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt @@ -11,7 +11,7 @@ import info.nightscout.androidaps.events.EventNewBG import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader.ConnectionStatus.CONNECTED diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt index 8178099127..cd283361b4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 57f5fd3729..9a57b1f381 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -30,6 +30,7 @@ import info.nightscout.androidaps.utils.* import info.nightscout.androidaps.utils.wizard.BolusWizard import info.nightscout.androidaps.utils.wizard.QuickWizard import info.nightscout.androidaps.utils.wizard.QuickWizardEntry +import info.nightscout.interfaces.Config import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventMobileToWear diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index 27e97c7ac4..da9390fddf 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -18,7 +18,7 @@ import dagger.android.AndroidInjection import info.nightscout.androidaps.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt index 941e04eb53..8235102867 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt +++ b/app/src/main/java/info/nightscout/androidaps/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 info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt index 65ad45decf..ff71e014b1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt @@ -24,7 +24,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt index 765b817a55..03b9a9c878 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.ValueWrapper import info.nightscout.androidaps.extensions.target import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt index f64012dd91..f4ddd2cafd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.Constants import info.nightscout.androidaps.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt index ec5a5435e7..fba1853e2d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt @@ -12,10 +12,10 @@ import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.extensions.convertedToAbsolute import info.nightscout.androidaps.extensions.plannedRemainingMinutes import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.Pump diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt index 8fbb1fdcf6..23836d7b87 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.extensions.isPSEvent5minBack import info.nightscout.androidaps.extensions.isTherapyEventEvent5minBack import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt index af482d3cd6..c8820f43e0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.extensions.isPSEvent5minBack import info.nightscout.androidaps.extensions.isTherapyEventEvent5minBack import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt index c0f2fcf3ac..c5ff3ac64f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.extensions.isPSEvent5minBack import info.nightscout.androidaps.extensions.isTherapyEventEvent5minBack import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt index c18625206d..b749123f5b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt @@ -11,11 +11,11 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.androidaps.receivers.Intents diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt index 7dfeb49669..37bcd2ba11 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt @@ -20,10 +20,10 @@ import info.nightscout.androidaps.database.transactions.InvalidateGlucoseValueTr import info.nightscout.androidaps.extensions.fromConstant import info.nightscout.androidaps.extensions.safeGetInstalledPackages import info.nightscout.androidaps.interfaces.BgSource -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt index 52e59af732..a2bba3444b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt @@ -14,7 +14,7 @@ import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTh import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.receivers.DataWorkerStorage diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt index fd5a3f728c..51a89f45cb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt @@ -13,7 +13,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.rx.logging.AAPSLogger diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt index 6397aa7a6a..1f47b5c4da 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt @@ -16,7 +16,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.logging.UserEntryLogger diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt index 547d247676..30582d2f6a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt @@ -19,7 +19,7 @@ import info.nightscout.androidaps.extensions.safeGetInstalledPackages import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.logging.UserEntryLogger diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt index 9952accd15..c25511b32d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.receivers.DataWorkerStorage diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt index f28015d260..005e27e199 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt @@ -10,10 +10,10 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt index 89f742c4d0..189e0a1e8e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt @@ -13,7 +13,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.utils.JsonHelper.safeGetString diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt index 57a143f8ea..156784ca49 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt @@ -9,10 +9,10 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt index cc18b05559..b4f607627b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.XDripBroadcast import info.nightscout.rx.logging.AAPSLogger diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt index 4b54a66f02..0d7a603aab 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction import info.nightscout.androidaps.interfaces.BgSource import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.androidaps.receivers.Intents diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt index fa9875cbc9..6396ce66b4 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt @@ -19,9 +19,9 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.extensions.buildDeviceStatus import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator -import info.nightscout.androidaps.interfaces.LocalAlertUtils +import info.nightscout.interfaces.LocalAlertUtils import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.ProfileFunction diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt index a1a7f2b21d..88a2a92eb7 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt @@ -15,10 +15,10 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.AndroidPermission import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.ImportExportPrefs -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt index f8a5ad0af5..3fc9940884 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt @@ -10,7 +10,7 @@ import android.widget.TextView import dagger.android.HasAndroidInjector import info.nightscout.androidaps.activities.MyPreferenceFragment import info.nightscout.androidaps.interfaces.PluginBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin import info.nightscout.androidaps.plugins.configBuilder.PluginStore import info.nightscout.androidaps.setupwizard.SWDefinition diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt index aa04e0268e..e78c5dcd19 100644 --- a/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt +++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.skins -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.R import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt index 2513066d60..543c963049 100644 --- a/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt +++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt @@ -1,9 +1,7 @@ package info.nightscout.androidaps.skins import android.util.DisplayMetrics -import android.view.View -import android.widget.LinearLayout -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.OverviewFragmentBinding import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt index eb64d5514b..ff02276574 100644 --- a/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt +++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.skins import android.util.DisplayMetrics import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.OverviewFragmentBinding -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt index 440ac96733..8d17b3bc79 100644 --- a/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt +++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt @@ -3,8 +3,7 @@ package info.nightscout.androidaps.skins import android.util.DisplayMetrics import android.view.View.GONE import android.view.ViewGroup -import androidx.core.view.marginStart -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActionsFragmentBinding import info.nightscout.androidaps.databinding.OverviewFragmentBinding diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt index 60edb6b6ad..22d28f496a 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt @@ -19,8 +19,8 @@ import androidx.appcompat.view.ContextThemeWrapper import com.google.android.material.dialog.MaterialAlertDialogBuilder import info.nightscout.androidaps.R import info.nightscout.androidaps.extensions.runOnUiThread -import info.nightscout.androidaps.plugins.general.maintenance.formats.Prefs -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus +import info.nightscout.interfaces.data.maintenance.Prefs +import info.nightscout.interfaces.data.maintenance.PrefsStatus import info.nightscout.androidaps.utils.ToastUtils import java.util.* diff --git a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt index 9aebb55ccb..0ac1a14f2a 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt @@ -11,7 +11,7 @@ import androidx.core.app.TaskStackBuilder import info.nightscout.androidaps.MainActivity import info.nightscout.androidaps.core.R import info.nightscout.androidaps.interfaces.IconsProvider -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.interfaces.ResourceHelper import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt index 53f6886787..1b70ac23d4 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.utils.buildHelper import info.nightscout.androidaps.BuildConfig -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider import java.io.File diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt index 30085521bb..3e6df9efe7 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils.buildHelper import android.os.Build import info.nightscout.androidaps.BuildConfig -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt b/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt index 74f39d3572..fac0b48c0e 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.utils.resources import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IconsProvider import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt index 6a57434c11..97b29d28e0 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt @@ -22,7 +22,7 @@ import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.BolusTimer import info.nightscout.interfaces.CarbTimer import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.IobCobCalculator diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt index 35a7825f25..81fc9752dd 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt @@ -6,7 +6,7 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.database.AppRepository -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index fca5f85d76..78bd435dc5 100644 --- a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.embedments.InsulinConfiguration import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt index a352343466..3fc726bfef 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -32,6 +32,8 @@ import info.nightscout.androidaps.utils.HardLimits import info.nightscout.androidaps.utils.Profiler import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl import info.nightscout.implementation.constraints.ConstraintsImpl +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.PluginType import info.nightscout.shared.sharedPreferences.SP import org.junit.Assert import org.junit.Before diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt index 2fe3c044f1..dbaedf5438 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt @@ -10,10 +10,10 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.IobCobCalculator -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.PumpDescription import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt index 61a6e47654..421635b0b6 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt @@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt index 39ca5fb51d..3057cd7bf7 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt @@ -17,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin import info.nightscout.androidaps.plugins.source.GlimpPlugin import info.nightscout.androidaps.utils.HardLimits -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.shared.sharedPreferences.SP import org.junit.Assert import org.junit.Before diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt index 76a0af8d38..4fa83a6062 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt @@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.maintenance import android.content.Context import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus import info.nightscout.plugins.general.maintenance.LoggerUtils diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt index 2f972a8f7f..ffef9af52b 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt @@ -4,7 +4,7 @@ import dagger.android.AndroidInjector import info.nightscout.androidaps.R import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.PumpSync diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt index c7b5047c98..86b83f649f 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.source import dagger.android.AndroidInjector import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP import org.junit.Assert diff --git a/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt b/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt index c82ff015f9..e39c39904a 100644 --- a/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt +++ b/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt @@ -8,12 +8,12 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.annotations.OpenForTesting import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.DateUtil diff --git a/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt b/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt index ffeec5379d..9d5141fad0 100644 --- a/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt +++ b/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.queue.Callback import info.nightscout.automation.R diff --git a/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt b/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt index 4e2dc2f1e4..29e6a9f943 100644 --- a/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt +++ b/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.queue.Callback import info.nightscout.automation.R diff --git a/automation/src/main/java/info/nightscout/automation/services/LocationService.kt b/automation/src/main/java/info/nightscout/automation/services/LocationService.kt index f7ba427bae..bc0605515e 100644 --- a/automation/src/main/java/info/nightscout/automation/services/LocationService.kt +++ b/automation/src/main/java/info/nightscout/automation/services/LocationService.kt @@ -16,7 +16,7 @@ import android.os.IBinder import androidx.core.app.ActivityCompat import com.google.android.gms.location.LocationServices import dagger.android.DaggerService -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.T import info.nightscout.automation.R diff --git a/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt b/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt index 3d0fec1cff..feb1f58a0d 100644 --- a/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt +++ b/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.ServiceConnection import android.os.IBinder -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import javax.inject.Inject import javax.inject.Singleton diff --git a/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index 888e8f5a58..869f17b626 100644 --- a/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt index 92c68df644..939221884b 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.queue.Callback import info.nightscout.automation.R import org.junit.Assert diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt index 2de25cfe10..5875a6dc4e 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt @@ -1,6 +1,6 @@ package info.nightscout.automation.actions -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.queue.Callback import info.nightscout.automation.R import org.junit.Assert diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt b/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt index a35c5f7e33..efd5717664 100644 --- a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt +++ b/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt @@ -13,7 +13,7 @@ import info.nightscout.androidaps.extensions.lowTargetBlockValueBySeconds import info.nightscout.androidaps.extensions.shiftBlock import info.nightscout.androidaps.extensions.shiftTargetBlock import info.nightscout.androidaps.extensions.targetBlockValueBySeconds -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.Profile.Companion.secondsFromMidnight diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt index 93ff90b09b..9886f144cf 100644 --- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt +++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt @@ -19,7 +19,7 @@ import info.nightscout.androidaps.extensions.getCustomizedName import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt index 74db9b2635..55196b068b 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt @@ -1,5 +1,7 @@ package info.nightscout.androidaps.interfaces +import info.nightscout.interfaces.PluginType +import info.nightscout.interfaces.Safety import java.util.* interface ActivePlugin { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/BuildHelper.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/BuildHelper.kt index 680e30f621..09257d096d 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/BuildHelper.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/BuildHelper.kt @@ -1,9 +1,2 @@ package info.nightscout.androidaps.interfaces -interface BuildHelper { - - fun isEngineeringModeOrRelease(): Boolean - fun isEngineeringMode(): Boolean - fun isUnfinishedMode(): Boolean - fun isDev(): Boolean -} diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/CarbTimer.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/CarbTimer.kt deleted file mode 100644 index 09257d096d..0000000000 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/CarbTimer.kt +++ /dev/null @@ -1,2 +0,0 @@ -package info.nightscout.androidaps.interfaces - diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Config.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Config.kt index 4ba48db06c..09257d096d 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Config.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Config.kt @@ -1,14 +1,2 @@ package info.nightscout.androidaps.interfaces -@Suppress("PropertyName") -interface Config { - val SUPPORTEDNSVERSION: Int - val APS: Boolean - val NSCLIENT: Boolean - val PUMPCONTROL: Boolean - val PUMPDRIVERS: Boolean - val FLAVOR: String - val VERSION_NAME: String - val DEBUG: Boolean - val currentDeviceModelString : String -} \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilder.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilder.kt index 2c7c9583d6..107fbf3e93 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilder.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilder.kt @@ -1,5 +1,7 @@ package info.nightscout.androidaps.interfaces +import info.nightscout.interfaces.PluginType + interface ConfigBuilder { fun initialize() fun storeSettings(from: String) diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt index d483553ba1..a786a16696 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt @@ -3,6 +3,7 @@ package info.nightscout.androidaps.interfaces import info.nightscout.androidaps.data.Iob import info.nightscout.androidaps.database.embedments.InsulinConfiguration import info.nightscout.androidaps.database.entities.Bolus +import info.nightscout.interfaces.ConfigExportImport interface Insulin : ConfigExportImport { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt index 8bfee90590..e69ede6122 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt @@ -1,6 +1,7 @@ package info.nightscout.androidaps.interfaces import androidx.annotation.StringRes +import info.nightscout.interfaces.ConfigExportImport import info.nightscout.rx.bus.RxBus interface Overview : ConfigExportImport { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt index 65e69ba142..f01dfdd6f1 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt @@ -3,6 +3,7 @@ package info.nightscout.androidaps.interfaces import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import dagger.android.HasAndroidInjector +import info.nightscout.interfaces.PluginType import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt index 9fa484c162..4c050ca3eb 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt @@ -1,6 +1,7 @@ package info.nightscout.androidaps.interfaces import info.nightscout.androidaps.annotations.OpenForTesting +import info.nightscout.interfaces.PluginType @OpenForTesting class PluginDescription { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt index 59ad26a56c..af4b5fba54 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt @@ -7,6 +7,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal import info.nightscout.androidaps.utils.DecimalFormatter.to1Decimal import info.nightscout.androidaps.utils.HardLimits import info.nightscout.androidaps.utils.Round +import info.nightscout.interfaces.Config import info.nightscout.rx.bus.RxBus import org.joda.time.DateTime import org.json.JSONObject diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt index 4115c38977..ccf94a11b2 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt @@ -8,6 +8,7 @@ import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.HardLimits import info.nightscout.androidaps.utils.JsonHelper +import info.nightscout.interfaces.Config import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.AAPSLogger import org.json.JSONException diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt index f4a98b2f5d..7541f5e733 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt @@ -3,6 +3,7 @@ package info.nightscout.androidaps.interfaces import android.os.SystemClock import dagger.android.HasAndroidInjector import info.nightscout.androidaps.core.R +import info.nightscout.interfaces.PluginType import info.nightscout.rx.logging.AAPSLogger abstract class PumpPluginBase( diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt deleted file mode 100644 index d3bc26ae30..0000000000 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt +++ /dev/null @@ -1,3 +0,0 @@ -package info.nightscout.androidaps.interfaces - -interface Safety : ConfigExportImport \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt index 9ad4e15330..4c25455309 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Sensitivity.kt @@ -2,6 +2,7 @@ package info.nightscout.androidaps.interfaces import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult +import info.nightscout.interfaces.ConfigExportImport interface Sensitivity : ConfigExportImport { diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt index c71dedfca1..5963d67465 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt @@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.configBuilder import info.nightscout.androidaps.core.R import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ConfigBuilder import info.nightscout.androidaps.interfaces.Insulin -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.Sensitivity diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt index 9c5a29d12e..7391f5dcfe 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.constraints.versionChecker import android.os.Build import info.nightscout.androidaps.core.R -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt index 93d3c9c8a1..9a87950fe1 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt @@ -4,11 +4,16 @@ import android.content.Context import android.os.Environment import info.nightscout.androidaps.annotations.OpenForTesting import info.nightscout.androidaps.core.R -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils import info.nightscout.androidaps.plugins.general.maintenance.formats.* import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.utils.storage.Storage +import info.nightscout.interfaces.data.maintenance.PrefMetadata +import info.nightscout.interfaces.data.maintenance.PrefMetadataMap +import info.nightscout.interfaces.data.maintenance.PrefsImportDir +import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefsStatus import org.joda.time.DateTime import org.joda.time.Days import org.joda.time.Hours diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt index 18a1de7c15..31b632e733 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt @@ -1,8 +1,9 @@ package info.nightscout.androidaps.plugins.general.maintenance import android.os.Parcelable -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefMetadata -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefMetadata +import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefsImportDir import kotlinx.parcelize.Parcelize import kotlinx.parcelize.RawValue import java.io.File diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsImportDir.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsImportDir.kt deleted file mode 100644 index ed596d9bb9..0000000000 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsImportDir.kt +++ /dev/null @@ -1,6 +0,0 @@ -package info.nightscout.androidaps.plugins.general.maintenance - -enum class PrefsImportDir { - ROOT_DIR, - AAPS_DIR -} \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt index 33c753ec20..35c2f1957d 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt @@ -17,8 +17,8 @@ import info.nightscout.androidaps.core.databinding.MaintenanceImportListItemBind import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider import info.nightscout.androidaps.plugins.general.maintenance.PrefsFile import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsMetadataKey -import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus +import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefsStatus import info.nightscout.androidaps.utils.locale.LocaleHelper import info.nightscout.androidaps.interfaces.ResourceHelper import javax.inject.Inject diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt index 1f14541e0a..9866caa0fc 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt @@ -6,6 +6,15 @@ import info.nightscout.androidaps.extensions.hexStringToByteArray import info.nightscout.androidaps.extensions.toHex import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.utils.storage.Storage +import info.nightscout.interfaces.data.maintenance.PrefFileNotFoundError +import info.nightscout.interfaces.data.maintenance.PrefFormatError +import info.nightscout.interfaces.data.maintenance.PrefIOError +import info.nightscout.interfaces.data.maintenance.PrefMetadata +import info.nightscout.interfaces.data.maintenance.PrefMetadataMap +import info.nightscout.interfaces.data.maintenance.Prefs +import info.nightscout.interfaces.data.maintenance.PrefsFormat +import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefsStatus import org.json.JSONException import org.json.JSONObject import java.io.File @@ -24,9 +33,6 @@ class EncryptedPrefsFormat @Inject constructor( companion object { - const val FORMAT_KEY_ENC = "aaps_encrypted" - const val FORMAT_KEY_NOENC = "aaps_structured" - private const val KEY_CONSCIENCE = "if you remove/change this, please make sure you know the consequences!" private val FORMAT_TEST_REGEX = Regex("(\"format\"\\s*:\\s*\"aaps_[^\"]*\")") } @@ -69,7 +75,7 @@ class EncryptedPrefsFormat @Inject constructor( meta.put(metaKey.key, metaEntry.value) } - container.put(PrefsMetadataKey.FILE_FORMAT.key, if (encrypted) FORMAT_KEY_ENC else FORMAT_KEY_NOENC) + container.put(PrefsMetadataKey.FILE_FORMAT.key, if (encrypted) PrefsFormat.FORMAT_KEY_ENC else PrefsFormat.FORMAT_KEY_NOENC) container.put("metadata", meta) val security = JSONObject() @@ -127,7 +133,7 @@ class EncryptedPrefsFormat @Inject constructor( if (container.has(PrefsMetadataKey.FILE_FORMAT.key) && container.has("security") && container.has("content")) { val fileFormat = container.getString(PrefsMetadataKey.FILE_FORMAT.key) val security = container.getJSONObject("security") - val encrypted = fileFormat == FORMAT_KEY_ENC + val encrypted = fileFormat == PrefsFormat.FORMAT_KEY_ENC var secure: PrefsStatus = PrefsStatus.OK var decryptedOk = false var contentJsonObj: JSONObject? = null @@ -239,7 +245,7 @@ class EncryptedPrefsFormat @Inject constructor( val metadata: MutableMap = mutableMapOf() if (container.has(PrefsMetadataKey.FILE_FORMAT.key) && container.has("security") && container.has("content") && container.has("metadata")) { val fileFormat = container.getString(PrefsMetadataKey.FILE_FORMAT.key) - if ((fileFormat != FORMAT_KEY_ENC) && (fileFormat != FORMAT_KEY_NOENC)) { + if ((fileFormat != PrefsFormat.FORMAT_KEY_ENC) && (fileFormat != PrefsFormat.FORMAT_KEY_NOENC)) { metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(rh.gs(R.string.metadata_format_other), PrefsStatus.ERROR) } else { val meta = container.getJSONObject("metadata") diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt index b945f77273..30c9b45cae 100644 --- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt +++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt @@ -10,7 +10,7 @@ import android.os.IBinder import android.os.Looper import dagger.android.DaggerService import info.nightscout.androidaps.core.R -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt index bca49fa90a..11abfd4a2f 100644 --- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt +++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.ServiceConnection import android.os.IBinder -import info.nightscout.androidaps.interfaces.NotificationHolder +import info.nightscout.interfaces.NotificationHolder import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 5b5189dce6..8789af78bb 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -397,16 +397,6 @@ Mute for 5 minutes - File format - Created at - AAPS Version - Build Variant - Exporting device patient name - Exporting device model - File encryption - New encrypted format - New debug format (unencrypted) - Unknown export format exported %1$s ago exported at %1$s exported less than hour ago diff --git a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index 355e298975..2943970f80 100644 --- a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -7,7 +7,7 @@ import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt index f6a8030a54..8b29988c1d 100644 --- a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt +++ b/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.core.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt b/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt index 59184335e5..0c090b8583 100644 --- a/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt +++ b/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt @@ -1,6 +1,7 @@ package info.nightscout.androidaps.interfaces import androidx.fragment.app.Fragment +import info.nightscout.interfaces.PluginType import org.junit.Assert import org.junit.Test diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt index fc92bcce56..301e3083e9 100644 --- a/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt +++ b/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.contraints.versionChecker import android.content.Context import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils import info.nightscout.androidaps.plugins.constraints.versionChecker.numericVersionPart diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt index c2dba9041a..1854b16c09 100644 --- a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt +++ b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt @@ -3,6 +3,11 @@ package info.nightscout.androidaps.plugins.general.maintenance.formats import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.utils.CryptoUtil import info.nightscout.androidaps.interfaces.ResourceHelper +import info.nightscout.interfaces.data.maintenance.PrefFormatError +import info.nightscout.interfaces.data.maintenance.PrefMetadata +import info.nightscout.interfaces.data.maintenance.Prefs +import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey +import info.nightscout.interfaces.data.maintenance.PrefsStatus import info.nightscout.shared.sharedPreferences.SP import org.hamcrest.CoreMatchers import org.junit.Assert diff --git a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt index 01b1d2bd80..5502f471da 100644 --- a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt @@ -9,8 +9,8 @@ import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.database.entities.ValueWithUnit import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config -import info.nightscout.androidaps.interfaces.LocalAlertUtils +import info.nightscout.interfaces.Config +import info.nightscout.interfaces.LocalAlertUtils import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.SmsCommunicator 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 ef923528f9..6b34c90802 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt @@ -20,9 +20,9 @@ import info.nightscout.androidaps.extensions.getCustomizedName import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.AndroidPermission -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.Profile 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 ea211cdf3c..33782130e1 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.extensions.safeEnable import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.AndroidPermission import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning import info.nightscout.androidaps.queue.events.EventQueueChanged 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 1f28e136b0..8fac167862 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 @@ -3,7 +3,7 @@ package info.nightscout.implementation.queue.commands import dagger.android.HasAndroidInjector import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.LocalAlertUtils +import info.nightscout.interfaces.LocalAlertUtils import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.queue.commands.Command import info.nightscout.androidaps.utils.T 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 c79a34925b..3837d3d0bd 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 @@ -5,7 +5,7 @@ import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.database.ValueWrapper import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.SmsCommunicator diff --git a/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index fca5f85d76..78bd435dc5 100644 --- a/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.embedments.InsulinConfiguration import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/implementation/src/test/java/info/nightscout/implementation/BolusTimerImplTest.kt b/implementation/src/test/java/info/nightscout/implementation/BolusTimerImplTest.kt index 0fe77de71a..ffc6ddc293 100644 --- a/implementation/src/test/java/info/nightscout/implementation/BolusTimerImplTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/BolusTimerImplTest.kt @@ -5,7 +5,7 @@ import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Loop diff --git a/implementation/src/test/java/info/nightscout/implementation/CarbTimerImplTest.kt b/implementation/src/test/java/info/nightscout/implementation/CarbTimerImplTest.kt index 127c8789d9..7bc20506ed 100644 --- a/implementation/src/test/java/info/nightscout/implementation/CarbTimerImplTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/CarbTimerImplTest.kt @@ -5,7 +5,7 @@ import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Loop 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 df3c6069d9..ec505371f9 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt @@ -14,8 +14,8 @@ import info.nightscout.androidaps.database.entities.Bolus import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.AndroidPermission -import info.nightscout.androidaps.interfaces.BuildHelper -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.BuildHelper +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.ProfileFunction 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 ac8db35717..83167ee390 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.AndroidPermission -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.PumpDescription import info.nightscout.androidaps.interfaces.PumpSync 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 e13b9151a5..198f3d6652 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 @@ -43,11 +43,11 @@ import info.nightscout.androidaps.insight.database.InsightPumpID; import info.nightscout.androidaps.insight.database.InsightPumpID.EventType; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.interfaces.CommandQueue; -import info.nightscout.androidaps.interfaces.Config; +import info.nightscout.interfaces.Config; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; import info.nightscout.androidaps.interfaces.PluginDescription; -import info.nightscout.androidaps.interfaces.PluginType; +import info.nightscout.interfaces.PluginType; import info.nightscout.androidaps.interfaces.ProfileFunction; import info.nightscout.androidaps.interfaces.Pump; import info.nightscout.androidaps.interfaces.PumpDescription; diff --git a/interfaces/build.gradle b/interfaces/build.gradle index 1cab3f05e0..b7812addde 100644 --- a/interfaces/build.gradle +++ b/interfaces/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' +apply plugin: 'kotlin-parcelize' apply plugin: 'com.hiya.jacoco-android' apply plugin: 'kotlinx-serialization' diff --git a/interfaces/src/main/java/info/nightscout/interfaces/BuildHelper.kt b/interfaces/src/main/java/info/nightscout/interfaces/BuildHelper.kt new file mode 100644 index 0000000000..c2d5e03eba --- /dev/null +++ b/interfaces/src/main/java/info/nightscout/interfaces/BuildHelper.kt @@ -0,0 +1,9 @@ +package info.nightscout.interfaces + +interface BuildHelper { + + fun isEngineeringModeOrRelease(): Boolean + fun isEngineeringMode(): Boolean + fun isUnfinishedMode(): Boolean + fun isDev(): Boolean +} \ No newline at end of file diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Config.kt b/interfaces/src/main/java/info/nightscout/interfaces/Config.kt new file mode 100644 index 0000000000..a13b87991b --- /dev/null +++ b/interfaces/src/main/java/info/nightscout/interfaces/Config.kt @@ -0,0 +1,14 @@ +package info.nightscout.interfaces + +@Suppress("PropertyName") +interface Config { + val SUPPORTEDNSVERSION: Int + val APS: Boolean + val NSCLIENT: Boolean + val PUMPCONTROL: Boolean + val PUMPDRIVERS: Boolean + val FLAVOR: String + val VERSION_NAME: String + val DEBUG: Boolean + val currentDeviceModelString : String +} \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigExportImport.kt b/interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt similarity index 87% rename from core/src/main/java/info/nightscout/androidaps/interfaces/ConfigExportImport.kt rename to interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt index c56ef1010c..51460a50c5 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigExportImport.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.interfaces +package info.nightscout.interfaces import org.json.JSONObject diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/LocalAlertUtils.kt b/interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt similarity index 90% rename from core/src/main/java/info/nightscout/androidaps/interfaces/LocalAlertUtils.kt rename to interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt index 928bac8726..bbe73ac48c 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/LocalAlertUtils.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.interfaces +package info.nightscout.interfaces interface LocalAlertUtils { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolder.kt b/interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt similarity index 86% rename from core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolder.kt rename to interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt index 8a052ba3c5..9bbdcd815a 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolder.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.interfaces +package info.nightscout.interfaces import android.app.Notification import android.app.PendingIntent @@ -11,4 +11,4 @@ interface NotificationHolder { fun openAppIntent(context: Context): PendingIntent? fun createNotificationChannel() -} +} \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt b/interfaces/src/main/java/info/nightscout/interfaces/PluginType.kt similarity index 82% rename from core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt rename to interfaces/src/main/java/info/nightscout/interfaces/PluginType.kt index ca490bda53..648b6bac9b 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/PluginType.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.interfaces +package info.nightscout.interfaces /** * Main plugin type diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Safety.kt b/interfaces/src/main/java/info/nightscout/interfaces/Safety.kt new file mode 100644 index 0000000000..7418f4ce87 --- /dev/null +++ b/interfaces/src/main/java/info/nightscout/interfaces/Safety.kt @@ -0,0 +1,3 @@ +package info.nightscout.interfaces + +interface Safety : ConfigExportImport \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/VariableSensitivityResult.kt b/interfaces/src/main/java/info/nightscout/interfaces/VariableSensitivityResult.kt similarity index 60% rename from core/src/main/java/info/nightscout/androidaps/interfaces/VariableSensitivityResult.kt rename to interfaces/src/main/java/info/nightscout/interfaces/VariableSensitivityResult.kt index bee69b6c00..c34196d5f7 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/VariableSensitivityResult.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/VariableSensitivityResult.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.interfaces +package info.nightscout.interfaces interface VariableSensitivityResult { var variableSens: Double? diff --git a/interfaces/src/main/java/info/nightscout/interfaces/data/PrefsImportDir.kt b/interfaces/src/main/java/info/nightscout/interfaces/data/PrefsImportDir.kt new file mode 100644 index 0000000000..3ad837d825 --- /dev/null +++ b/interfaces/src/main/java/info/nightscout/interfaces/data/PrefsImportDir.kt @@ -0,0 +1,2 @@ +package info.nightscout.interfaces.data + diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt b/interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsFormat.kt similarity index 86% rename from core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt rename to interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsFormat.kt index b5f1273f87..33dfb513aa 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt +++ b/interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsFormat.kt @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.general.maintenance.formats +package info.nightscout.interfaces.data.maintenance import android.content.Context import android.os.Parcelable import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import info.nightscout.androidaps.core.R +import info.nightscout.interfaces.R import kotlinx.parcelize.Parcelize import java.io.File @@ -38,8 +38,8 @@ enum class PrefsMetadataKey(val key: String, @DrawableRes val icon: Int, @String fun formatForDisplay(context: Context, value: String): String { return when (this) { FILE_FORMAT -> when (value) { - EncryptedPrefsFormat.FORMAT_KEY_ENC -> context.getString(R.string.metadata_format_new) - EncryptedPrefsFormat.FORMAT_KEY_NOENC -> context.getString(R.string.metadata_format_debug) + PrefsFormat.FORMAT_KEY_ENC -> context.getString(R.string.metadata_format_new) + PrefsFormat.FORMAT_KEY_NOENC -> context.getString(R.string.metadata_format_debug) else -> context.getString(R.string.metadata_format_other) } CREATED_AT -> value.replace("T", " ").replace("Z", " (UTC)") @@ -57,6 +57,11 @@ typealias PrefMetadataMap = Map data class Prefs(val values: Map, var metadata: PrefMetadataMap) interface PrefsFormat { + companion object { + + const val FORMAT_KEY_ENC = "aaps_encrypted" + const val FORMAT_KEY_NOENC = "aaps_structured" + } fun savePreferences(file: File, prefs: Prefs, masterPassword: String? = null) fun loadPreferences(file: File, masterPassword: String? = null): Prefs diff --git a/interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsImportDir.kt b/interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsImportDir.kt new file mode 100644 index 0000000000..3b8fa1f84b --- /dev/null +++ b/interfaces/src/main/java/info/nightscout/interfaces/data/maintenance/PrefsImportDir.kt @@ -0,0 +1,6 @@ +package info.nightscout.interfaces.data.maintenance + +enum class PrefsImportDir { + ROOT_DIR, + AAPS_DIR +} \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_meta_date.xml b/interfaces/src/main/res/drawable/ic_meta_date.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_date.xml rename to interfaces/src/main/res/drawable/ic_meta_date.xml diff --git a/core/src/main/res/drawable/ic_meta_encryption.xml b/interfaces/src/main/res/drawable/ic_meta_encryption.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_encryption.xml rename to interfaces/src/main/res/drawable/ic_meta_encryption.xml diff --git a/core/src/main/res/drawable/ic_meta_error.xml b/interfaces/src/main/res/drawable/ic_meta_error.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_error.xml rename to interfaces/src/main/res/drawable/ic_meta_error.xml diff --git a/core/src/main/res/drawable/ic_meta_flavour.xml b/interfaces/src/main/res/drawable/ic_meta_flavour.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_flavour.xml rename to interfaces/src/main/res/drawable/ic_meta_flavour.xml diff --git a/core/src/main/res/drawable/ic_meta_format.xml b/interfaces/src/main/res/drawable/ic_meta_format.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_format.xml rename to interfaces/src/main/res/drawable/ic_meta_format.xml diff --git a/core/src/main/res/drawable/ic_meta_model.xml b/interfaces/src/main/res/drawable/ic_meta_model.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_model.xml rename to interfaces/src/main/res/drawable/ic_meta_model.xml diff --git a/core/src/main/res/drawable/ic_meta_name.xml b/interfaces/src/main/res/drawable/ic_meta_name.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_name.xml rename to interfaces/src/main/res/drawable/ic_meta_name.xml diff --git a/core/src/main/res/drawable/ic_meta_ok.xml b/interfaces/src/main/res/drawable/ic_meta_ok.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_ok.xml rename to interfaces/src/main/res/drawable/ic_meta_ok.xml diff --git a/core/src/main/res/drawable/ic_meta_version.xml b/interfaces/src/main/res/drawable/ic_meta_version.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_version.xml rename to interfaces/src/main/res/drawable/ic_meta_version.xml diff --git a/core/src/main/res/drawable/ic_meta_warning.xml b/interfaces/src/main/res/drawable/ic_meta_warning.xml similarity index 100% rename from core/src/main/res/drawable/ic_meta_warning.xml rename to interfaces/src/main/res/drawable/ic_meta_warning.xml diff --git a/interfaces/src/main/res/values/strings.xml b/interfaces/src/main/res/values/strings.xml new file mode 100644 index 0000000000..af9dfa0380 --- /dev/null +++ b/interfaces/src/main/res/values/strings.xml @@ -0,0 +1,15 @@ + + + + File format + Created at + AAPS Version + Build Variant + Exporting device patient name + Exporting device model + File encryption + New encrypted format + New debug format (unencrypted) + Unknown export format + + diff --git a/openhumans/build.gradle b/openhumans/build.gradle index b163a0b21b..1d7f6b7f30 100644 --- a/openhumans/build.gradle +++ b/openhumans/build.gradle @@ -16,6 +16,7 @@ android { dependencies { implementation project(':core') implementation project(':database') + implementation project(':interfaces') implementation project(':app-wear-shared:rx') implementation project(':app-wear-shared:shared') } \ No newline at end of file diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt index 00a9440d3d..c1021b574e 100644 --- a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt +++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt @@ -17,7 +17,7 @@ import info.nightscout.androidaps.database.interfaces.TraceableDBEntry import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.rx.logging.AAPSLogger import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHAppIDDelegate import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHCounterDelegate @@ -59,7 +59,7 @@ class OpenHumansUploader @Inject internal constructor( private val rxBus: RxBus ) : PluginBase( PluginDescription() - .mainType(PluginType.GENERAL) + .mainType(info.nightscout.interfaces.PluginType.GENERAL) .pluginIcon(R.drawable.open_humans_white) .pluginName(R.string.open_humans) .shortName(R.string.open_humans_short) diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt index 41073537c1..71d1e091ee 100644 --- a/plugins/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventBucketedDataCreated import info.nightscout.androidaps.utils.DateUtil diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt index 7df92d2c54..4ad7d69c90 100644 --- a/plugins/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt @@ -7,7 +7,7 @@ import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.notifications.Notification import info.nightscout.androidaps.utils.T diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt index b27fe39aa4..49f49117e6 100644 --- a/plugins/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt @@ -7,7 +7,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.plugins.R import info.nightscout.rx.logging.AAPSLogger diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt index 6562898475..66ae53d359 100644 --- a/plugins/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt index cd01f1778f..aa8c24291a 100644 --- a/plugins/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index fde32fe206..27a3d65b1e 100644 --- a/plugins/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.constraints.versionChecker import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt index a5085f3783..c799655ef0 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt @@ -9,11 +9,11 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.Autotune -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt index 46da8f29b3..783a4c20ad 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.data.Block import info.nightscout.androidaps.extensions.blockValueBySeconds import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.Profile diff --git a/plugins/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt index 6a98347060..9915d11b2c 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt @@ -11,7 +11,7 @@ import info.nightscout.androidaps.database.transactions.SyncNsFoodTransaction import info.nightscout.androidaps.extensions.foodFromJson import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.JsonHelper diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt index 7bc63f45ef..71bb58b5b6 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -29,7 +29,7 @@ import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.CommandQueue -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.GlucoseUnit @@ -37,7 +37,7 @@ import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.PumpSync diff --git a/plugins/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt index 9bf37c08b7..070177a8c8 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt @@ -8,7 +8,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.plugins.R import info.nightscout.rx.bus.RxBus diff --git a/plugins/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt b/plugins/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt index 35227ac87d..2c7b5af1b6 100644 --- a/plugins/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.Loop import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt index 5def10483b..75da4030f2 100644 --- a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.insulin import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt index 91d221ec92..3b5964aefe 100644 --- a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt @@ -4,11 +4,11 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.data.Iob import info.nightscout.androidaps.database.embedments.InsulinConfiguration import info.nightscout.androidaps.database.entities.Bolus -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt index 1eb5b1a8f9..a577b737a2 100644 --- a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt @@ -3,7 +3,7 @@ package info.nightscout.plugins.insulin import dagger.android.HasAndroidInjector import info.nightscout.androidaps.extensions.putInt import info.nightscout.androidaps.extensions.storeInt -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt index 7c3f7341f4..4a77ee382c 100644 --- a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.insulin import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt index 5cb1f9f286..ac5b4e892d 100644 --- a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.insulin import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt index 68e12da3ac..6cfbbefac4 100644 --- a/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt @@ -13,11 +13,11 @@ import info.nightscout.androidaps.data.PureProfile import info.nightscout.androidaps.extensions.blockFromJsonArray import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.PluginBase import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileSource diff --git a/plugins/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/plugins/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index fca5f85d76..78bd435dc5 100644 --- a/plugins/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/plugins/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.embedments.InsulinConfiguration import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt index b9083fcf9b..d6d3636e9c 100644 --- a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt @@ -29,6 +29,7 @@ import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.interfaces.XDripBroadcast +import info.nightscout.interfaces.PluginType import info.nightscout.shared.sharedPreferences.SP import io.reactivex.rxjava3.core.Single import org.junit.Assert diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt index 1496ef2fe4..6f83ca556a 100644 --- a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.insulin import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt index fb40c87216..680b1cc75a 100644 --- a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt @@ -4,7 +4,7 @@ import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.Constants import info.nightscout.androidaps.database.entities.Bolus -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt index bc6bed979f..3f94e05521 100644 --- a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt @@ -3,7 +3,7 @@ package info.nightscout.plugins.insulin import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt index e119efb6b6..e8e6a65d20 100644 --- a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.insulin import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt index f1bee37c73..102a8c66e0 100644 --- a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.insulin import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Insulin import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper diff --git a/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java index 4aa0cea4f4..90a59a0476 100644 --- a/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java +++ b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java @@ -29,7 +29,7 @@ import info.nightscout.androidaps.interfaces.CommandQueue; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; import info.nightscout.androidaps.interfaces.PluginDescription; -import info.nightscout.androidaps.interfaces.PluginType; +import info.nightscout.interfaces.PluginType; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.interfaces.ProfileFunction; import info.nightscout.androidaps.interfaces.Pump; diff --git a/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt index 18aa351c7b..fd18ca6428 100644 --- a/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt +++ b/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt @@ -10,6 +10,7 @@ import info.nightscout.androidaps.interfaces.* import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.RuffyScripter import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus import info.nightscout.androidaps.utils.DateUtil +import info.nightscout.interfaces.PluginType import info.nightscout.rx.bus.RxBus import info.nightscout.shared.sharedPreferences.SP import org.junit.Assert diff --git a/pump/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index 372a9ae90b..d6ee4f06e1 100644 --- a/pump/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/pump/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore 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 19e0d06456..dd450c2f03 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 @@ -17,7 +17,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType 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 d033dd4224..8c03d9c3f6 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 @@ -3,7 +3,7 @@ package info.nightscout.androidaps.danaRKorean.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.R import info.nightscout.androidaps.danar.comm.MessageBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification import info.nightscout.rx.events.EventRebuildTabs 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 a78a231f4b..fd422c846a 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 @@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.dana.DanaPump import info.nightscout.androidaps.danar.R import info.nightscout.androidaps.danar.comm.MessageBase -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification import info.nightscout.rx.events.EventRebuildTabs 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 39d0e78af3..5da4a66aa8 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 @@ -19,7 +19,7 @@ import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; import info.nightscout.androidaps.interfaces.Dana; import info.nightscout.androidaps.interfaces.PluginDescription; -import info.nightscout.androidaps.interfaces.PluginType; +import info.nightscout.interfaces.PluginType; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.interfaces.Pump; import info.nightscout.androidaps.interfaces.PumpDescription; 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 5f0731b39b..41d16f8fe7 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 @@ -21,7 +21,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin; import info.nightscout.androidaps.interfaces.CommandQueue; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; -import info.nightscout.androidaps.interfaces.PluginType; +import info.nightscout.interfaces.PluginType; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.interfaces.PumpSync; import info.nightscout.androidaps.interfaces.ResourceHelper; 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 b6eb7083f1..212d9a6cce 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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.danar.comm import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danar.R -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification import info.nightscout.rx.events.EventRebuildTabs diff --git a/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index 4f057d84a9..c6422c2fa3 100644 --- a/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt index e56c04020d..b2cca57328 100644 --- a/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin import info.nightscout.androidaps.danar.R import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.Constraint -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.shared.sharedPreferences.SP diff --git a/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt index 5cb2260983..8ff8fbdde1 100644 --- a/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danar.R import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.Constraint -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.shared.sharedPreferences.SP diff --git a/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt index bd7e61a7fa..8562ee3832 100644 --- a/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.danaRv2.DanaRv2Plugin import info.nightscout.androidaps.danar.R import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.Constraint -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt index 16016d2838..d5e6013790 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt @@ -22,7 +22,7 @@ import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.Dana import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.Pump diff --git a/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index 3eb646de24..ba7d59b17f 100644 --- a/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore diff --git a/pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt index 6dbc566fd5..2e32594abb 100644 --- a/pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt +++ b/pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt @@ -5,7 +5,7 @@ import dagger.android.AndroidInjector import info.nightscout.androidaps.Constants import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.Constraint -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt index 4acb928f1d..270c6cdd80 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt @@ -20,7 +20,7 @@ import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.Diaconn import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.Pump 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 8016a4495b..56c6b49b54 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 @@ -7,7 +7,7 @@ import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.Pump import info.nightscout.androidaps.interfaces.PumpDescription 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 0c3553b231..044213d96b 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 @@ -13,7 +13,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.Pump import info.nightscout.androidaps.interfaces.PumpSync 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 314e6af0a3..56d8bea964 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 @@ -14,7 +14,7 @@ import info.nightscout.androidaps.extensions.toStringFull import info.nightscout.androidaps.interfaces.ActivityNames import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.PluginDescription -import info.nightscout.androidaps.interfaces.PluginType +import info.nightscout.interfaces.PluginType import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.Pump 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 5460da9347..8b242dc867 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 @@ -4,7 +4,7 @@ import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothManager import android.content.Context import info.nightscout.androidaps.extensions.toHex -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config 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/pair/KeyExchange.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt index a8703cfab9..7132835a27 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,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import info.nightscout.androidaps.extensions.toHex -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config 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 7426d112f6..8d61cd9ca0 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 @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import info.nightscout.androidaps.extensions.hexStringToByteArray import info.nightscout.androidaps.extensions.toHex -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config 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/session/Connection.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt index 94ac634c28..6fcbfd65b4 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 @@ -8,7 +8,7 @@ import android.content.Context import android.os.SystemClock import info.nightscout.androidaps.Constants import info.nightscout.androidaps.extensions.toHex -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config 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/Milenage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt index 48de01938a..09c6fe015e 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,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import info.nightscout.androidaps.extensions.toHex -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import org.spongycastle.util.encoders.Hex 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 52987ef873..b950c58afa 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,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import info.nightscout.androidaps.extensions.toHex -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config 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/ui/OmnipodDashOverviewFragment.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt index 73f76633c2..10f9e7ea6e 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 @@ -13,7 +13,7 @@ import info.nightscout.androidaps.Constants import info.nightscout.androidaps.events.EventPreferenceChange import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.interfaces.ActivityNames -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification 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 c9f73dc12e..ab4d6fc375 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 @@ -41,7 +41,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin; import info.nightscout.androidaps.interfaces.ActivityNames; import info.nightscout.androidaps.interfaces.CommandQueue; import info.nightscout.androidaps.interfaces.PluginDescription; -import info.nightscout.androidaps.interfaces.PluginType; +import info.nightscout.interfaces.PluginType; import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.interfaces.ProfileFunction; import info.nightscout.androidaps.interfaces.Pump; 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 e91275e9be..8123bfc461 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 @@ -9,7 +9,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.activities.NoSplashAppCompatActivity import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivityNames -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.CommandQueue import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity 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 efd8b123fd..5e1103458f 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,7 +15,7 @@ import android.content.pm.PackageManager import android.os.Build import android.os.SystemClock import androidx.core.content.ContextCompat -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config 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/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt index d3a379c7ce..5a955105eb 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt @@ -8,7 +8,7 @@ import com.google.android.material.tabs.TabLayout import info.nightscout.androidaps.activities.NoSplashAppCompatActivity import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.ui.R import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment 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 45d5b8b42d..194de5288f 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 @@ -31,7 +31,7 @@ import info.nightscout.androidaps.events.EventNewHistoryData import info.nightscout.androidaps.extensions.iobCalc import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger 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 5cd53e36ca..cb770001a5 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 @@ -20,7 +20,7 @@ import info.nightscout.androidaps.database.transactions.InvalidateTherapyEventTr import info.nightscout.rx.events.EventNSClientRestart import info.nightscout.rx.events.EventTherapyEventChange import info.nightscout.androidaps.extensions.toVisibility -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.rx.bus.RxBus 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 f9d0688a2e..05bccb89f8 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 @@ -31,7 +31,7 @@ import info.nightscout.rx.events.EventProfileSwitchChanged import info.nightscout.androidaps.extensions.getCustomizedName import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.rx.bus.RxBus 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 d9645c9b6f..3b01bc3e3a 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 @@ -29,7 +29,7 @@ import info.nightscout.androidaps.extensions.friendlyDescription import info.nightscout.androidaps.extensions.highValueToUnitsToString import info.nightscout.androidaps.extensions.lowValueToUnitsToString import info.nightscout.androidaps.extensions.toVisibility -import info.nightscout.androidaps.interfaces.BuildHelper +import info.nightscout.interfaces.BuildHelper import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger diff --git a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt index 32f7f03de1..de35a30027 100644 --- a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt +++ b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt @@ -21,7 +21,7 @@ import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.interfaces.ActivePlugin import info.nightscout.androidaps.interfaces.ActivityNames -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.Constraints import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.interfaces.IobCobCalculator @@ -30,7 +30,7 @@ import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.interfaces.TrendCalculator -import info.nightscout.androidaps.interfaces.VariableSensitivityResult +import info.nightscout.interfaces.VariableSensitivityResult import info.nightscout.androidaps.plugins.general.overview.OverviewData import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider import info.nightscout.androidaps.utils.DateUtil diff --git a/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt index cd2f05f706..76169aff12 100644 --- a/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt +++ b/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.embedments.InsulinConfiguration import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch import info.nightscout.androidaps.extensions.pureProfileFromJson import info.nightscout.androidaps.interfaces.ActivePlugin -import info.nightscout.androidaps.interfaces.Config +import info.nightscout.interfaces.Config import info.nightscout.androidaps.interfaces.IobCobCalculator import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.interfaces.ProfileStore