From aa010a03b29389cdc178961f62df096b70bd1f35 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 25 Sep 2023 23:14:05 +0200 Subject: [PATCH] :implementation cleanup --- app/src/main/kotlin/app/aaps/MainApp.kt | 8 +-- .../app/aaps/activities/HistoryBrowserData.kt | 8 +-- .../aaps/activities/MyPreferenceFragment.kt | 4 +- .../main/kotlin/app/aaps/di/AppComponent.kt | 4 +- .../aaps/implementations/InstantiatorImpl.kt | 2 +- implementation/build.gradle | 2 +- .../alerts}/LocalAlertUtilsImpl.kt | 2 +- .../NotificationHolderImpl.kt | 2 +- .../aaps}/implementation/db/CompatDBHelper.kt | 2 +- .../implementation/db/PersistenceLayerImpl.kt | 2 +- .../implementation/di/CommandQueueModule.kt | 44 ++++++------ .../implementation/di/ImplementationModule.kt | 72 +++++++++---------- .../iob/GlucoseStatusProviderImpl.kt | 6 +- .../lifecycle/ProcessLifecycleListener.kt | 2 +- .../implementation/logging/LoggerUtilsImpl.kt | 2 +- .../logging}/UserEntryLoggerImpl.kt | 2 +- .../overview/OverviewDataImpl.kt | 2 +- .../implementation/plugin/PluginStore.kt | 2 +- .../profile}/DefaultValueHelperImpl.kt | 2 +- .../profile/ProfileFunctionImpl.kt | 2 +- .../profile/ProfileStoreObject.kt | 2 +- .../implementation/profile/ProfileUtilImpl.kt | 2 +- .../implementation/profiling/ProfilerImpl.kt | 2 +- .../protection/BiometricCheck.kt | 2 +- .../protection/PasswordCheckImpl.kt | 8 +-- .../protection/ProtectionCheckImpl.kt | 2 +- .../implementation/pump/BlePreCheckImpl.kt | 2 +- .../pump/DetailedBolusInfoStorageImpl.kt | 4 +- .../pump/PumpSyncImplementation.kt | 2 +- .../pump/TemporaryBasalStorageImpl.kt | 2 +- .../implementation/pump/WarnColorsImpl.kt | 2 +- .../queue/CommandQueueImplementation.kt | 44 ++++++------ .../aaps}/implementation/queue/QueueThread.kt | 2 +- .../queue/commands/CommandBolus.kt | 2 +- .../commands/CommandCancelExtendedBolus.kt | 2 +- .../queue/commands/CommandCancelTempBasal.kt | 2 +- .../queue/commands/CommandClearAlarms.kt | 2 +- .../queue/commands/CommandCustomCommand.kt | 2 +- .../queue/commands/CommandDeactivate.kt | 2 +- .../queue/commands/CommandExtendedBolus.kt | 2 +- .../CommandInsightSetTBROverNotification.kt | 2 +- .../queue/commands/CommandLoadEvents.kt | 2 +- .../queue/commands/CommandLoadHistory.kt | 2 +- .../queue/commands/CommandLoadTDDs.kt | 2 +- .../queue/commands/CommandReadStatus.kt | 2 +- .../queue/commands/CommandSMBBolus.kt | 2 +- .../queue/commands/CommandSetProfile.kt | 2 +- .../queue/commands/CommandSetUserSettings.kt | 2 +- .../queue/commands/CommandStartPump.kt | 2 +- .../queue/commands/CommandStopPump.kt | 2 +- .../commands/CommandTempBasalAbsolute.kt | 2 +- .../queue/commands/CommandTempBasalPercent.kt | 2 +- .../queue/commands/CommandUpdateTime.kt | 2 +- .../receivers/NetworkChangeReceiver.kt | 2 +- .../receivers/ReceiverStatusStoreImpl.kt | 2 +- .../resources/IconsProviderImplementation.kt | 4 +- .../resources/ResourceHelperImpl.kt | 4 +- .../stats/DexcomTirCalculatorImpl.kt | 2 +- .../implementation/stats/DexcomTirImpl.kt | 4 +- .../implementation/stats/TddCalculatorImpl.kt | 2 +- .../implementation/stats/TirCalculatorImpl.kt | 2 +- .../app/aaps}/implementation/stats/TirImpl.kt | 4 +- .../stats/TotalDailyDoseExtension.kt | 4 +- .../implementation/storage/FileStorage.kt | 2 +- .../UserEntryPresentationHelperImpl.kt | 2 +- .../utils/DecimalFormatterImpl.kt | 2 +- .../implementation/utils}/HardLimitsImpl.kt | 2 +- .../implementation/utils}/TranslatorImpl.kt | 2 +- .../utils}/TrendCalculatorImpl.kt | 2 +- .../implementation/iob/GlucoseStatusTest.kt | 2 +- .../overview/OverviewDataImplTest.kt | 2 +- .../profile/ProfileStoreTest.kt | 4 +- .../profile/ProfileUtilImplTest.kt | 4 +- .../pump/DetailedBolusInfoStorageTest.kt | 4 +- .../pump/TemporaryBasalStorageTest.kt | 2 +- .../queue/CommandQueueImplementationTest.kt | 12 ++-- .../implementation/queue/QueueThreadTest.kt | 6 +- .../utils/DecimalFormatterTest.kt | 2 +- .../implementation/wizard/BolusWizardTest.kt | 6 +- .../interfaces/pump/PumpEnactResultTest.kt | 4 +- .../automation/triggers/TriggerTestBase.kt | 2 +- .../constraints/ConstraintsCheckerImplTest.kt | 2 +- .../SmsCommunicatorPluginTest.kt | 2 +- .../nsclientV3/workers/LoadBgWorkerTest.kt | 2 +- .../omnipod/eros/OmnipodErosPumpPluginTest.kt | 2 +- .../aaps/shared/tests/TestBaseWithProfile.kt | 6 +- 86 files changed, 197 insertions(+), 197 deletions(-) rename implementation/src/main/{java/info/nightscout/implementation => kotlin/app/aaps/implementation/alerts}/LocalAlertUtilsImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/androidNotification/NotificationHolderImpl.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/db/CompatDBHelper.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/db/PersistenceLayerImpl.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/di/CommandQueueModule.kt (57%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/di/ImplementationModule.kt (70%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/iob/GlucoseStatusProviderImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/lifecycle/ProcessLifecycleListener.kt (89%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/logging/LoggerUtilsImpl.kt (95%) rename implementation/src/main/{java/info/nightscout/implementation => kotlin/app/aaps/implementation/logging}/UserEntryLoggerImpl.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/overview/OverviewDataImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/plugin/PluginStore.kt (99%) rename implementation/src/main/{java/info/nightscout/implementation => kotlin/app/aaps/implementation/profile}/DefaultValueHelperImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/profile/ProfileFunctionImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/profile/ProfileStoreObject.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/profile/ProfileUtilImpl.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/profiling/ProfilerImpl.kt (92%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/protection/BiometricCheck.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/protection/PasswordCheckImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/protection/ProtectionCheckImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/BlePreCheckImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/DetailedBolusInfoStorageImpl.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/PumpSyncImplementation.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/TemporaryBasalStorageImpl.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/WarnColorsImpl.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/CommandQueueImplementation.kt (94%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/QueueThread.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandBolus.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandCancelExtendedBolus.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandCancelTempBasal.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandClearAlarms.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandCustomCommand.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandDeactivate.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandExtendedBolus.kt (96%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandInsightSetTBROverNotification.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandLoadEvents.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandLoadHistory.kt (96%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandLoadTDDs.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandReadStatus.kt (96%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandSMBBolus.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandSetProfile.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandSetUserSettings.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandStartPump.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandStopPump.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandTempBasalAbsolute.kt (96%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandTempBasalPercent.kt (96%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/commands/CommandUpdateTime.kt (95%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/receivers/NetworkChangeReceiver.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/receivers/ReceiverStatusStoreImpl.kt (96%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/resources/IconsProviderImplementation.kt (91%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/resources/ResourceHelperImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/stats/DexcomTirCalculatorImpl.kt (97%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/stats/DexcomTirImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/stats/TddCalculatorImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/stats/TirCalculatorImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/stats/TirImpl.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/stats/TotalDailyDoseExtension.kt (98%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/storage/FileStorage.kt (89%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/userEntry/UserEntryPresentationHelperImpl.kt (99%) rename implementation/src/main/{java/info/nightscout => kotlin/app/aaps}/implementation/utils/DecimalFormatterImpl.kt (97%) rename implementation/src/main/{java/info/nightscout/implementation => kotlin/app/aaps/implementation/utils}/HardLimitsImpl.kt (99%) rename implementation/src/main/{java/info/nightscout/implementation => kotlin/app/aaps/implementation/utils}/TranslatorImpl.kt (99%) rename implementation/src/main/{java/info/nightscout/implementation => kotlin/app/aaps/implementation/utils}/TrendCalculatorImpl.kt (99%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/iob/GlucoseStatusTest.kt (99%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/overview/OverviewDataImplTest.kt (98%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/profile/ProfileStoreTest.kt (96%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/profile/ProfileUtilImplTest.kt (95%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/DetailedBolusInfoStorageTest.kt (97%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/pump/TemporaryBasalStorageTest.kt (98%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/CommandQueueImplementationTest.kt (98%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/queue/QueueThreadTest.kt (96%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/utils/DecimalFormatterTest.kt (96%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/implementation/wizard/BolusWizardTest.kt (98%) rename implementation/src/test/{java/info/nightscout => kotlin/app/aaps}/interfaces/pump/PumpEnactResultTest.kt (99%) diff --git a/app/src/main/kotlin/app/aaps/MainApp.kt b/app/src/main/kotlin/app/aaps/MainApp.kt index e1101296b6..7dc27770d2 100644 --- a/app/src/main/kotlin/app/aaps/MainApp.kt +++ b/app/src/main/kotlin/app/aaps/MainApp.kt @@ -31,6 +31,10 @@ import app.aaps.core.ui.locale.LocaleHelper import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.UserEntry import app.aaps.di.DaggerAppComponent +import app.aaps.implementation.db.CompatDBHelper +import app.aaps.implementation.lifecycle.ProcessLifecycleListener +import app.aaps.implementation.plugin.PluginStore +import app.aaps.implementation.receivers.NetworkChangeReceiver import app.aaps.receivers.BTReceiver import app.aaps.receivers.ChargingStateReceiver import app.aaps.receivers.KeepAliveWorker @@ -42,10 +46,6 @@ import info.nightscout.androidaps.R import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.VersionChangeTransaction -import info.nightscout.implementation.db.CompatDBHelper -import info.nightscout.implementation.lifecycle.ProcessLifecycleListener -import info.nightscout.implementation.plugin.PluginStore -import info.nightscout.implementation.receivers.NetworkChangeReceiver import info.nightscout.plugins.aps.utils.StaticInjector import info.nightscout.plugins.general.overview.notifications.NotificationStore import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt index b83662ae3f..ff4ec88c38 100644 --- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt +++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt @@ -1,8 +1,5 @@ package app.aaps.activities -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.profile.DefaultValueHelper @@ -13,9 +10,12 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.main.workflow.CalculationWorkflow +import app.aaps.implementation.overview.OverviewDataImpl import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.overview.OverviewDataImpl import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt index e570fa2715..f47bf711f5 100644 --- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt @@ -31,6 +31,8 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventRebuildTabs import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.implementation.plugin.PluginStore import dagger.android.support.AndroidSupportInjection import info.nightscout.androidaps.R import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin @@ -40,8 +42,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.automation.AutomationPlugin -import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.implementation.plugin.PluginStore import info.nightscout.insulin.InsulinOrefFreePeakPlugin import info.nightscout.plugins.aps.loop.LoopPlugin import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin diff --git a/app/src/main/kotlin/app/aaps/di/AppComponent.kt b/app/src/main/kotlin/app/aaps/di/AppComponent.kt index fc91e86655..9d6a7df1f7 100644 --- a/app/src/main/kotlin/app/aaps/di/AppComponent.kt +++ b/app/src/main/kotlin/app/aaps/di/AppComponent.kt @@ -3,6 +3,8 @@ package app.aaps.di import app.aaps.MainApp import app.aaps.configuration.di.ConfigurationModule import app.aaps.core.main.di.CoreModule +import app.aaps.core.validators.di.ValidatorsModule +import app.aaps.implementation.di.ImplementationModule import app.aaps.shared.impl.di.SharedImplModule import dagger.BindsInstance import dagger.Component @@ -17,9 +19,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule import info.nightscout.automation.di.AutomationModule -import app.aaps.core.validators.di.ValidatorsModule import info.nightscout.database.impl.DatabaseModule -import info.nightscout.implementation.di.ImplementationModule import info.nightscout.insulin.di.InsulinModule import info.nightscout.plugins.aps.di.ApsModule import info.nightscout.plugins.constraints.di.PluginsConstraintsModule diff --git a/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt b/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt index 1eaa1401b7..5cb0a6ae97 100644 --- a/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt @@ -5,9 +5,9 @@ import app.aaps.core.interfaces.aps.AutosensData import app.aaps.core.interfaces.objects.Instantiator import app.aaps.core.interfaces.profile.ProfileStore import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.implementation.profile.ProfileStoreObject import dagger.Reusable import dagger.android.HasAndroidInjector -import info.nightscout.implementation.profile.ProfileStoreObject import info.nightscout.plugins.aps.APSResultObject import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject import org.json.JSONObject diff --git a/implementation/build.gradle b/implementation/build.gradle index 224a629b69..ac3a14775f 100644 --- a/implementation/build.gradle +++ b/implementation/build.gradle @@ -11,7 +11,7 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" android { - namespace 'info.nightscout.implementation' + namespace 'app.aaps.implementation' } dependencies { diff --git a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/alerts/LocalAlertUtilsImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/alerts/LocalAlertUtilsImpl.kt index a0a093706d..54cae16e54 100644 --- a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/alerts/LocalAlertUtilsImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation +package app.aaps.implementation.alerts import app.aaps.core.interfaces.alerts.LocalAlertUtils import app.aaps.core.interfaces.configuration.Config diff --git a/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/androidNotification/NotificationHolderImpl.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/androidNotification/NotificationHolderImpl.kt index 6154319395..ed304d824b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/androidNotification/NotificationHolderImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.androidNotification +package app.aaps.implementation.androidNotification import android.app.Notification import android.app.NotificationChannel diff --git a/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt b/implementation/src/main/kotlin/app/aaps/implementation/db/CompatDBHelper.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt rename to implementation/src/main/kotlin/app/aaps/implementation/db/CompatDBHelper.kt index d0cf4fefab..d27bcc4eca 100644 --- a/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/db/CompatDBHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.db +package app.aaps.implementation.db import android.content.Context import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/db/PersistenceLayerImpl.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/db/PersistenceLayerImpl.kt index bcd9739154..c52ea63442 100644 --- a/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/db/PersistenceLayerImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.db +package app.aaps.implementation.db import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/implementation/src/main/java/info/nightscout/implementation/di/CommandQueueModule.kt b/implementation/src/main/kotlin/app/aaps/implementation/di/CommandQueueModule.kt similarity index 57% rename from implementation/src/main/java/info/nightscout/implementation/di/CommandQueueModule.kt rename to implementation/src/main/kotlin/app/aaps/implementation/di/CommandQueueModule.kt index 3c83defd4f..5e425b751d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/di/CommandQueueModule.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/di/CommandQueueModule.kt @@ -1,28 +1,28 @@ -package info.nightscout.implementation.di +package app.aaps.implementation.di +import app.aaps.implementation.queue.CommandQueueImplementation +import app.aaps.implementation.queue.commands.CommandBolus +import app.aaps.implementation.queue.commands.CommandCancelExtendedBolus +import app.aaps.implementation.queue.commands.CommandCancelTempBasal +import app.aaps.implementation.queue.commands.CommandClearAlarms +import app.aaps.implementation.queue.commands.CommandCustomCommand +import app.aaps.implementation.queue.commands.CommandDeactivate +import app.aaps.implementation.queue.commands.CommandExtendedBolus +import app.aaps.implementation.queue.commands.CommandInsightSetTBROverNotification +import app.aaps.implementation.queue.commands.CommandLoadEvents +import app.aaps.implementation.queue.commands.CommandLoadHistory +import app.aaps.implementation.queue.commands.CommandLoadTDDs +import app.aaps.implementation.queue.commands.CommandReadStatus +import app.aaps.implementation.queue.commands.CommandSMBBolus +import app.aaps.implementation.queue.commands.CommandSetProfile +import app.aaps.implementation.queue.commands.CommandSetUserSettings +import app.aaps.implementation.queue.commands.CommandStartPump +import app.aaps.implementation.queue.commands.CommandStopPump +import app.aaps.implementation.queue.commands.CommandTempBasalAbsolute +import app.aaps.implementation.queue.commands.CommandTempBasalPercent +import app.aaps.implementation.queue.commands.CommandUpdateTime import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.implementation.queue.CommandQueueImplementation -import info.nightscout.implementation.queue.commands.CommandReadStatus -import info.nightscout.implementation.queue.commands.CommandSMBBolus -import info.nightscout.implementation.queue.commands.CommandSetProfile -import info.nightscout.implementation.queue.commands.CommandSetUserSettings -import info.nightscout.implementation.queue.commands.CommandStartPump -import info.nightscout.implementation.queue.commands.CommandStopPump -import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute -import info.nightscout.implementation.queue.commands.CommandTempBasalPercent -import info.nightscout.implementation.queue.commands.CommandBolus -import info.nightscout.implementation.queue.commands.CommandCancelExtendedBolus -import info.nightscout.implementation.queue.commands.CommandCancelTempBasal -import info.nightscout.implementation.queue.commands.CommandClearAlarms -import info.nightscout.implementation.queue.commands.CommandCustomCommand -import info.nightscout.implementation.queue.commands.CommandDeactivate -import info.nightscout.implementation.queue.commands.CommandExtendedBolus -import info.nightscout.implementation.queue.commands.CommandInsightSetTBROverNotification -import info.nightscout.implementation.queue.commands.CommandLoadEvents -import info.nightscout.implementation.queue.commands.CommandLoadHistory -import info.nightscout.implementation.queue.commands.CommandLoadTDDs -import info.nightscout.implementation.queue.commands.CommandUpdateTime @Module @Suppress("unused") diff --git a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt b/implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt similarity index 70% rename from implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt rename to implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt index 23a0cd200e..d840ec985f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt @@ -1,6 +1,5 @@ -package info.nightscout.implementation.di +package app.aaps.implementation.di -import app.aaps.core.main.graph.OverviewData import app.aaps.core.interfaces.alerts.LocalAlertUtils import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.iob.GlucoseStatusProvider @@ -32,43 +31,44 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.Translator import app.aaps.core.interfaces.utils.TrendCalculator +import app.aaps.core.main.graph.OverviewData +import app.aaps.implementation.alerts.LocalAlertUtilsImpl +import app.aaps.implementation.androidNotification.NotificationHolderImpl +import app.aaps.implementation.db.PersistenceLayerImpl +import app.aaps.implementation.iob.GlucoseStatusProviderImpl +import app.aaps.implementation.logging.LoggerUtilsImpl +import app.aaps.implementation.logging.UserEntryLoggerImpl +import app.aaps.implementation.overview.OverviewDataImpl +import app.aaps.implementation.plugin.PluginStore +import app.aaps.implementation.profile.DefaultValueHelperImpl +import app.aaps.implementation.profile.ProfileFunctionImpl +import app.aaps.implementation.profile.ProfileStoreObject +import app.aaps.implementation.profile.ProfileUtilImpl +import app.aaps.implementation.profiling.ProfilerImpl +import app.aaps.implementation.protection.PasswordCheckImpl +import app.aaps.implementation.protection.ProtectionCheckImpl +import app.aaps.implementation.pump.BlePreCheckImpl +import app.aaps.implementation.pump.DetailedBolusInfoStorageImpl +import app.aaps.implementation.pump.PumpSyncImplementation +import app.aaps.implementation.pump.TemporaryBasalStorageImpl +import app.aaps.implementation.pump.WarnColorsImpl +import app.aaps.implementation.queue.CommandQueueImplementation +import app.aaps.implementation.receivers.NetworkChangeReceiver +import app.aaps.implementation.receivers.ReceiverStatusStoreImpl +import app.aaps.implementation.resources.IconsProviderImplementation +import app.aaps.implementation.resources.ResourceHelperImpl +import app.aaps.implementation.stats.DexcomTirCalculatorImpl +import app.aaps.implementation.stats.TddCalculatorImpl +import app.aaps.implementation.stats.TirCalculatorImpl +import app.aaps.implementation.storage.FileStorage +import app.aaps.implementation.userEntry.UserEntryPresentationHelperImpl +import app.aaps.implementation.utils.DecimalFormatterImpl +import app.aaps.implementation.utils.HardLimitsImpl +import app.aaps.implementation.utils.TranslatorImpl +import app.aaps.implementation.utils.TrendCalculatorImpl import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.implementation.DefaultValueHelperImpl -import info.nightscout.implementation.HardLimitsImpl -import info.nightscout.implementation.LocalAlertUtilsImpl -import info.nightscout.implementation.TranslatorImpl -import info.nightscout.implementation.TrendCalculatorImpl -import info.nightscout.implementation.UserEntryLoggerImpl -import info.nightscout.implementation.androidNotification.NotificationHolderImpl -import info.nightscout.implementation.db.PersistenceLayerImpl -import info.nightscout.implementation.iob.GlucoseStatusProviderImpl -import info.nightscout.implementation.logging.LoggerUtilsImpl -import info.nightscout.implementation.overview.OverviewDataImpl -import info.nightscout.implementation.plugin.PluginStore -import info.nightscout.implementation.profile.ProfileFunctionImpl -import info.nightscout.implementation.profile.ProfileStoreObject -import info.nightscout.implementation.profile.ProfileUtilImpl -import info.nightscout.implementation.profiling.ProfilerImpl -import info.nightscout.implementation.protection.PasswordCheckImpl -import info.nightscout.implementation.protection.ProtectionCheckImpl -import info.nightscout.implementation.pump.BlePreCheckImpl -import info.nightscout.implementation.pump.DetailedBolusInfoStorageImpl -import info.nightscout.implementation.pump.PumpSyncImplementation -import info.nightscout.implementation.pump.TemporaryBasalStorageImpl -import info.nightscout.implementation.pump.WarnColorsImpl -import info.nightscout.implementation.queue.CommandQueueImplementation -import info.nightscout.implementation.receivers.NetworkChangeReceiver -import info.nightscout.implementation.receivers.ReceiverStatusStoreImpl -import info.nightscout.implementation.resources.IconsProviderImplementation -import info.nightscout.implementation.resources.ResourceHelperImpl -import info.nightscout.implementation.stats.DexcomTirCalculatorImpl -import info.nightscout.implementation.stats.TddCalculatorImpl -import info.nightscout.implementation.stats.TirCalculatorImpl -import info.nightscout.implementation.storage.FileStorage -import info.nightscout.implementation.userEntry.UserEntryPresentationHelperImpl -import info.nightscout.implementation.utils.DecimalFormatterImpl @Module( includes = [ diff --git a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/iob/GlucoseStatusProviderImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/iob/GlucoseStatusProviderImpl.kt index 5eb3e4d4e5..77c8a5606a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/iob/GlucoseStatusProviderImpl.kt @@ -1,8 +1,6 @@ -package info.nightscout.implementation.iob +package app.aaps.implementation.iob import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.iob.asRounded -import app.aaps.core.main.iob.log import app.aaps.core.interfaces.iob.GlucoseStatus import app.aaps.core.interfaces.iob.GlucoseStatusProvider import app.aaps.core.interfaces.iob.IobCobCalculator @@ -10,6 +8,8 @@ import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.main.iob.asRounded +import app.aaps.core.main.iob.log import dagger.Reusable import javax.inject.Inject import kotlin.math.roundToLong diff --git a/implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt b/implementation/src/main/kotlin/app/aaps/implementation/lifecycle/ProcessLifecycleListener.kt similarity index 89% rename from implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt rename to implementation/src/main/kotlin/app/aaps/implementation/lifecycle/ProcessLifecycleListener.kt index 0a6e71dc1b..b023c974f1 100644 --- a/implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/lifecycle/ProcessLifecycleListener.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.lifecycle +package app.aaps.implementation.lifecycle import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner diff --git a/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/logging/LoggerUtilsImpl.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/logging/LoggerUtilsImpl.kt index 50d42c823f..d53cd814fb 100644 --- a/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/logging/LoggerUtilsImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.logging +package app.aaps.implementation.logging import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.logging.LoggerUtils diff --git a/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/logging/UserEntryLoggerImpl.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/logging/UserEntryLoggerImpl.kt index 83eedf6647..01de79653b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/logging/UserEntryLoggerImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation +package app.aaps.implementation.logging import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/overview/OverviewDataImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/overview/OverviewDataImpl.kt index 8b4c40d9c7..35f65be2e6 100644 --- a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/overview/OverviewDataImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.overview +package app.aaps.implementation.overview import android.content.Context import androidx.annotation.AttrRes diff --git a/implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt b/implementation/src/main/kotlin/app/aaps/implementation/plugin/PluginStore.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt rename to implementation/src/main/kotlin/app/aaps/implementation/plugin/PluginStore.kt index 187f192969..7b4a97e7d7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/plugin/PluginStore.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.plugin +package app.aaps.implementation.plugin import app.aaps.core.interfaces.aps.APS import app.aaps.core.interfaces.aps.Sensitivity diff --git a/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/profile/DefaultValueHelperImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/profile/DefaultValueHelperImpl.kt index 9ec45b093f..0ad91a518e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/profile/DefaultValueHelperImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation +package app.aaps.implementation.profile import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.configuration.Constants diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt index f8070ab999..8aab6075cc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.profile +package app.aaps.implementation.profile import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.db.GlucoseUnit diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileStoreObject.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt rename to implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileStoreObject.kt index 024d294138..a1c01d8f71 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileStoreObject.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.profile +package app.aaps.implementation.profile import androidx.collection.ArrayMap import app.aaps.core.interfaces.configuration.Config diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileUtilImpl.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileUtilImpl.kt index 18476ffc1b..990af1515f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileUtilImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.profile +package app.aaps.implementation.profile import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.ProfileUtil diff --git a/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/profiling/ProfilerImpl.kt similarity index 92% rename from implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/profiling/ProfilerImpl.kt index 3182a00154..609e879d9d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/profiling/ProfilerImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.profiling +package app.aaps.implementation.profiling import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt b/implementation/src/main/kotlin/app/aaps/implementation/protection/BiometricCheck.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt rename to implementation/src/main/kotlin/app/aaps/implementation/protection/BiometricCheck.kt index b1623269ec..0a7f208904 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/protection/BiometricCheck.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.protection +package app.aaps.implementation.protection import androidx.biometric.BiometricPrompt import androidx.biometric.BiometricPrompt.AuthenticationResult diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/protection/PasswordCheckImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/protection/PasswordCheckImpl.kt index f9a9524f21..9874b556a0 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/protection/PasswordCheckImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.protection +package app.aaps.implementation.protection import android.annotation.SuppressLint import android.content.Context @@ -11,13 +11,13 @@ import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.TextView import androidx.annotation.StringRes -import app.aaps.core.main.R -import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.interfaces.protection.PasswordCheck import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.main.R +import app.aaps.core.main.utils.CryptoUtil +import app.aaps.core.ui.toast.ToastUtils import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.Reusable -import app.aaps.core.ui.toast.ToastUtils import javax.inject.Inject @Reusable diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/protection/ProtectionCheckImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/protection/ProtectionCheckImpl.kt index e4627da8df..89d753bdfe 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/protection/ProtectionCheckImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.protection +package app.aaps.implementation.protection import androidx.fragment.app.FragmentActivity import app.aaps.core.interfaces.protection.PasswordCheck diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/pump/BlePreCheckImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/pump/BlePreCheckImpl.kt index f61b53efb0..6d0177973f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/pump/BlePreCheckImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import android.Manifest import android.bluetooth.BluetoothManager diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageImpl.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageImpl.kt index 0b520d3eda..6b9bdccc67 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.logging.AAPSLogger @@ -8,9 +8,9 @@ import app.aaps.core.interfaces.pump.DetailedBolusInfoStorage import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.T +import app.aaps.implementation.R import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import info.nightscout.implementation.R import javax.inject.Inject import javax.inject.Singleton import kotlin.math.abs diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt b/implementation/src/main/kotlin/app/aaps/implementation/pump/PumpSyncImplementation.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt rename to implementation/src/main/kotlin/app/aaps/implementation/pump/PumpSyncImplementation.kt index 974e4ab88f..f0e9b1ee8c 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/pump/PumpSyncImplementation.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageImpl.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageImpl.kt index 769ef7ccc8..ff75ffd941 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/pump/WarnColorsImpl.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/pump/WarnColorsImpl.kt index 469e9f4504..fab6ef2266 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/pump/WarnColorsImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import android.widget.TextView import app.aaps.core.interfaces.pump.WarnColors diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt similarity index 94% rename from implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt index ac0fdacc9f..7ddd2d8b73 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue +package app.aaps.implementation.queue import android.content.Context import android.content.Intent @@ -48,29 +48,29 @@ import app.aaps.database.ValueWrapper import app.aaps.database.entities.EffectiveProfileSwitch import app.aaps.database.entities.ProfileSwitch import app.aaps.database.entities.interfaces.end +import app.aaps.implementation.R +import app.aaps.implementation.queue.commands.CommandBolus +import app.aaps.implementation.queue.commands.CommandCancelExtendedBolus +import app.aaps.implementation.queue.commands.CommandCancelTempBasal +import app.aaps.implementation.queue.commands.CommandClearAlarms +import app.aaps.implementation.queue.commands.CommandCustomCommand +import app.aaps.implementation.queue.commands.CommandDeactivate +import app.aaps.implementation.queue.commands.CommandExtendedBolus +import app.aaps.implementation.queue.commands.CommandInsightSetTBROverNotification +import app.aaps.implementation.queue.commands.CommandLoadEvents +import app.aaps.implementation.queue.commands.CommandLoadHistory +import app.aaps.implementation.queue.commands.CommandLoadTDDs +import app.aaps.implementation.queue.commands.CommandReadStatus +import app.aaps.implementation.queue.commands.CommandSMBBolus +import app.aaps.implementation.queue.commands.CommandSetProfile +import app.aaps.implementation.queue.commands.CommandSetUserSettings +import app.aaps.implementation.queue.commands.CommandStartPump +import app.aaps.implementation.queue.commands.CommandStopPump +import app.aaps.implementation.queue.commands.CommandTempBasalAbsolute +import app.aaps.implementation.queue.commands.CommandTempBasalPercent +import app.aaps.implementation.queue.commands.CommandUpdateTime import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.R -import info.nightscout.implementation.queue.commands.CommandBolus -import info.nightscout.implementation.queue.commands.CommandCancelExtendedBolus -import info.nightscout.implementation.queue.commands.CommandCancelTempBasal -import info.nightscout.implementation.queue.commands.CommandClearAlarms -import info.nightscout.implementation.queue.commands.CommandCustomCommand -import info.nightscout.implementation.queue.commands.CommandDeactivate -import info.nightscout.implementation.queue.commands.CommandExtendedBolus -import info.nightscout.implementation.queue.commands.CommandInsightSetTBROverNotification -import info.nightscout.implementation.queue.commands.CommandLoadEvents -import info.nightscout.implementation.queue.commands.CommandLoadHistory -import info.nightscout.implementation.queue.commands.CommandLoadTDDs -import info.nightscout.implementation.queue.commands.CommandReadStatus -import info.nightscout.implementation.queue.commands.CommandSMBBolus -import info.nightscout.implementation.queue.commands.CommandSetProfile -import info.nightscout.implementation.queue.commands.CommandSetUserSettings -import info.nightscout.implementation.queue.commands.CommandStartPump -import info.nightscout.implementation.queue.commands.CommandStopPump -import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute -import info.nightscout.implementation.queue.commands.CommandTempBasalPercent -import info.nightscout.implementation.queue.commands.CommandUpdateTime import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import java.util.LinkedList diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/QueueThread.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/QueueThread.kt index 7317508a2f..46c5531285 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/QueueThread.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue +package app.aaps.implementation.queue import android.bluetooth.BluetoothManager import android.content.Context diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandBolus.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandBolus.kt index 4e562518c7..38ff3d5247 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandBolus.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelExtendedBolus.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelExtendedBolus.kt index d640bee195..5a0b9b7464 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelExtendedBolus.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelTempBasal.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelTempBasal.kt index 8264d0473a..f0e8bbc319 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelTempBasal.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandClearAlarms.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandClearAlarms.kt index 694f46f5a9..f4bf1b5572 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandClearAlarms.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCustomCommand.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCustomCommand.kt index d652f6e639..5089d35157 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCustomCommand.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandDeactivate.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandDeactivate.kt index da8c765ddc..903445c412 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandDeactivate.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandExtendedBolus.kt similarity index 96% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandExtendedBolus.kt index 76514b8615..f4d0edfbb0 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandExtendedBolus.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandInsightSetTBROverNotification.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandInsightSetTBROverNotification.kt index 639e5b7ab4..2e2dc4064b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandInsightSetTBROverNotification.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadEvents.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadEvents.kt index 0bce6ebd2c..1da1b17270 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadEvents.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadHistory.kt similarity index 96% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadHistory.kt index 7bae4164df..aff9c7f55d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadHistory.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadTDDs.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadTDDs.kt index fd501c6e6c..7672e12c2d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadTDDs.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandReadStatus.kt similarity index 96% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandReadStatus.kt index 1b66f215ed..d0665c45ad 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandReadStatus.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.alerts.LocalAlertUtils import app.aaps.core.interfaces.logging.LTag diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSMBBolus.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSMBBolus.kt index 8504c46074..f271ec279d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSMBBolus.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetProfile.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetProfile.kt index 3dc7688039..9a58634722 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetProfile.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.LTag diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetUserSettings.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetUserSettings.kt index 15fc652546..3d8dec7f25 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetUserSettings.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStartPump.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStartPump.kt index 22308f899f..4dca1c605d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStartPump.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStopPump.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStopPump.kt index 7a012ccdbb..f4479bb263 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStopPump.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalAbsolute.kt similarity index 96% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalAbsolute.kt index b0691eefc7..6a137db06a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalAbsolute.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalPercent.kt similarity index 96% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalPercent.kt index 2541160fca..9e7ac24e00 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalPercent.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandUpdateTime.kt similarity index 95% rename from implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt rename to implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandUpdateTime.kt index d4b5af8726..2dd8e6b8a1 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandUpdateTime.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue.commands +package app.aaps.implementation.queue.commands import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt b/implementation/src/main/kotlin/app/aaps/implementation/receivers/NetworkChangeReceiver.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt rename to implementation/src/main/kotlin/app/aaps/implementation/receivers/NetworkChangeReceiver.kt index 7be2ca397b..061071223b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/receivers/NetworkChangeReceiver.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.receivers +package app.aaps.implementation.receivers import android.content.Context import android.content.Intent diff --git a/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/receivers/ReceiverStatusStoreImpl.kt similarity index 96% rename from implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/receivers/ReceiverStatusStoreImpl.kt index d41862ea7c..c339951d89 100644 --- a/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/receivers/ReceiverStatusStoreImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.receivers +package app.aaps.implementation.receivers import android.content.Context import android.content.Intent diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt b/implementation/src/main/kotlin/app/aaps/implementation/resources/IconsProviderImplementation.kt similarity index 91% rename from implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt rename to implementation/src/main/kotlin/app/aaps/implementation/resources/IconsProviderImplementation.kt index 35bf03d050..1af83d578e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/resources/IconsProviderImplementation.kt @@ -1,8 +1,8 @@ -package info.nightscout.implementation.resources +package app.aaps.implementation.resources import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.ui.IconsProvider -import info.nightscout.implementation.R +import app.aaps.implementation.R import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt index ee20b6d45d..06315632f6 100644 --- a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.resources +package app.aaps.implementation.resources import android.annotation.SuppressLint import android.content.Context @@ -18,8 +18,8 @@ import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.getThemeColor import app.aaps.core.ui.locale.LocaleHelper import java.util.Locale diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirCalculatorImpl.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirCalculatorImpl.kt index 0046f46d3f..a77ce3d282 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirCalculatorImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.stats +package app.aaps.implementation.stats import android.annotation.SuppressLint import android.content.Context diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirImpl.kt index f1364d59b7..02a2c2dd0d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.stats +package app.aaps.implementation.stats import android.annotation.SuppressLint import android.content.Context @@ -9,7 +9,7 @@ import android.widget.TextView import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.stats.DexcomTIR -import info.nightscout.implementation.R +import app.aaps.implementation.R import java.util.Calendar import kotlin.math.pow import kotlin.math.roundToInt diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/stats/TddCalculatorImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/stats/TddCalculatorImpl.kt index 1455634531..fa4e52e27a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/stats/TddCalculatorImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.stats +package app.aaps.implementation.stats import android.content.Context import android.graphics.Typeface diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/stats/TirCalculatorImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/stats/TirCalculatorImpl.kt index 71a4bbae65..e2087199dc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/stats/TirCalculatorImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.stats +package app.aaps.implementation.stats import android.annotation.SuppressLint import android.content.Context diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/stats/TirImpl.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/stats/TirImpl.kt index 78396e9c6e..d8938c8912 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/stats/TirImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.stats +package app.aaps.implementation.stats import android.annotation.SuppressLint import android.content.Context @@ -8,7 +8,7 @@ import android.widget.TextView import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.stats.TIR import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.implementation.R +import app.aaps.implementation.R class TirImpl(override val date: Long, override val lowThreshold: Double, override val highThreshold: Double) : TIR { diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/kotlin/app/aaps/implementation/stats/TotalDailyDoseExtension.kt similarity index 98% rename from implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt rename to implementation/src/main/kotlin/app/aaps/implementation/stats/TotalDailyDoseExtension.kt index 6b97d2056b..afc55c4ba4 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/stats/TotalDailyDoseExtension.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.stats +package app.aaps.implementation.stats import android.annotation.SuppressLint import android.content.Context @@ -8,7 +8,7 @@ import android.widget.TextView import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.database.entities.TotalDailyDose -import info.nightscout.implementation.R +import app.aaps.implementation.R val TotalDailyDose.total get() = if (totalAmount > 0) totalAmount else basalAmount + bolusAmount diff --git a/implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt b/implementation/src/main/kotlin/app/aaps/implementation/storage/FileStorage.kt similarity index 89% rename from implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt rename to implementation/src/main/kotlin/app/aaps/implementation/storage/FileStorage.kt index da38622bb0..0270b59c69 100644 --- a/implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/storage/FileStorage.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.storage +package app.aaps.implementation.storage import app.aaps.core.interfaces.storage.Storage import java.io.File diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt index 09f4be2d0b..46b4ca5f74 100644 --- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.userEntry +package app.aaps.implementation.userEntry import android.text.Spanned import app.aaps.core.interfaces.configuration.Constants diff --git a/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/utils/DecimalFormatterImpl.kt similarity index 97% rename from implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/utils/DecimalFormatterImpl.kt index 1767b505fc..325792feaa 100644 --- a/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/utils/DecimalFormatterImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.utils +package app.aaps.implementation.utils import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DecimalFormatter diff --git a/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/utils/HardLimitsImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/utils/HardLimitsImpl.kt index 76ba181b9f..e514c94e75 100644 --- a/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/utils/HardLimitsImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation +package app.aaps.implementation.utils import android.content.Context import app.aaps.annotations.OpenForTesting diff --git a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt index 3d83c7cc83..5c2ef141b3 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation +package app.aaps.implementation.utils import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.Translator diff --git a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/utils/TrendCalculatorImpl.kt similarity index 99% rename from implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt rename to implementation/src/main/kotlin/app/aaps/implementation/utils/TrendCalculatorImpl.kt index 7e99e1fba9..25e652b30b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/utils/TrendCalculatorImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation +package app.aaps.implementation.utils import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.iob.InMemoryGlucoseValue diff --git a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/iob/GlucoseStatusTest.kt similarity index 99% rename from implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/iob/GlucoseStatusTest.kt index 4620e4560d..62a87b1544 100644 --- a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/iob/GlucoseStatusTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.iob +package app.aaps.implementation.iob import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.iob.GlucoseStatus diff --git a/implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/overview/OverviewDataImplTest.kt similarity index 98% rename from implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/overview/OverviewDataImplTest.kt index 9754b90432..dc36c27bd9 100644 --- a/implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/overview/OverviewDataImplTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.overview +package app.aaps.implementation.overview import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.db.GlucoseUnit diff --git a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileStoreTest.kt similarity index 96% rename from implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileStoreTest.kt index a0444dadf0..b5dda1cae2 100644 --- a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileStoreTest.kt @@ -1,10 +1,10 @@ -package info.nightscout.implementation.profile +package app.aaps.implementation.profile import app.aaps.core.interfaces.profile.PureProfile import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat -import kotlin.test.assertIs import org.junit.jupiter.api.Test +import kotlin.test.assertIs internal class ProfileStoreTest : TestBaseWithProfile() { diff --git a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileUtilImplTest.kt similarity index 95% rename from implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileUtilImplTest.kt index 3900f4c8dd..886c6bfcb3 100644 --- a/implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileUtilImplTest.kt @@ -1,12 +1,12 @@ -package info.nightscout.implementation.profile +package app.aaps.implementation.profile import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.database.entities.GlucoseValue +import app.aaps.implementation.utils.DecimalFormatterImpl import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat -import info.nightscout.implementation.utils.DecimalFormatterImpl import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageTest.kt similarity index 97% rename from implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageTest.kt index 01ceca4a8f..6d49756754 100644 --- a/implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageTest.kt @@ -1,11 +1,11 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import app.aaps.core.interfaces.pump.DetailedBolusInfo import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.implementation.R import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat -import info.nightscout.implementation.R import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageTest.kt similarity index 98% rename from implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageTest.kt index 660cda54da..ef82c24237 100644 --- a/implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.pump +package app.aaps.implementation.pump import app.aaps.core.interfaces.pump.PumpSync import app.aaps.shared.tests.TestBase diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt similarity index 98% rename from implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt index 3ca25cffc6..0b5393f98c 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.queue +package app.aaps.implementation.queue import android.content.Context import android.os.Handler @@ -27,17 +27,17 @@ import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.database.ValueWrapper import app.aaps.database.entities.Bolus +import app.aaps.implementation.queue.commands.CommandBolus +import app.aaps.implementation.queue.commands.CommandCustomCommand +import app.aaps.implementation.queue.commands.CommandExtendedBolus +import app.aaps.implementation.queue.commands.CommandLoadHistory +import app.aaps.implementation.queue.commands.CommandTempBasalPercent import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestPumpPlugin import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.queue.commands.CommandBolus -import info.nightscout.implementation.queue.commands.CommandCustomCommand -import info.nightscout.implementation.queue.commands.CommandExtendedBolus -import info.nightscout.implementation.queue.commands.CommandLoadHistory -import info.nightscout.implementation.queue.commands.CommandTempBasalPercent import io.reactivex.rxjava3.core.Single import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/queue/QueueThreadTest.kt similarity index 96% rename from implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/queue/QueueThreadTest.kt index f977e6236d..7b3ba7b307 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/queue/QueueThreadTest.kt @@ -1,8 +1,7 @@ -package info.nightscout.implementation.queue +package app.aaps.implementation.queue import android.content.Context import android.os.PowerManager -import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.db.PersistenceLayer @@ -10,13 +9,14 @@ import app.aaps.core.interfaces.pump.PumpSync import app.aaps.core.interfaces.pump.defs.PumpDescription import app.aaps.core.interfaces.queue.Command import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.implementation.queue.commands.CommandTempBasalAbsolute import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestPumpPlugin import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers diff --git a/implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/utils/DecimalFormatterTest.kt similarity index 96% rename from implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/utils/DecimalFormatterTest.kt index 29ead4228c..a1bd974b98 100644 --- a/implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/utils/DecimalFormatterTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.implementation.utils +package app.aaps.implementation.utils import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DecimalFormatter diff --git a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/wizard/BolusWizardTest.kt similarity index 98% rename from implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt rename to implementation/src/test/kotlin/app/aaps/implementation/wizard/BolusWizardTest.kt index daff11c509..6c4497bfe9 100644 --- a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/wizard/BolusWizardTest.kt @@ -1,6 +1,5 @@ -package info.nightscout.implementation.wizard +package app.aaps.implementation.wizard -import app.aaps.core.main.wizard.BolusWizard import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.constraints.Constraint @@ -9,11 +8,12 @@ import app.aaps.core.interfaces.iob.IobTotal import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.pump.defs.PumpDescription import app.aaps.core.interfaces.queue.CommandQueue +import app.aaps.core.main.wizard.BolusWizard +import app.aaps.implementation.iob.GlucoseStatusProviderImpl import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector -import info.nightscout.implementation.iob.GlucoseStatusProviderImpl import org.junit.jupiter.api.Test import org.mockito.Mock import org.mockito.Mockito diff --git a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt b/implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt similarity index 99% rename from implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt rename to implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt index 99aa320dc3..4f28d3d573 100644 --- a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt +++ b/implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt @@ -1,7 +1,7 @@ -package info.nightscout.interfaces.pump +package app.aaps.interfaces.pump -import app.aaps.core.main.pump.toHtml import app.aaps.core.interfaces.pump.PumpEnactResult +import app.aaps.core.main.pump.toHtml import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt index 114437959a..cd5c219b5b 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt @@ -2,13 +2,13 @@ package info.nightscout.automation.triggers import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.implementation.iob.GlucoseStatusProviderImpl import app.aaps.shared.tests.TestBaseWithProfile import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.automation.AutomationPlugin import info.nightscout.automation.services.LastLocationDataContainer import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.iob.GlucoseStatusProviderImpl import org.junit.jupiter.api.BeforeEach import org.mockito.Mock import org.mockito.Mockito.`when` diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt index 81ff45315f..bc2aa4e9bd 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt @@ -17,6 +17,7 @@ import app.aaps.core.interfaces.pump.defs.PumpDescription import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.implementation.iob.GlucoseStatusProviderImpl import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector @@ -27,7 +28,6 @@ import info.nightscout.androidaps.insight.database.InsightDatabaseDao import info.nightscout.androidaps.insight.database.InsightDbHelper import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.iob.GlucoseStatusProviderImpl import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin diff --git a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt index a77bdfcff1..5b171b8538 100644 --- a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt +++ b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt @@ -21,6 +21,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import app.aaps.core.main.constraints.ConstraintObject import app.aaps.database.entities.GlucoseValue +import app.aaps.implementation.iob.GlucoseStatusProviderImpl import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector @@ -30,7 +31,6 @@ import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAny import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.Transaction -import info.nightscout.implementation.iob.GlucoseStatusProviderImpl import info.nightscout.plugins.R import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt index c764ac8102..3c7f12e618 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt @@ -21,12 +21,12 @@ import app.aaps.core.nssdk.remotemodel.LastModified import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.embedments.InterfaceIDs +import app.aaps.implementation.utils.DecimalFormatterImpl import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.implementation.utils.DecimalFormatterImpl import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclient.ReceiverDelegate import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt index cc4a74bb26..a9f079cc50 100644 --- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt +++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt @@ -8,6 +8,7 @@ import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.implementation.utils.DecimalFormatterImpl import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.rx.TestAapsSchedulers import dagger.android.AndroidInjector @@ -15,7 +16,6 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager -import info.nightscout.implementation.utils.DecimalFormatterImpl import info.nightscout.pump.common.defs.TempBasalPair import org.joda.time.DateTimeZone import org.joda.time.tz.UTCProvider diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt index 942b3080df..664083d83a 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt @@ -18,12 +18,12 @@ import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.database.entities.EffectiveProfileSwitch import app.aaps.database.entities.embedments.InsulinConfiguration +import app.aaps.implementation.profile.ProfileStoreObject +import app.aaps.implementation.profile.ProfileUtilImpl +import app.aaps.implementation.utils.DecimalFormatterImpl import app.aaps.shared.impl.utils.DateUtilImpl import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector -import info.nightscout.implementation.profile.ProfileStoreObject -import info.nightscout.implementation.profile.ProfileUtilImpl -import info.nightscout.implementation.utils.DecimalFormatterImpl import org.json.JSONObject import org.junit.jupiter.api.BeforeEach import org.mockito.ArgumentMatchers.anyDouble