caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move more to interfaces module

Browse source
This commit is contained in:
Milos Kozak 2022-11-08 21:17:46 +01:00
parent 34320ad8ca
commit f43e090296
276 changed files with 589 additions and 517 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/MainActivity.kt
View file

@ -41,9 +41,9 @@ import info.nightscout.androidaps.databinding.ActivityMainBinding
import info.nightscout.androidaps.events.EventPreferenceChange
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.IconsProvider
import info.nightscout.interfaces.IconsProvider
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils

4
app/src/main/java/info/nightscout/androidaps/MainApp.kt
View file

@ -23,8 +23,8 @@ import info.nightscout.androidaps.database.transactions.VersionChangeTransaction
import info.nightscout.androidaps.db.CompatDBHelper
import info.nightscout.androidaps.di.DaggerAppComponent
import info.nightscout.androidaps.di.StaticInjector
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.configBuilder.PluginStore
import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils

2
app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
View file

@ -23,7 +23,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.danars.DanaRSPlugin
import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
import info.nightscout.androidaps.events.EventPreferenceChange
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader

2
app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
View file

@ -6,7 +6,7 @@ import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.plugins.configBuilder.PluginStore
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.androidaps.utils.protection.ProtectionCheck

8
app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
View file

@ -11,14 +11,14 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.implementations.ActivityNamesImpl
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.DataSyncSelector
import info.nightscout.androidaps.interfaces.IconsProvider
import info.nightscout.androidaps.interfaces.ImportExportPrefs
import info.nightscout.interfaces.IconsProvider
import info.nightscout.interfaces.ImportExportPrefs
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.androidaps.interfaces.TrendCalculator

2
app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
View file

@ -9,7 +9,7 @@ import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.danars.DanaRSPlugin
import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin

2
app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
View file

@ -15,7 +15,7 @@ import info.nightscout.androidaps.extensions.formatColor
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.ActivityNames
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger

2
app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
View file

@ -19,7 +19,7 @@ import info.nightscout.androidaps.extensions.formatColor
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.ActivityNames
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger

4
app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
View file

@ -24,9 +24,9 @@ import info.nightscout.interfaces.ActivityNames
import info.nightscout.interfaces.BolusTimer
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper

10
app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
View file

