caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:implementation cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-25 23:14:05 +02:00
parent dc4cc6c837
commit aa010a03b2
86 changed files with 197 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/app/aaps/MainApp.kt
View file

@ -31,6 +31,10 @@ import app.aaps.core.ui.locale.LocaleHelper
import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.di.DaggerAppComponent 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.BTReceiver
import app.aaps.receivers.ChargingStateReceiver import app.aaps.receivers.ChargingStateReceiver
import app.aaps.receivers.KeepAliveWorker 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.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.database.impl.transactions.VersionChangeTransaction 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.aps.utils.StaticInjector
import info.nightscout.plugins.general.overview.notifications.NotificationStore import info.nightscout.plugins.general.overview.notifications.NotificationStore
import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin

8
app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
View file

@ -1,8 +1,5 @@
package app.aaps.activities 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.logging.AAPSLogger
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.profile.DefaultValueHelper 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.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter 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 dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.overview.OverviewDataImpl
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

4
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -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.rx.events.EventRebuildTabs
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.SafeParse 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 dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin 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.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.automation.AutomationPlugin 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.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.plugins.aps.loop.LoopPlugin import info.nightscout.plugins.aps.loop.LoopPlugin
import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin

4
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -3,6 +3,8 @@ package app.aaps.di
import app.aaps.MainApp import app.aaps.MainApp
import app.aaps.configuration.di.ConfigurationModule import app.aaps.configuration.di.ConfigurationModule
import app.aaps.core.main.di.CoreModule 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 app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component 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.dash.di.OmnipodDashModule
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.automation.di.AutomationModule import info.nightscout.automation.di.AutomationModule
import app.aaps.core.validators.di.ValidatorsModule
import info.nightscout.database.impl.DatabaseModule import info.nightscout.database.impl.DatabaseModule
import info.nightscout.implementation.di.ImplementationModule
import info.nightscout.insulin.di.InsulinModule import info.nightscout.insulin.di.InsulinModule
import info.nightscout.plugins.aps.di.ApsModule import info.nightscout.plugins.aps.di.ApsModule
import info.nightscout.plugins.constraints.di.PluginsConstraintsModule import info.nightscout.plugins.constraints.di.PluginsConstraintsModule

2
app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt
View file

@ -5,9 +5,9 @@ import app.aaps.core.interfaces.aps.AutosensData
import app.aaps.core.interfaces.objects.Instantiator import app.aaps.core.interfaces.objects.Instantiator
import app.aaps.core.interfaces.profile.ProfileStore import app.aaps.core.interfaces.profile.ProfileStore
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.implementation.profile.ProfileStoreObject
import dagger.Reusable import dagger.Reusable
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.implementation.profile.ProfileStoreObject
import info.nightscout.plugins.aps.APSResultObject import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
import org.json.JSONObject import org.json.JSONObject

2
implementation/build.gradle
View file

