caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move to interfaces

Browse source
This commit is contained in:
Milos Kozak 2022-11-10 15:26:28 +01:00
parent 0442a9ae5b
commit cca40b9606
36 changed files with 72 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,8 +10,6 @@ import com.google.android.material.tabs.TabLayout
import com.google.common.collect.Lists
import info.nightscout.androidaps.R
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.database.impl.AppRepository
import info.nightscout.androidaps.databinding.ActivityProfilehelperBinding
import info.nightscout.androidaps.dialogs.ProfileViewerDialog
import info.nightscout.androidaps.interfaces.ActivePlugin
@ -21,6 +19,8 @@ import info.nightscout.androidaps.utils.ToastUtils
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
import info.nightscout.core.fabric.FabricPrivacy
import info.nightscout.database.entities.EffectiveProfileSwitch
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.plugins.profile.ProfilePlugin
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.events.EventLocalProfileChanged

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

@ -6,7 +6,6 @@ import info.nightscout.androidaps.R
import info.nightscout.androidaps.interfaces.APS
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileSource
import info.nightscout.androidaps.interfaces.Pump
import info.nightscout.androidaps.interfaces.PumpSync
@ -18,6 +17,7 @@ import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources
import info.nightscout.database.entities.ValueWithUnit
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType

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

@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.configBuilder
import info.nightscout.androidaps.interfaces.APS
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.BgSource
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.IobCobCalculator
import info.nightscout.androidaps.interfaces.ProfileSource
import info.nightscout.androidaps.interfaces.Pump
@ -11,6 +10,7 @@ import info.nightscout.androidaps.interfaces.Sensitivity
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Overview
import info.nightscout.interfaces.constraints.Safety
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.sync.NsClient

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

@ -23,6 +23,7 @@ import info.nightscout.database.entities.embedments.InterfaceIDs
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.rx.bus.RxBus
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil

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

@ -1,2 +0,0 @@
package info.nightscout.androidaps.data

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