@ -26,14 +26,14 @@ import info.nightscout.shared.extensions.toVisibility
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.ActivityNames
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
@ -191,7 +191,7 @@ class LoopDialog : DaggerDialogFragment() {
binding.overviewReconnect.visibility = View.VISIBLE
}
!(loop as PluginBase).isEnabled() -> {
!(loop as PluginBase).isEnabled() -> {
binding.overviewLoop.visibility = View.VISIBLE
binding.overviewEnable.visibility = View.VISIBLE
binding.overviewDisable.visibility = View.GONE

4
app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
View file

@ -15,10 +15,10 @@ import info.nightscout.androidaps.extensions.formatColor
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.ActivityNames
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger

2
app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
View file

@ -20,7 +20,7 @@ import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTa
import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.androidaps.databinding.DialogTemptargetBinding
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper

2
app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
View file

@ -20,7 +20,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.ActivityNames
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger

4
app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
View file

@ -29,9 +29,9 @@ import info.nightscout.shared.extensions.runOnUiThread
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.androidaps.extensions.valueToUnits
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction

2
app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
View file

@ -14,7 +14,7 @@ import androidx.lifecycle.Lifecycle
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.LoopFragmentBinding
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui

6
app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
View file

@ -31,15 +31,15 @@ import info.nightscout.androidaps.extensions.convertedToPercent
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.Loop.LastRun
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui

2
app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
View file

@ -9,7 +9,7 @@ import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction

4
app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
View file

@ -9,11 +9,11 @@ import info.nightscout.androidaps.database.ValueWrapper
import info.nightscout.androidaps.extensions.target
import info.nightscout.androidaps.interfaces.APS
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.interfaces.Profile

2
app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
View file

@ -10,7 +10,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction

4
app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
View file

@ -11,11 +11,11 @@ import info.nightscout.androidaps.database.ValueWrapper
import info.nightscout.androidaps.extensions.target
import info.nightscout.androidaps.interfaces.APS
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.interfaces.Profile

2
app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
View file

@ -11,7 +11,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction

5
app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
View file

@ -23,7 +23,7 @@ import info.nightscout.shared.extensions.toVisibility
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.BuildHelper
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginType
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
@ -135,7 +135,8 @@ class ConfigBuilderFragment : DaggerFragment() {
inner class PluginViewHolder internal constructor(private val fragment: ConfigBuilderFragment,
private val pluginType: PluginType,
private val plugin: PluginBase) {
private val plugin: PluginBase
) {
@Suppress("InflateParams")
val baseView: LinearLayout = fragment.layoutInflater.inflate(R.layout.configbuilder_single_plugin, null) as LinearLayout

6
app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
View file

@ -9,10 +9,10 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit
import info.nightscout.androidaps.interfaces.APS
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.NsClient
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.NsClient
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.ProfileSource
import info.nightscout.androidaps.interfaces.Pump
import info.nightscout.androidaps.interfaces.PumpSync

8
app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
View file

@ -5,13 +5,13 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.NsClient
import info.nightscout.androidaps.interfaces.Overview
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.NsClient
import info.nightscout.interfaces.Overview
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.ProfileSource
import info.nightscout.androidaps.interfaces.Pump
import info.nightscout.androidaps.interfaces.Sensitivity
import info.nightscout.androidaps.interfaces.Sync
import info.nightscout.interfaces.Sync
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.PluginType
import info.nightscout.interfaces.Safety

2
app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt
View file

@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.entities.ProfileSwitch
import info.nightscout.androidaps.database.transactions.InsertOrUpdateProfileSwitch
import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.ProfileStore

4
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
View file

@ -3,9 +3,9 @@ package info.nightscout.androidaps.plugins.constraints.objectives
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective0
import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective1

2
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt
View file

@ -7,7 +7,7 @@ import info.nightscout.androidaps.database.ValueWrapper
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
import javax.inject.Inject

2
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
import info.nightscout.shared.utils.T
import javax.inject.Inject

6
app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
View file

@ -11,14 +11,14 @@ import info.nightscout.androidaps.extensions.storeString
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.BuildHelper
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.interfaces.Safety
import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin

2
app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.actions
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.shared.interfaces.ResourceHelper

2
app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
View file

@ -11,7 +11,7 @@ import info.nightscout.androidaps.extensions.toStringFull
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider

2
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
View file

@ -32,7 +32,7 @@ import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
import info.nightscout.interfaces.AndroidPermission
import info.nightscout.interfaces.BuildHelper
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.ImportExportPrefs
import info.nightscout.interfaces.ImportExportPrefs
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat

2
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
View file

@ -19,7 +19,7 @@ import info.nightscout.androidaps.events.EventPreferenceChange
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.androidaps.insight.database.InsightDatabase
import info.nightscout.androidaps.interfaces.DataSyncSelector
import info.nightscout.androidaps.interfaces.ImportExportPrefs
import info.nightscout.interfaces.ImportExportPrefs
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.shared.interfaces.ResourceHelper

2
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
View file

@ -7,7 +7,7 @@ import androidx.core.content.FileProvider
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.BuildHelper
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.PluginDescription

8
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
View file

@ -49,12 +49,12 @@ import info.nightscout.androidaps.extensions.directionToIcon
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.TrendCalculator
@ -68,7 +68,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOve
import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewSensitivity
import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.interfaces.pump.PumpType
import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
import info.nightscout.androidaps.plugins.source.DexcomPlugin
import info.nightscout.androidaps.plugins.source.XdripPlugin

4
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
View file

@ -13,8 +13,8 @@ import info.nightscout.androidaps.extensions.putString
import info.nightscout.androidaps.extensions.storeDouble
import info.nightscout.androidaps.extensions.storeInt
import info.nightscout.androidaps.extensions.storeString
import info.nightscout.androidaps.interfaces.Overview
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.Overview
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewCalcProgress

2
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
View file

@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.entities.TherapyEvent
import info.nightscout.plugins.sync.nsclient.extensions.age
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.interfaces.pump.PumpType
import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
import info.nightscout.shared.utils.DateUtil
import info.nightscout.androidaps.utils.DecimalFormatter

2
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
View file

@ -9,7 +9,7 @@ import com.jjoe64.graphview.series.LineGraphSeries
import com.jjoe64.graphview.series.Series
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.plugins.general.overview.OverviewData

4
app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
View file

@ -13,10 +13,10 @@ import info.nightscout.androidaps.events.EventPreferenceChange
import info.nightscout.androidaps.extensions.toStringShort
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.IconsProvider
import info.nightscout.interfaces.IconsProvider
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.interfaces.NotificationHolder
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.interfaces.Profile

2
app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
View file

@ -4,7 +4,7 @@ import android.content.Context
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.events.EventPreferenceChange
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.shared.interfaces.ResourceHelper

6
app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt
View file

@ -25,12 +25,12 @@ import info.nightscout.androidaps.extensions.valueToUnits
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.TrendCalculator

2
app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
View file

@ -22,7 +22,7 @@ import info.nightscout.androidaps.extensions.iobCalc
import info.nightscout.androidaps.extensions.toTemporaryBasal
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.interfaces.Profile

2
app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.sensitivity
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.interfaces.Sensitivity

2
app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt
View file

@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.receivers.DataWorkerStorage
import info.nightscout.androidaps.receivers.Intents
import info.nightscout.interfaces.BuildHelper

2
app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
View file

@ -19,7 +19,7 @@ import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.database.transactions.InvalidateGlucoseValueTransaction
import info.nightscout.androidaps.extensions.fromConstant
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.androidaps.logging.UserEntryLogger

2
app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
View file

@ -12,7 +12,7 @@ import info.nightscout.androidaps.database.entities.TherapyEvent
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.androidaps.receivers.DataWorkerStorage
import info.nightscout.interfaces.PluginDescription

2
app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
View file

@ -11,7 +11,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType

2
app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
View file

@ -13,7 +13,7 @@ import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.androidaps.database.entities.ValueWithUnit
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.utils.FabricPrivacy

2
app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt
View file

@ -15,7 +15,7 @@ import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.androidaps.database.entities.ValueWithUnit
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.utils.FabricPrivacy

2
app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
View file

@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.androidaps.receivers.DataWorkerStorage
import info.nightscout.interfaces.PluginDescription

2
app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
View file

@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.PluginDescription

2
app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
View file

@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.androidaps.utils.extensions.isRunningTest
import info.nightscout.interfaces.BuildHelper

2
app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
View file

@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.XDripBroadcast
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType

2
app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
View file

@ -10,7 +10,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.receivers.DataWorkerStorage
import info.nightscout.androidaps.receivers.Intents
import info.nightscout.interfaces.PluginDescription

2
app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
View file

@ -20,7 +20,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
import info.nightscout.androidaps.queue.commands.Command

4
app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
View file

@ -13,8 +13,8 @@ import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
import info.nightscout.androidaps.events.EventPumpStatusChanged
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.ImportExportPrefs
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.ImportExportPrefs
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment

2
app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
View file

@ -7,7 +7,7 @@ import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.setupwizard.SWNumberValidator

2
app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt
View file

@ -9,7 +9,7 @@ import android.widget.RadioGroup
import android.widget.TextView
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.activities.MyPreferenceFragment
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
import info.nightscout.androidaps.plugins.configBuilder.PluginStore

2
app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
View file

@ -10,7 +10,7 @@ import androidx.core.app.NotificationCompat
import androidx.core.app.TaskStackBuilder
import info.nightscout.androidaps.MainActivity
import info.nightscout.androidaps.core.R
import info.nightscout.androidaps.interfaces.IconsProvider
import info.nightscout.interfaces.IconsProvider
import info.nightscout.interfaces.NotificationHolder
import info.nightscout.shared.interfaces.ResourceHelper
import javax.inject.Inject

2
app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils.resources
import info.nightscout.androidaps.R
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.IconsProvider
import info.nightscout.interfaces.IconsProvider
import javax.inject.Inject
import javax.inject.Singleton

4
app/src/main/java/info/nightscout/androidaps/utils/tabs/TabPageAdapter.kt
View file

@ -3,8 +3,8 @@ package info.nightscout.androidaps.utils.tabs
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.PluginFragment
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginFragment
import java.util.*
class TabPageAdapter(private val activity: AppCompatActivity) : FragmentStateAdapter(activity) {

6
app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
View file

@ -23,14 +23,14 @@ import info.nightscout.interfaces.BolusTimer
import info.nightscout.interfaces.CarbTimer
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger

2
app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
View file

@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.extensions.valueToUnits
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider

2
app/src/main/java/info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt
View file

@ -6,7 +6,7 @@ import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction

2
app/src/main/java/info/nightscout/androidaps/workflow/PrepareTreatmentsDataWorker.kt
View file

@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.Bolus
import info.nightscout.androidaps.database.entities.TherapyEvent
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper

4
app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt
View file

@ -6,10 +6,10 @@ import info.nightscout.interfaces.data.PumpEnactResult
import info.nightscout.androidaps.data.PumpEnactResultImpl
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.Pump
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.interfaces.pump.ManufacturerType
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.interfaces.pump.PumpType
import info.nightscout.interfaces.utils.TimeChangeType
import org.json.JSONObject

3
app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
View file

@ -32,7 +32,10 @@ import info.nightscout.androidaps.utils.Profiler
import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
import info.nightscout.implementation.constraints.ConstraintsImpl
import info.nightscout.interfaces.BuildHelper
import info.nightscout.interfaces.Constraint
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginType
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
import info.nightscout.shared.sharedPreferences.SP
import org.junit.Assert

2
app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
View file

@ -12,7 +12,7 @@ import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.receivers.ReceiverStatusStore
import info.nightscout.androidaps.utils.FabricPrivacy

2
app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
View file

@ -6,7 +6,7 @@ import info.nightscout.androidaps.R
import info.nightscout.androidaps.TestBase
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective

4
app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
View file

@ -6,9 +6,9 @@ import info.nightscout.androidaps.R
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin

6
app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
View file

@ -7,14 +7,14 @@ import info.nightscout.androidaps.TestBase
import info.nightscout.androidaps.data.IobTotal
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.interfaces.Constraint
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin

2
automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
View file

@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Constraints
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.interfaces.PluginType
import info.nightscout.shared.interfaces.ResourceHelper

4
automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt
View file

@ -6,9 +6,9 @@ import info.nightscout.androidaps.data.PumpEnactResultImpl
import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.androidaps.database.entities.UserEntry.Sources
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.interfaces.queue.Callback

4
automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt
View file

@ -5,9 +5,9 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.data.PumpEnactResultImpl
import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.androidaps.database.entities.UserEntry.Sources
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginType
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.interfaces.queue.Callback

2
automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt
View file

@ -7,7 +7,7 @@ import info.nightscout.androidaps.database.AppRepository
import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.androidaps.database.entities.UserEntry.Sources
import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.logging.UserEntryLogger
import info.nightscout.interfaces.queue.Callback

2
automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
View file

@ -13,7 +13,7 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit
import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.androidaps.extensions.friendlyDescription
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.logging.UserEntryLogger

2
automation/src/main/java/info/nightscout/automation/elements/InputBg.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.automation.elements
import android.view.Gravity
import android.widget.LinearLayout
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.utils.ui.NumberPicker
import info.nightscout.automation.R

2
automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.automation.elements
import android.view.Gravity
import android.widget.LinearLayout
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.utils.ui.NumberPicker
import info.nightscout.automation.R

2
automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
View file

@ -4,7 +4,7 @@ import android.widget.LinearLayout
import com.google.common.base.Optional
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.automation.R

2
automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt
View file

@ -4,7 +4,7 @@ import android.widget.LinearLayout
import com.google.common.base.Optional
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.automation.R

2
automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt
View file

@ -5,7 +5,7 @@ import com.google.common.base.Optional
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.database.ValueWrapper
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.automation.R

6
automation/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt
View file

@ -4,15 +4,15 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.data.DetailedBolusInfo
import info.nightscout.interfaces.data.PumpEnactResult
import info.nightscout.androidaps.data.PumpEnactResultImpl
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.Pump
import info.nightscout.androidaps.interfaces.PumpDescription
import info.nightscout.interfaces.pump.PumpDescription
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.interfaces.pump.ManufacturerType
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.interfaces.pump.PumpType
import info.nightscout.interfaces.utils.TimeChangeType
import info.nightscout.rx.logging.AAPSLogger
import org.json.JSONObject

2
automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.automation
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBase
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.automation.actions.Action

2
automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.automation.actions
import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.androidaps.database.transactions.Transaction
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.queue.Callback
import info.nightscout.automation.elements.InputCarePortalMenu
import info.nightscout.automation.elements.InputDuration

2
automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.automation.actions
import info.nightscout.androidaps.database.entities.TemporaryTarget
import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.androidaps.database.transactions.Transaction
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.queue.Callback
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputDuration

8
automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
View file

@ -8,11 +8,11 @@ import info.nightscout.androidaps.data.PumpEnactResultImpl
import info.nightscout.androidaps.database.entities.OfflineEvent
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.CommandQueue
import info.nightscout.androidaps.interfaces.ConfigBuilder
import info.nightscout.androidaps.interfaces.Constraint
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.Constraint
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Loop
import info.nightscout.androidaps.interfaces.PluginBase
import info.nightscout.interfaces.PluginBase
import info.nightscout.interfaces.PluginDescription
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileSource

2
automation/src/test/java/info/nightscout/automation/elements/InputBgTest.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.elements
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.automation.triggers.TriggerTestBase
import org.junit.Assert
import org.junit.Before

2
automation/src/test/java/info/nightscout/automation/elements/InputTempTargetTest.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.elements
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.automation.triggers.TriggerTestBase
import org.junit.Assert
import org.junit.Test

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

@ -2,7 +2,7 @@ package info.nightscout.automation.triggers
import com.google.common.base.Optional
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.automation.elements.Comparator
import org.json.JSONObject
import org.junit.Assert

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

@ -2,7 +2,7 @@ package info.nightscout.automation.triggers
import com.google.common.base.Optional
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDelta.DeltaType

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

@ -3,7 +3,7 @@ package info.nightscout.automation.triggers
import com.google.common.base.Optional
import info.nightscout.androidaps.database.ValueWrapper
import info.nightscout.androidaps.database.entities.TemporaryTarget
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import io.reactivex.rxjava3.core.Single

2
core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt
View file

@ -6,7 +6,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.app.ActivityCompat
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.core.R
import info.nightscout.androidaps.interfaces.ImportExportPrefs
import info.nightscout.interfaces.ImportExportPrefs
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
import info.nightscout.androidaps.utils.alertDialogs.OKDialog

2
core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt
View file

@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.entities.Carbs
import info.nightscout.androidaps.database.entities.TherapyEvent
import info.nightscout.androidaps.database.transactions.InsertOrUpdateBolusTransaction
import info.nightscout.androidaps.database.transactions.InsertOrUpdateCarbsTransaction
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.interfaces.pump.PumpType
class DetailedBolusInfo {

2
core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
View file

@ -14,7 +14,7 @@ import info.nightscout.androidaps.extensions.shiftBlock
import info.nightscout.androidaps.extensions.shiftTargetBlock
import info.nightscout.androidaps.extensions.targetBlockValueBySeconds
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.Profile.Companion.secondsFromMidnight
import info.nightscout.androidaps.interfaces.Profile.Companion.toMgdl

2
core/src/main/java/info/nightscout/androidaps/data/PureProfile.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.data
import info.nightscout.androidaps.database.data.Block
import info.nightscout.androidaps.database.data.TargetBlock
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import org.json.JSONObject
import java.util.*

2
core/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.extensions
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.database.entities.GlucoseValue
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.shared.utils.DateUtil
import info.nightscout.androidaps.utils.DecimalFormatter
import org.json.JSONObject

2
core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
View file

@ -6,7 +6,7 @@ import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.database.entities.ProfileSwitch
import info.nightscout.androidaps.extensions.blockFromJsonArray
import info.nightscout.androidaps.extensions.targetBlockFromJsonArray
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.shared.utils.DateUtil
import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
import info.nightscout.interfaces.utils.JsonHelper

121
core/src/main/java/info/nightscout/androidaps/extensions/PumpTypeExtension.kt Normal file
View file

@ -0,0 +1,121 @@
package info.nightscout.androidaps.extensions
import info.nightscout.androidaps.database.embedments.InterfaceIDs
import info.nightscout.androidaps.database.entities.UserEntry
import info.nightscout.interfaces.pump.PumpType
fun PumpType.Companion.fromDbSource(s: UserEntry.Sources): PumpType.Source =
when (s) {
UserEntry.Sources.Dana -> PumpType.Source.Dana
UserEntry.Sources.DanaR -> PumpType.Source.DanaR
UserEntry.Sources.DanaRC -> PumpType.Source.DanaRC
UserEntry.Sources.DanaRv2 -> PumpType.Source.DanaRv2
UserEntry.Sources.DanaRS -> PumpType.Source.DanaRS
UserEntry.Sources.DanaI -> PumpType.Source.DanaI
UserEntry.Sources.DiaconnG8 -> PumpType.Source.DiaconnG8
UserEntry.Sources.Insight -> PumpType.Source.Insight
UserEntry.Sources.Combo -> PumpType.Source.Combo
UserEntry.Sources.Medtronic -> PumpType.Source.Medtronic
UserEntry.Sources.Omnipod -> PumpType.Source.Omnipod
UserEntry.Sources.OmnipodEros -> PumpType.Source.OmnipodEros
UserEntry.Sources.OmnipodDash -> PumpType.Source.OmnipodDash
UserEntry.Sources.EOPatch2 -> PumpType.Source.EOPatch2
UserEntry.Sources.MDI -> PumpType.Source.MDI
UserEntry.Sources.VirtualPump -> PumpType.Source.VirtualPump
else -> PumpType.Source.Unknown
}
fun PumpType.Companion.fromDbPumpType(pt: InterfaceIDs.PumpType): PumpType =
when (pt) {
InterfaceIDs.PumpType.GENERIC_AAPS -> PumpType.GENERIC_AAPS
InterfaceIDs.PumpType.CELLNOVO -> PumpType.CELLNOVO
InterfaceIDs.PumpType.ACCU_CHEK_COMBO -> PumpType.ACCU_CHEK_COMBO
InterfaceIDs.PumpType.ACCU_CHEK_SPIRIT -> PumpType.ACCU_CHEK_SPIRIT
InterfaceIDs.PumpType.ACCU_CHEK_INSIGHT -> PumpType.ACCU_CHEK_INSIGHT_VIRTUAL
InterfaceIDs.PumpType.ACCU_CHEK_INSIGHT_BLUETOOTH -> PumpType.ACCU_CHEK_INSIGHT
InterfaceIDs.PumpType.ACCU_CHEK_SOLO -> PumpType.ACCU_CHEK_SOLO
InterfaceIDs.PumpType.ANIMAS_VIBE -> PumpType.ANIMAS_VIBE
InterfaceIDs.PumpType.ANIMAS_PING -> PumpType.ANIMAS_PING
InterfaceIDs.PumpType.DANA_R -> PumpType.DANA_R
InterfaceIDs.PumpType.DANA_R_KOREAN -> PumpType.DANA_R_KOREAN
InterfaceIDs.PumpType.DANA_RS -> PumpType.DANA_RS
InterfaceIDs.PumpType.DANA_RS_KOREAN -> PumpType.DANA_RS_KOREAN
InterfaceIDs.PumpType.DANA_RV2 -> PumpType.DANA_RV2
InterfaceIDs.PumpType.DANA_I -> PumpType.DANA_I
InterfaceIDs.PumpType.OMNIPOD_EROS -> PumpType.OMNIPOD_EROS
InterfaceIDs.PumpType.OMNIPOD_DASH -> PumpType.OMNIPOD_DASH
InterfaceIDs.PumpType.MEDTRONIC_512_517 -> PumpType.MEDTRONIC_512_712
InterfaceIDs.PumpType.MEDTRONIC_515_715 -> PumpType.MEDTRONIC_515_715
InterfaceIDs.PumpType.MEDTRONIC_522_722 -> PumpType.MEDTRONIC_522_722
InterfaceIDs.PumpType.MEDTRONIC_523_723_REVEL -> PumpType.MEDTRONIC_523_723_REVEL
InterfaceIDs.PumpType.MEDTRONIC_554_754_VEO -> PumpType.MEDTRONIC_554_754_VEO
InterfaceIDs.PumpType.MEDTRONIC_640G -> PumpType.MEDTRONIC_640G
InterfaceIDs.PumpType.TANDEM_T_SLIM -> PumpType.TANDEM_T_SLIM
InterfaceIDs.PumpType.TANDEM_T_SLIM_G4 -> PumpType.TANDEM_T_SLIM_G4
InterfaceIDs.PumpType.TANDEM_T_FLEX -> PumpType.TANDEM_T_FLEX
InterfaceIDs.PumpType.TANDEM_T_SLIM_X2 -> PumpType.TANDEM_T_SLIM_X2
InterfaceIDs.PumpType.YPSOPUMP -> PumpType.YPSOPUMP
InterfaceIDs.PumpType.MDI -> PumpType.MDI
InterfaceIDs.PumpType.USER -> PumpType.USER
InterfaceIDs.PumpType.DIACONN_G8 -> PumpType.DIACONN_G8
InterfaceIDs.PumpType.EOPATCH2 -> PumpType.EOFLOW_EOPATCH2
InterfaceIDs.PumpType.CACHE -> PumpType.CACHE
}
fun PumpType.Source.toDbSource(): UserEntry.Sources =
when (this) {
PumpType.Source.Dana -> UserEntry.Sources.Dana
PumpType.Source.DanaR -> UserEntry.Sources.DanaR
PumpType.Source.DanaRC -> UserEntry.Sources.DanaRC
PumpType.Source.DanaRv2 -> UserEntry.Sources.DanaRv2
PumpType.Source.DanaRS -> UserEntry.Sources.DanaRS
PumpType.Source.DanaI -> UserEntry.Sources.DanaI
PumpType.Source.DiaconnG8 -> UserEntry.Sources.DiaconnG8
PumpType.Source.Insight -> UserEntry.Sources.Insight
PumpType.Source.Combo -> UserEntry.Sources.Combo
PumpType.Source.Medtronic -> UserEntry.Sources.Medtronic
PumpType.Source.Omnipod -> UserEntry.Sources.Omnipod
PumpType.Source.OmnipodEros -> UserEntry.Sources.OmnipodEros
PumpType.Source.OmnipodDash -> UserEntry.Sources.OmnipodDash
PumpType.Source.EOPatch2 -> UserEntry.Sources.EOPatch2
PumpType.Source.MDI -> UserEntry.Sources.MDI
PumpType.Source.VirtualPump -> UserEntry.Sources.VirtualPump
else -> UserEntry.Sources.Unknown
}
fun PumpType.toDbPumpType(): InterfaceIDs.PumpType =
when (this) {
PumpType.GENERIC_AAPS -> InterfaceIDs.PumpType.GENERIC_AAPS
PumpType.CELLNOVO -> InterfaceIDs.PumpType.CELLNOVO
PumpType.ACCU_CHEK_COMBO -> InterfaceIDs.PumpType.ACCU_CHEK_COMBO
PumpType.ACCU_CHEK_SPIRIT -> InterfaceIDs.PumpType.ACCU_CHEK_SPIRIT
PumpType.ACCU_CHEK_INSIGHT_VIRTUAL -> InterfaceIDs.PumpType.ACCU_CHEK_INSIGHT
PumpType.ACCU_CHEK_INSIGHT -> InterfaceIDs.PumpType.ACCU_CHEK_INSIGHT_BLUETOOTH
PumpType.ACCU_CHEK_SOLO -> InterfaceIDs.PumpType.ACCU_CHEK_SOLO
PumpType.ANIMAS_VIBE -> InterfaceIDs.PumpType.ANIMAS_VIBE
PumpType.ANIMAS_PING -> InterfaceIDs.PumpType.ANIMAS_PING
PumpType.DANA_R -> InterfaceIDs.PumpType.DANA_R
PumpType.DANA_R_KOREAN -> InterfaceIDs.PumpType.DANA_R_KOREAN
PumpType.DANA_RS -> InterfaceIDs.PumpType.DANA_RS
PumpType.DANA_RS_KOREAN -> InterfaceIDs.PumpType.DANA_RS_KOREAN
PumpType.DANA_RV2 -> InterfaceIDs.PumpType.DANA_RV2
PumpType.DANA_I -> InterfaceIDs.PumpType.DANA_I
PumpType.OMNIPOD_EROS -> InterfaceIDs.PumpType.OMNIPOD_EROS
PumpType.OMNIPOD_DASH -> InterfaceIDs.PumpType.OMNIPOD_DASH
PumpType.MEDTRONIC_512_712 -> InterfaceIDs.PumpType.MEDTRONIC_512_517
PumpType.MEDTRONIC_515_715 -> InterfaceIDs.PumpType.MEDTRONIC_515_715
PumpType.MEDTRONIC_522_722 -> InterfaceIDs.PumpType.MEDTRONIC_522_722
PumpType.MEDTRONIC_523_723_REVEL -> InterfaceIDs.PumpType.MEDTRONIC_523_723_REVEL
PumpType.MEDTRONIC_554_754_VEO -> InterfaceIDs.PumpType.MEDTRONIC_554_754_VEO
PumpType.MEDTRONIC_640G -> InterfaceIDs.PumpType.MEDTRONIC_640G
PumpType.TANDEM_T_SLIM -> InterfaceIDs.PumpType.TANDEM_T_SLIM
PumpType.TANDEM_T_SLIM_G4 -> InterfaceIDs.PumpType.TANDEM_T_SLIM_G4
PumpType.TANDEM_T_FLEX -> InterfaceIDs.PumpType.TANDEM_T_FLEX
PumpType.TANDEM_T_SLIM_X2 -> InterfaceIDs.PumpType.TANDEM_T_SLIM_X2
PumpType.YPSOPUMP -> InterfaceIDs.PumpType.YPSOPUMP
PumpType.MDI -> InterfaceIDs.PumpType.MDI
PumpType.USER -> InterfaceIDs.PumpType.USER
PumpType.DIACONN_G8 -> InterfaceIDs.PumpType.DIACONN_G8
PumpType.EOFLOW_EOPATCH2 -> InterfaceIDs.PumpType.EOPATCH2
PumpType.CACHE -> InterfaceIDs.PumpType.CACHE
}

2
core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.extensions
import info.nightscout.androidaps.core.R
import info.nightscout.androidaps.database.entities.TemporaryTarget
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil

2
core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.extensions
import info.nightscout.androidaps.database.entities.TherapyEvent
import info.nightscout.androidaps.interfaces.GlucoseUnit
import info.nightscout.interfaces.GlucoseUnit
fun TherapyEvent.isOlderThan(hours: Double): Boolean {
return getHoursFromStart() > hours

Some files were not shown because too many files have changed in this diff Show more