@ -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/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android { android {
namespace 'info.nightscout.implementation' namespace 'app.aaps.implementation'
} }
dependencies { dependencies {

2
implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/alerts/LocalAlertUtilsImpl.kt
View file

@ -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.alerts.LocalAlertUtils
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config

2
implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/androidNotification/NotificationHolderImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.androidNotification package app.aaps.implementation.androidNotification
import android.app.Notification import android.app.Notification
import android.app.NotificationChannel import android.app.NotificationChannel

2
implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt → implementation/src/main/kotlin/app/aaps/implementation/db/CompatDBHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.db package app.aaps.implementation.db
import android.content.Context import android.content.Context
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/db/PersistenceLayerImpl.kt
View file

@ -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.db.PersistenceLayer
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

44
implementation/src/main/java/info/nightscout/implementation/di/CommandQueueModule.kt → implementation/src/main/kotlin/app/aaps/implementation/di/CommandQueueModule.kt
View file

@ -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.Module
import dagger.android.ContributesAndroidInjector 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 @Module
@Suppress("unused") @Suppress("unused")

72
implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt → implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt
View file

@ -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.alerts.LocalAlertUtils
import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.db.PersistenceLayer
import app.aaps.core.interfaces.iob.GlucoseStatusProvider 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.HardLimits
import app.aaps.core.interfaces.utils.Translator import app.aaps.core.interfaces.utils.Translator
import app.aaps.core.interfaces.utils.TrendCalculator 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.Binds
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector 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( @Module(
includes = [ includes = [

6
implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/iob/GlucoseStatusProviderImpl.kt
View file

@ -1,8 +1,6 @@
package info.nightscout.implementation.iob package app.aaps.implementation.iob
import app.aaps.annotations.OpenForTesting 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.GlucoseStatus
import app.aaps.core.interfaces.iob.GlucoseStatusProvider import app.aaps.core.interfaces.iob.GlucoseStatusProvider
import app.aaps.core.interfaces.iob.IobCobCalculator 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.logging.LTag
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter 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 dagger.Reusable
import javax.inject.Inject import javax.inject.Inject
import kotlin.math.roundToLong import kotlin.math.roundToLong

2
implementation/src/main/java/info/nightscout/implementation/lifecycle/ProcessLifecycleListener.kt → implementation/src/main/kotlin/app/aaps/implementation/lifecycle/ProcessLifecycleListener.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.lifecycle package app.aaps.implementation.lifecycle
import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner

2
implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/logging/LoggerUtilsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.logging package app.aaps.implementation.logging
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.LoggerUtils import app.aaps.core.interfaces.logging.LoggerUtils

2
implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/logging/UserEntryLoggerImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation package app.aaps.implementation.logging
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/overview/OverviewDataImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.overview package app.aaps.implementation.overview
import android.content.Context import android.content.Context
import androidx.annotation.AttrRes import androidx.annotation.AttrRes

2
implementation/src/main/java/info/nightscout/implementation/plugin/PluginStore.kt → implementation/src/main/kotlin/app/aaps/implementation/plugin/PluginStore.kt
View file

@ -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.APS
import app.aaps.core.interfaces.aps.Sensitivity import app.aaps.core.interfaces.aps.Sensitivity

2
implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/DefaultValueHelperImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation package app.aaps.implementation.profile
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.configuration.Constants

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt
View file

@ -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.configuration.Config
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileStoreObject.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.profile package app.aaps.implementation.profile
import androidx.collection.ArrayMap import androidx.collection.ArrayMap
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileUtilImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileUtilImpl.kt
View file

@ -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.db.GlucoseUnit
import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.profile.ProfileUtil

2
implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/profiling/ProfilerImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.profiling package app.aaps.implementation.profiling
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt → implementation/src/main/kotlin/app/aaps/implementation/protection/BiometricCheck.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.protection package app.aaps.implementation.protection
import androidx.biometric.BiometricPrompt import androidx.biometric.BiometricPrompt
import androidx.biometric.BiometricPrompt.AuthenticationResult import androidx.biometric.BiometricPrompt.AuthenticationResult

8
implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/protection/PasswordCheckImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.protection package app.aaps.implementation.protection
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -11,13 +11,13 @@ import android.view.inputmethod.InputMethodManager
import android.widget.EditText import android.widget.EditText
import android.widget.TextView import android.widget.TextView
import androidx.annotation.StringRes 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.protection.PasswordCheck
import app.aaps.core.interfaces.sharedPreferences.SP 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 com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.Reusable import dagger.Reusable
import app.aaps.core.ui.toast.ToastUtils
import javax.inject.Inject import javax.inject.Inject
@Reusable @Reusable

2
implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/protection/ProtectionCheckImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.protection package app.aaps.implementation.protection
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import app.aaps.core.interfaces.protection.PasswordCheck import app.aaps.core.interfaces.protection.PasswordCheck

2
implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/BlePreCheckImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump package app.aaps.implementation.pump
import android.Manifest import android.Manifest
import android.bluetooth.BluetoothManager import android.bluetooth.BluetoothManager

4
implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump package app.aaps.implementation.pump
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger 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.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.implementation.R
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import info.nightscout.implementation.R
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
import kotlin.math.abs import kotlin.math.abs

2
implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/PumpSyncImplementation.kt
View file

@ -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.AAPSLogger
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag

2
implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump package app.aaps.implementation.pump
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

2
implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/pump/WarnColorsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump package app.aaps.implementation.pump
import android.widget.TextView import android.widget.TextView
import app.aaps.core.interfaces.pump.WarnColors import app.aaps.core.interfaces.pump.WarnColors

44
implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue package app.aaps.implementation.queue
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -48,29 +48,29 @@ import app.aaps.database.ValueWrapper
import app.aaps.database.entities.EffectiveProfileSwitch import app.aaps.database.entities.EffectiveProfileSwitch
import app.aaps.database.entities.ProfileSwitch import app.aaps.database.entities.ProfileSwitch
import app.aaps.database.entities.interfaces.end 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 dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository 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.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import java.util.LinkedList import java.util.LinkedList

2
implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/QueueThread.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue package app.aaps.implementation.queue
import android.bluetooth.BluetoothManager import android.bluetooth.BluetoothManager
import android.content.Context import android.content.Context

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandBolus.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelExtendedBolus.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCancelTempBasal.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandClearAlarms.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandCustomCommand.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandDeactivate.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandExtendedBolus.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandInsightSetTBROverNotification.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadEvents.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadHistory.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandLoadTDDs.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandReadStatus.kt
View file

@ -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.alerts.LocalAlertUtils
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSMBBolus.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetProfile.kt
View file

@ -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.configuration.Config
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandSetUserSettings.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStartPump.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandStopPump.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalAbsolute.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandTempBasalPercent.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt → implementation/src/main/kotlin/app/aaps/implementation/queue/commands/CommandUpdateTime.kt
View file

@ -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.logging.LTag
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt → implementation/src/main/kotlin/app/aaps/implementation/receivers/NetworkChangeReceiver.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.receivers package app.aaps.implementation.receivers
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

2
implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/receivers/ReceiverStatusStoreImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.receivers package app.aaps.implementation.receivers
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

4
implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt → implementation/src/main/kotlin/app/aaps/implementation/resources/IconsProviderImplementation.kt
View file

@ -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.configuration.Config
import app.aaps.core.interfaces.ui.IconsProvider import app.aaps.core.interfaces.ui.IconsProvider
import info.nightscout.implementation.R import app.aaps.implementation.R
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

4
implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.resources package app.aaps.implementation.resources
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -18,8 +18,8 @@ import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.view.ContextThemeWrapper import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.resources.ResourceHelper 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.getThemeColor
import app.aaps.core.ui.locale.LocaleHelper import app.aaps.core.ui.locale.LocaleHelper
import java.util.Locale import java.util.Locale

2
implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats package app.aaps.implementation.stats
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context

4
implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/DexcomTirImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats package app.aaps.implementation.stats
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -9,7 +9,7 @@ import android.widget.TextView
import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.profile.ProfileUtil
import app.aaps.core.interfaces.stats.DexcomTIR import app.aaps.core.interfaces.stats.DexcomTIR
import info.nightscout.implementation.R import app.aaps.implementation.R
import java.util.Calendar import java.util.Calendar
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.roundToInt import kotlin.math.roundToInt

2
implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TddCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats package app.aaps.implementation.stats
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface

2
implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TirCalculatorImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats package app.aaps.implementation.stats
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context

4
implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TirImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats package app.aaps.implementation.stats
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -8,7 +8,7 @@ import android.widget.TextView
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.stats.TIR import app.aaps.core.interfaces.stats.TIR
import app.aaps.core.interfaces.utils.DateUtil 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 { class TirImpl(override val date: Long, override val lowThreshold: Double, override val highThreshold: Double) : TIR {

4
implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt → implementation/src/main/kotlin/app/aaps/implementation/stats/TotalDailyDoseExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.stats package app.aaps.implementation.stats
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -8,7 +8,7 @@ import android.widget.TextView
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.database.entities.TotalDailyDose import app.aaps.database.entities.TotalDailyDose
import info.nightscout.implementation.R import app.aaps.implementation.R
val TotalDailyDose.total val TotalDailyDose.total
get() = if (totalAmount > 0) totalAmount else basalAmount + bolusAmount get() = if (totalAmount > 0) totalAmount else basalAmount + bolusAmount

2
implementation/src/main/java/info/nightscout/implementation/storage/FileStorage.kt → implementation/src/main/kotlin/app/aaps/implementation/storage/FileStorage.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.storage package app.aaps.implementation.storage
import app.aaps.core.interfaces.storage.Storage import app.aaps.core.interfaces.storage.Storage
import java.io.File import java.io.File

2
implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.userEntry package app.aaps.implementation.userEntry
import android.text.Spanned import android.text.Spanned
import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.configuration.Constants

2
implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/DecimalFormatterImpl.kt
View file

@ -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.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.DecimalFormatter

2
implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/HardLimitsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation package app.aaps.implementation.utils
import android.content.Context import android.content.Context
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting

2
implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/TranslatorImpl.kt
View file

@ -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.resources.ResourceHelper
import app.aaps.core.interfaces.utils.Translator import app.aaps.core.interfaces.utils.Translator

2
implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt → implementation/src/main/kotlin/app/aaps/implementation/utils/TrendCalculatorImpl.kt
View file

@ -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.aps.AutosensDataStore
import app.aaps.core.interfaces.iob.InMemoryGlucoseValue import app.aaps.core.interfaces.iob.InMemoryGlucoseValue

2
implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt → implementation/src/test/kotlin/app/aaps/implementation/iob/GlucoseStatusTest.kt
View file

@ -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.aps.AutosensDataStore
import app.aaps.core.interfaces.iob.GlucoseStatus import app.aaps.core.interfaces.iob.GlucoseStatus

2
implementation/src/test/java/info/nightscout/implementation/overview/OverviewDataImplTest.kt → implementation/src/test/kotlin/app/aaps/implementation/overview/OverviewDataImplTest.kt
View file

@ -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.aps.AutosensDataStore
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit

4
implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt → implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileStoreTest.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.implementation.profile package app.aaps.implementation.profile
import app.aaps.core.interfaces.profile.PureProfile import app.aaps.core.interfaces.profile.PureProfile
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import kotlin.test.assertIs
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import kotlin.test.assertIs
internal class ProfileStoreTest : TestBaseWithProfile() { internal class ProfileStoreTest : TestBaseWithProfile() {

4
implementation/src/test/java/info/nightscout/implementation/profile/ProfileUtilImplTest.kt → implementation/src/test/kotlin/app/aaps/implementation/profile/ProfileUtilImplTest.kt
View file

@ -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.db.GlucoseUnit
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.GlucoseValue
import app.aaps.implementation.utils.DecimalFormatterImpl
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import info.nightscout.implementation.utils.DecimalFormatterImpl
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.Mock import org.mockito.Mock

4
implementation/src/test/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageTest.kt → implementation/src/test/kotlin/app/aaps/implementation/pump/DetailedBolusInfoStorageTest.kt
View file

@ -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.pump.DetailedBolusInfo
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.implementation.R
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import info.nightscout.implementation.R
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.Mock import org.mockito.Mock

2
implementation/src/test/java/info/nightscout/implementation/pump/TemporaryBasalStorageTest.kt → implementation/src/test/kotlin/app/aaps/implementation/pump/TemporaryBasalStorageTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.pump package app.aaps.implementation.pump
import app.aaps.core.interfaces.pump.PumpSync import app.aaps.core.interfaces.pump.PumpSync
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase

12
implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt → implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.implementation.queue package app.aaps.implementation.queue
import android.content.Context import android.content.Context
import android.os.Handler 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.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.ValueWrapper import app.aaps.database.ValueWrapper
import app.aaps.database.entities.Bolus 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.TestBaseWithProfile
import app.aaps.shared.tests.TestPumpPlugin import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository 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 io.reactivex.rxjava3.core.Single
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

6
implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt → implementation/src/test/kotlin/app/aaps/implementation/queue/QueueThreadTest.kt
View file

@ -1,8 +1,7 @@
package info.nightscout.implementation.queue package app.aaps.implementation.queue
import android.content.Context import android.content.Context
import android.os.PowerManager import android.os.PowerManager
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.db.PersistenceLayer 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.pump.defs.PumpDescription
import app.aaps.core.interfaces.queue.Command import app.aaps.core.interfaces.queue.Command
import app.aaps.core.interfaces.ui.UiInteraction 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.TestBaseWithProfile
import app.aaps.shared.tests.TestPumpPlugin import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.ArgumentMatchers import org.mockito.ArgumentMatchers

2
implementation/src/test/java/info/nightscout/implementation/utils/DecimalFormatterTest.kt → implementation/src/test/kotlin/app/aaps/implementation/utils/DecimalFormatterTest.kt
View file

@ -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.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.DecimalFormatter

6
implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt → implementation/src/test/kotlin/app/aaps/implementation/wizard/BolusWizardTest.kt
View file

@ -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.AutosensDataStore
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.constraints.Constraint 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.profile.Profile
import app.aaps.core.interfaces.pump.defs.PumpDescription import app.aaps.core.interfaces.pump.defs.PumpDescription
import app.aaps.core.interfaces.queue.CommandQueue 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 app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito import org.mockito.Mockito

4
implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt → implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt
View file

@ -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.interfaces.pump.PumpEnactResult
import app.aaps.core.main.pump.toHtml
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector

2
plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
View file

@ -2,13 +2,13 @@ package info.nightscout.automation.triggers
import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.receivers.ReceiverStatusStore import app.aaps.core.interfaces.receivers.ReceiverStatusStore
import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.AutomationPlugin import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.services.LastLocationDataContainer import info.nightscout.automation.services.LastLocationDataContainer
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.`when` import org.mockito.Mockito.`when`

2
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt
View file

@ -17,6 +17,7 @@ import app.aaps.core.interfaces.pump.defs.PumpDescription
import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.stats.TddCalculator
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector 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.insight.database.InsightDbHelper
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin

2
plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
View file

@ -21,6 +21,7 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.GlucoseValue
import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector 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.InsertAndCancelCurrentOfflineEventTransaction
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.database.impl.transactions.Transaction import info.nightscout.database.impl.transactions.Transaction
import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
import info.nightscout.plugins.R import info.nightscout.plugins.R
import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult

2
plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
View file

@ -21,12 +21,12 @@ import app.aaps.core.nssdk.remotemodel.LastModified
import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.core.utils.receivers.DataWorkerStorage
import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.embedments.InterfaceIDs import app.aaps.database.entities.embedments.InterfaceIDs
import app.aaps.implementation.utils.DecimalFormatterImpl
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.utils.DecimalFormatterImpl
import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
import info.nightscout.plugins.sync.nsclient.ReceiverDelegate import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler

2
pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
View file

@ -8,6 +8,7 @@ import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.implementation.utils.DecimalFormatterImpl
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import app.aaps.shared.tests.rx.TestAapsSchedulers import app.aaps.shared.tests.rx.TestAapsSchedulers
import dagger.android.AndroidInjector 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.common.hw.rileylink.RileyLinkUtil
import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
import info.nightscout.implementation.utils.DecimalFormatterImpl
import info.nightscout.pump.common.defs.TempBasalPair import info.nightscout.pump.common.defs.TempBasalPair
import org.joda.time.DateTimeZone import org.joda.time.DateTimeZone
import org.joda.time.tz.UTCProvider import org.joda.time.tz.UTCProvider

6
shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt
View file

@ -18,12 +18,12 @@ import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.entities.EffectiveProfileSwitch import app.aaps.database.entities.EffectiveProfileSwitch
import app.aaps.database.entities.embedments.InsulinConfiguration 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 app.aaps.shared.impl.utils.DateUtilImpl
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector 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.json.JSONObject
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.mockito.ArgumentMatchers.anyDouble import org.mockito.ArgumentMatchers.anyDouble