@ -1,8 +1,8 @@
package info.nightscout.androidaps.extensions
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.database.entities.Bolus
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.iob.Iob
fun Bolus.iobCalc(activePlugin: ActivePlugin, time: Long, dia: Double): Iob {

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

@ -1,6 +1,5 @@
package info.nightscout.androidaps.extensions
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
@ -8,6 +7,7 @@ import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.ExtendedBolus
import info.nightscout.database.entities.TemporaryBasal
import info.nightscout.database.entities.interfaces.end
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.iob.IobTotal
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T

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

@ -1,13 +1,13 @@
package info.nightscout.androidaps.utils.extensions
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.extensions.blockFromJsonArray
import info.nightscout.androidaps.extensions.targetBlockFromJsonArray
import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
import info.nightscout.database.entities.ProfileSwitch
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T

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

@ -1,6 +1,5 @@
package info.nightscout.androidaps.extensions
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
@ -8,6 +7,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.TemporaryBasal
import info.nightscout.database.entities.interfaces.end
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.iob.IobTotal
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T

1
core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt
View file

@ -2,6 +2,7 @@ package info.nightscout.androidaps.interfaces
import info.nightscout.interfaces.Overview
import info.nightscout.interfaces.constraints.Safety
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.sync.NsClient

8
core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
View file

@ -1,16 +1,16 @@
package info.nightscout.androidaps.interfaces
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.shared.utils.DateUtil
import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
import info.nightscout.androidaps.utils.DecimalFormatter.to1Decimal
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.utils.Round
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.Round
import info.nightscout.rx.bus.RxBus
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil
import org.joda.time.DateTime
import org.json.JSONObject

2
core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileSource.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.interfaces
import info.nightscout.interfaces.Constants
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.interfaces.profile.PureProfile
import org.json.JSONArray
interface ProfileSource {

4
core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
View file

@ -3,15 +3,15 @@ package info.nightscout.androidaps.interfaces
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.shared.utils.DateUtil
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.androidaps.utils.extensions.pureProfileFromJson
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil
import org.json.JSONException
import org.json.JSONObject
import javax.inject.Inject

10
core/core-main/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt
View file

@ -2,6 +2,12 @@ package info.nightscout.androidaps.data
import android.content.Context
import info.nightscout.androidaps.TestBase
import info.nightscout.core.iob.combine
import info.nightscout.core.iob.copy
import info.nightscout.core.iob.determineBasalJson
import info.nightscout.core.iob.json
import info.nightscout.core.iob.plus
import info.nightscout.core.iob.round
import info.nightscout.interfaces.iob.IobTotal
import info.nightscout.shared.utils.DateUtil
import org.junit.Assert
@ -14,8 +20,8 @@ class IobTotalTest : TestBase() {
@Mock lateinit var context: Context
lateinit var dateUtil: DateUtil
var now = 0L
private lateinit var dateUtil: DateUtil
private var now = 0L
@Before
fun prepare() {

3
core/core-main/src/test/java/info/nightscout/androidaps/interfaces/ProfileStoreTest.kt
View file

@ -1,8 +1,7 @@
package info.nightscout.androidaps.interfaces
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.data.PureProfile
import org.json.JSONObject
import info.nightscout.interfaces.profile.PureProfile
import org.junit.Assert
import org.junit.Test

2
core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt → interfaces/src/main/java/info/nightscout/interfaces/insulin/Insulin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.interfaces
package info.nightscout.interfaces.insulin
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.embedments.InsulinConfiguration

2
core/core-main/src/main/java/info/nightscout/androidaps/data/PureProfile.kt → interfaces/src/main/java/info/nightscout/interfaces/profile/PureProfile.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.data
package info.nightscout.interfaces.profile
import info.nightscout.database.entities.data.Block
import info.nightscout.database.entities.data.TargetBlock

2
plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt
View file

@ -1,13 +1,13 @@
package info.nightscout.plugins.configBuilder
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.androidaps.interfaces.Sensitivity
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
import info.nightscout.core.main.R
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.pump.defs.PumpType

2
plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt
View file

@ -4,7 +4,6 @@ import android.view.View
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.ProfileStore
@ -14,6 +13,7 @@ import info.nightscout.database.entities.UserEntry
import info.nightscout.database.entities.ValueWithUnit
import info.nightscout.interfaces.BuildHelper
import info.nightscout.interfaces.autotune.Autotune
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType

4
plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt
View file

@ -2,10 +2,8 @@ package info.nightscout.plugins.general.autotune.data
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.extensions.blockValueBySeconds
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.interfaces.ProfileStore
@ -14,6 +12,8 @@ import info.nightscout.core.main.R
import info.nightscout.database.entities.data.Block
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.Round
import info.nightscout.rx.bus.RxBus
import info.nightscout.shared.SafeParse

2
plugins/src/main/java/info/nightscout/plugins/insulin/ActivityGraph.kt
View file

@ -6,8 +6,8 @@ import android.util.AttributeSet
import com.jjoe64.graphview.GraphView
import com.jjoe64.graphview.series.DataPoint
import com.jjoe64.graphview.series.LineGraphSeries
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.database.entities.Bolus
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.shared.utils.T
import kotlin.math.floor

6
plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt
View file

@ -1,14 +1,14 @@
package info.nightscout.plugins.insulin
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import org.json.JSONObject
import javax.inject.Inject
import javax.inject.Singleton

2
plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt
View file

@ -1,13 +1,13 @@
package info.nightscout.plugins.insulin
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.embedments.InsulinConfiguration
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.iob.Iob
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.PluginBase

6
plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt
View file

@ -3,14 +3,14 @@ package info.nightscout.plugins.insulin
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.putInt
import info.nightscout.androidaps.extensions.storeInt
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import org.json.JSONObject
import javax.inject.Inject

6
plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt
View file

@ -1,14 +1,14 @@
package info.nightscout.plugins.insulin
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import org.json.JSONObject
import javax.inject.Inject
import javax.inject.Singleton

6
plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
View file

@ -1,14 +1,14 @@
package info.nightscout.plugins.insulin
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import org.json.JSONObject
import javax.inject.Inject
import javax.inject.Singleton

2
plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
View file

@ -8,7 +8,6 @@ import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.extensions.blockFromJsonArray
import info.nightscout.androidaps.interfaces.ActivePlugin
import info.nightscout.androidaps.interfaces.Profile
@ -29,6 +28,7 @@ import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus

2
plugins/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt
View file

@ -3,10 +3,10 @@ package info.nightscout.plugins.general.autotune
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.database.entities.data.Block
import info.nightscout.database.entities.data.TargetBlock
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.plugins.R
import info.nightscout.plugins.general.autotune.data.ATProfile

2
plugins/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt
View file

@ -3,7 +3,6 @@ package info.nightscout.plugins.general.autotune
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.data.ProfileSealed
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.extensions.shiftBlock
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.database.entities.Bolus
@ -14,6 +13,7 @@ import info.nightscout.database.entities.data.TargetBlock
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.iob.IobTotal
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.plugins.R
import info.nightscout.plugins.general.autotune.data.ATProfile

6
plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt
View file

@ -2,14 +2,14 @@ package info.nightscout.plugins.insulin
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Rule

2
plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt
View file

@ -2,12 +2,12 @@ package info.nightscout.plugins.insulin
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.database.entities.Bolus
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper

6
plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
View file

@ -3,13 +3,13 @@ package info.nightscout.plugins.insulin
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBase
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import org.junit.Assert.assertEquals
import org.junit.Before

6
plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
View file

@ -2,14 +2,14 @@ package info.nightscout.plugins.insulin
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Rule

6
plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
View file

@ -2,14 +2,14 @@ package info.nightscout.plugins.insulin
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.androidaps.interfaces.Insulin
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.androidaps.utils.HardLimits
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.plugins.R
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Rule

10
ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt
View file

@ -1,14 +1,16 @@
package info.nightscout.ui.defaultProfile
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.utils.extensions.pureProfileFromJson
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.shared.utils.DateUtil
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.utils.Round
import info.nightscout.shared.utils.DateUtil
import org.json.JSONArray
import org.json.JSONObject
import java.util.*
import java.util.Locale
import java.util.TimeZone
import java.util.TreeMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.math.abs

7
ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt
View file

@ -1,14 +1,15 @@
package info.nightscout.ui.defaultProfile
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.data.PureProfile
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.androidaps.utils.extensions.pureProfileFromJson
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.androidaps.interfaces.Profile
import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.shared.utils.DateUtil
import org.json.JSONArray
import org.json.JSONObject
import java.util.*
import java.util.Locale
import java.util.TimeZone
import javax.inject.Inject
import javax.inject.Singleton