caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

cleanup

Browse source
This commit is contained in:
Milos Kozak 2022-11-28 14:12:41 +01:00
parent 1eb9620b95
commit 34eaeb6e87
121 changed files with 201 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -135,7 +135,7 @@
</provider>
<service
android:name=".services.AlarmSoundService"
android:name="info.nightscout.core.services.AlarmSoundService"
android:enabled="true"
android:exported="true" />
<service android:name=".plugins.general.persistentNotification.DummyService" />

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

@ -20,7 +20,7 @@ import info.nightscout.androidaps.receivers.BTReceiver
import info.nightscout.androidaps.receivers.ChargingStateReceiver
import info.nightscout.androidaps.receivers.KeepAliveWorker
import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
import info.nightscout.androidaps.services.AlarmSoundServiceHelper
import info.nightscout.core.services.AlarmSoundServiceHelper
import info.nightscout.implementation.lifecycle.ProcessLifecycleListener
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.implementation.receivers.NetworkChangeReceiver

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

@ -3,7 +3,7 @@ package info.nightscout.androidaps.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
import info.nightscout.androidaps.services.AlarmSoundService
import info.nightscout.core.services.AlarmSoundService
import info.nightscout.automation.services.LocationService
@Module

2
app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt
View file

@ -12,7 +12,7 @@ import info.nightscout.androidaps.R
import info.nightscout.androidaps.activities.HistoryBrowseActivity
import info.nightscout.androidaps.activities.MyPreferenceFragment
import info.nightscout.androidaps.activities.PreferencesActivity
import info.nightscout.androidaps.services.AlarmSoundService
import info.nightscout.core.services.AlarmSoundService
import info.nightscout.configuration.activities.SingleFragmentActivity
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.ui.toast.ToastUtils

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

@ -8,9 +8,9 @@ import androidx.core.app.NotificationCompat
import androidx.core.app.RemoteInput
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.extensions.toStringShort
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.extensions.valueToUnitsString
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.generateCOBString
import info.nightscout.core.iob.round
import info.nightscout.core.utils.fabric.FabricPrivacy

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

@ -10,7 +10,7 @@ import com.jjoe64.graphview.series.BarGraphSeries
import com.jjoe64.graphview.series.LineGraphSeries
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.graph.OverviewData
import info.nightscout.core.graph.data.DataPointWithLabelInterface
import info.nightscout.core.graph.data.DeviationDataPoint

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

@ -8,7 +8,7 @@ import com.jjoe64.graphview.series.DataPoint
import com.jjoe64.graphview.series.LineGraphSeries
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.androidaps.extensions.target
import info.nightscout.core.extensions.target
import info.nightscout.core.graph.OverviewData
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.workflow.CalculationWorkflow

2
app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps
import android.content.Context
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.EffectiveProfileSwitch

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

@ -10,7 +10,7 @@ import info.nightscout.androidaps.implementations.ConfigImpl
import info.nightscout.androidaps.insight.database.InsightDatabase
import info.nightscout.androidaps.insight.database.InsightDatabaseDao
import info.nightscout.androidaps.insight.database.InsightDbHelper
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.constraints.ConstraintsImpl

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

@ -4,7 +4,7 @@ import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.HardLimitsMock
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.constraints.Constraint

4
core/core-main/src/main/java/info/nightscout/core/aps/APSResultObject.kt
View file

@ -2,8 +2,8 @@ package info.nightscout.core.aps
import android.text.Spanned
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.convertedToPercent
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.convertedToPercent
import info.nightscout.core.main.R
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.interfaces.aps.APSResult

2
core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.core.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.aps.APSResultObject
import info.nightscout.core.wizard.BolusWizard
import info.nightscout.core.wizard.QuickWizardEntry

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

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

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import com.google.gson.Gson
import com.google.gson.JsonSyntaxException

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.database.entities.Bolus
import info.nightscout.interfaces.insulin.Insulin

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.ExtendedBolus

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.database.entities.Food
import info.nightscout.interfaces.utils.JsonHelper

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.database.entities.GlucoseValue

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import androidx.annotation.StringRes
import info.nightscout.shared.interfaces.ResourceHelper

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.ProfileSwitch

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.TemporaryBasal

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.core.main.R
import info.nightscout.database.entities.TemporaryTarget

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.database.entities.TherapyEvent
import info.nightscout.interfaces.GlucoseUnit

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

@ -1,4 +1,4 @@
package info.nightscout.androidaps.extensions
package info.nightscout.core.extensions
import info.nightscout.core.main.R
import info.nightscout.database.entities.GlucoseValue

2
core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreObject.kt → core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/AutosensDataStoreObject.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.iob.iobCobCalculator
package info.nightscout.core.iob.iobCobCalculator
import androidx.collection.LongSparseArray
import androidx.collection.size

2
core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt → core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/GlucoseStatusProvider.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.iob.iobCobCalculator
package info.nightscout.core.iob.iobCobCalculator
import dagger.Reusable
import info.nightscout.core.iob.asRounded

2
core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt → core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/data/AutosensDataObject.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.iob.iobCobCalculator.data
package info.nightscout.core.iob.iobCobCalculator.data
import dagger.android.HasAndroidInjector
import info.nightscout.core.main.R

12
core/core-main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.core.profile
import info.nightscout.androidaps.extensions.blockValueBySeconds
import info.nightscout.androidaps.extensions.highTargetBlockValueBySeconds
import info.nightscout.androidaps.extensions.lowTargetBlockValueBySeconds
import info.nightscout.androidaps.extensions.shiftBlock
import info.nightscout.androidaps.extensions.shiftTargetBlock
import info.nightscout.androidaps.extensions.targetBlockValueBySeconds
import info.nightscout.core.extensions.blockValueBySeconds
import info.nightscout.core.extensions.highTargetBlockValueBySeconds
import info.nightscout.core.extensions.lowTargetBlockValueBySeconds
import info.nightscout.core.extensions.shiftBlock
import info.nightscout.core.extensions.shiftTargetBlock
import info.nightscout.core.extensions.targetBlockValueBySeconds
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.main.R
import info.nightscout.core.utils.MidnightUtils

7
core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt → core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundService.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.services
package info.nightscout.core.services
import android.content.Context
import android.content.Intent
@ -75,7 +75,7 @@ class AlarmSoundService : DaggerService() {
player?.let { if (it.isPlaying) it.stop() }
if (intent?.hasExtra(AlarmSoundService.SOUND_ID) == true) resourceId = intent.getIntExtra(AlarmSoundService.SOUND_ID, R.raw.error)
if (intent?.hasExtra(SOUND_ID) == true) resourceId = intent.getIntExtra(SOUND_ID, R.raw.error)
player = MediaPlayer()
try {
val afd = rh.openRawResourceFd(resourceId) ?: return START_NOT_STICKY
@ -125,7 +125,8 @@ class AlarmSoundService : DaggerService() {
if (currentVolumeLevel < VOLUME_INCREASE_STEPS) {
// Increase volume faster as time goes by
val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(VOLUME_INCREASE_BASE_DELAY_MILLIS -
val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(
VOLUME_INCREASE_BASE_DELAY_MILLIS -
((currentVolumeLevel - 1).toDouble().pow(VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT) * 1000).toLong())
aapsLogger.debug(LTag.CORE, "Next notification volume increment in {}ms", delay)
increaseVolumeHandler.postDelayed(this, delay)

2
core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt → core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundServiceHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.services
package info.nightscout.core.services
import android.content.ComponentName
import android.content.Context

6
core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
View file

@ -4,9 +4,9 @@ import android.content.Context
import android.text.Spanned
import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.highValueToUnitsToString
import info.nightscout.androidaps.extensions.lowValueToUnitsToString
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.highValueToUnitsToString
import info.nightscout.core.extensions.lowValueToUnitsToString
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.round
import info.nightscout.core.main.R
import info.nightscout.core.ui.dialogs.OKDialog

4
core/core-main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
View file

@ -2,8 +2,8 @@ package info.nightscout.core.wizard
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.valueToUnits
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.valueToUnits
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.round
import info.nightscout.core.main.R
import info.nightscout.core.utils.MidnightUtils

2
core/core-main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps
import android.content.Context
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

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

@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
import info.nightscout.androidaps.HardLimitsMock
import info.nightscout.androidaps.TestBase
import info.nightscout.androidaps.TestPumpPlugin
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.main.R
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config

6
core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt
View file

@ -1,5 +1,11 @@
package info.nightscout.androidaps.extensions
import info.nightscout.core.extensions.blockValueBySeconds
import info.nightscout.core.extensions.highTargetBlockValueBySeconds
import info.nightscout.core.extensions.lowTargetBlockValueBySeconds
import info.nightscout.core.extensions.shiftBlock
import info.nightscout.core.extensions.shiftTargetBlock
import info.nightscout.core.extensions.targetBlockValueBySeconds
import info.nightscout.database.entities.data.Block
import info.nightscout.database.entities.data.TargetBlock
import info.nightscout.database.entities.data.checkSanity

2
core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.plugins.iob.iobCalculator
import info.nightscout.androidaps.TestBase
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.asRounded
import info.nightscout.core.iob.log
import info.nightscout.database.entities.GlucoseValue

1
core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt
View file

@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator
import android.content.Context
import info.nightscout.androidaps.TestBase
import info.nightscout.core.iob.iobCobCalculator.AutosensDataStoreObject
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T

2
core/core-main/src/test/java/info/nightscout/core/wizard/BolusWizardTest.kt
View file

@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBase
import info.nightscout.androidaps.TestPumpPlugin
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.aps.AutosensDataStore
import info.nightscout.interfaces.aps.Loop

10
implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt
View file

@ -7,11 +7,11 @@ import androidx.annotation.DrawableRes
import com.jjoe64.graphview.series.BarGraphSeries
import com.jjoe64.graphview.series.DataPoint
import com.jjoe64.graphview.series.LineGraphSeries
import info.nightscout.androidaps.extensions.convertedToPercent
import info.nightscout.androidaps.extensions.isInProgress
import info.nightscout.androidaps.extensions.toStringFull
import info.nightscout.androidaps.extensions.toStringShort
import info.nightscout.androidaps.extensions.valueToUnits
import info.nightscout.core.extensions.convertedToPercent
import info.nightscout.core.extensions.isInProgress
import info.nightscout.core.extensions.toStringFull
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.extensions.valueToUnits
import info.nightscout.core.graph.OverviewData
import info.nightscout.core.graph.data.DataPointWithLabelInterface
import info.nightscout.core.graph.data.DeviationDataPoint

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.implementation.profile
import info.nightscout.androidaps.extensions.fromConstant
import info.nightscout.core.extensions.fromConstant
import info.nightscout.core.main.R
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy

2
implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.implementation.profile
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.implementation.pump
import android.widget.TextView
import info.nightscout.androidaps.extensions.isOlderThan
import info.nightscout.core.extensions.isOlderThan
import info.nightscout.core.main.R
import info.nightscout.database.entities.TherapyEvent
import info.nightscout.interfaces.pump.WarnColors

2
implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
View file

@ -9,7 +9,7 @@ import android.text.Spanned
import androidx.appcompat.app.AppCompatActivity
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.getCustomizedName
import info.nightscout.core.extensions.getCustomizedName
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy

2
implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps
import android.content.Context
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.EffectiveProfileSwitch

6
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.plugins.aps.openAPSAMA
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.core.extensions.plannedRemainingMinutes
import info.nightscout.core.aps.APSResultObject
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.aps.DetermineBasalAdapter

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

@ -3,8 +3,8 @@ package info.nightscout.plugins.aps.openAPSAMA
import android.content.Context
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.target
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.target
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.utils.MidnightUtils
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.ValueWrapper

6
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.plugins.aps.openAPSSMB
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.core.extensions.plannedRemainingMinutes
import info.nightscout.core.aps.APSResultObject
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.aps.DetermineBasalAdapter

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

@ -5,8 +5,8 @@ import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.target
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.target
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.utils.MidnightUtils
import info.nightscout.database.ValueWrapper
import info.nightscout.database.impl.AppRepository

6
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.plugins.aps.openAPSSMBDynamicISF
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
import info.nightscout.core.extensions.plannedRemainingMinutes
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.aps.DetermineBasalAdapter
import info.nightscout.interfaces.aps.SMBDefaults

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.plugins.aps.openAPSSMBDynamicISF
import android.content.Context
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.aps.DetermineBasalAdapter

8
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.plugins.general.autotune
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.durationInMinutes
import info.nightscout.androidaps.extensions.toJson
import info.nightscout.androidaps.extensions.toTemporaryBasal
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.durationInMinutes
import info.nightscout.core.extensions.toJson
import info.nightscout.core.extensions.toTemporaryBasal
import info.nightscout.core.iob.round
import info.nightscout.core.utils.MidnightUtils
import info.nightscout.database.entities.Bolus

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

@ -2,7 +2,7 @@ package info.nightscout.plugins.general.autotune
import android.view.View
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.UserEntry
import info.nightscout.database.entities.ValueWithUnit

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

@ -1,8 +1,8 @@
package info.nightscout.plugins.general.autotune.data
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.blockValueBySeconds
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.blockValueBySeconds
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.main.R
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.MidnightUtils

2
plugins/aps/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
plugins/aps/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps
import android.content.Context
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.EffectiveProfileSwitch

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

@ -2,7 +2,7 @@ package info.nightscout.plugins.general.autotune
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.extensions.shiftBlock
import info.nightscout.core.extensions.shiftBlock
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.Carbs

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

@ -3,9 +3,9 @@ package info.nightscout.automation.actions
import android.widget.LinearLayout
import androidx.annotation.DrawableRes
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.fromConstant
import info.nightscout.core.extensions.fromConstant
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputCarePortalMenu
import info.nightscout.automation.elements.InputDuration

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

@ -3,7 +3,7 @@ package info.nightscout.automation.actions
import android.widget.LinearLayout
import androidx.annotation.DrawableRes
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.friendlyDescription
import info.nightscout.core.extensions.friendlyDescription
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.automation.R
import info.nightscout.automation.elements.ComparatorExists

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

@ -9,7 +9,7 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import com.google.common.base.Optional
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.automation.R
import info.nightscout.automation.dialogs.ChooseTriggerDialog
import info.nightscout.automation.events.EventTriggerChanged

2
plugins/automation/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
plugins/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.impl.AppRepository

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

@ -1,7 +1,7 @@
package info.nightscout.automation.triggers
import com.google.common.base.Optional
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import org.json.JSONObject

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

@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.TestPumpPlugin
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.services.LastLocationDataContainer
import info.nightscout.interfaces.receivers.ReceiverStatusStore

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

@ -14,9 +14,9 @@ import android.os.SystemClock
import androidx.core.app.NotificationCompat
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.convertedToPercent
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.convertedToPercent
import info.nightscout.core.extensions.plannedRemainingMinutes
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.iob.json
import info.nightscout.core.utils.fabric.FabricPrivacy

12
plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.plugins.constraints.safety
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.putDouble
import info.nightscout.androidaps.extensions.putInt
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.core.extensions.putDouble
import info.nightscout.core.extensions.putInt
import info.nightscout.core.extensions.putString
import info.nightscout.core.extensions.storeDouble
import info.nightscout.core.extensions.storeInt
import info.nightscout.core.extensions.storeString
import info.nightscout.core.events.EventNewNotification
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.constraints.Constraint

4
plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt
View file

@ -10,8 +10,8 @@ import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.extensions.toStringMedium
import info.nightscout.androidaps.extensions.toStringShort
import info.nightscout.core.extensions.toStringMedium
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.ui.UIRunnable
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.ui.elements.SingleClickButton

6
plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
View file

@ -5,9 +5,9 @@ import android.content.Intent
import android.content.pm.ResolveInfo
import android.os.Bundle
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.durationInMinutes
import info.nightscout.androidaps.extensions.toStringFull
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.durationInMinutes
import info.nightscout.core.extensions.toStringFull
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.round
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.receivers.ReceiverStatusStore

2
plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt
View file

@ -5,7 +5,7 @@ import androidx.work.Worker
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.foodFromJson
import info.nightscout.core.extensions.foodFromJson
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.database.entities.Food
import info.nightscout.database.impl.AppRepository

6
plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
View file

@ -27,9 +27,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.jjoe64.graphview.GraphView
import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.extensions.directionToIcon
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.directionToIcon
import info.nightscout.core.extensions.valueToUnitsString
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.graph.OverviewData
import info.nightscout.core.iob.displayText
import info.nightscout.core.profile.ProfileSealed

12
plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
View file

@ -5,12 +5,12 @@ import androidx.annotation.StringRes
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.putDouble
import info.nightscout.androidaps.extensions.putInt
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.core.extensions.putDouble
import info.nightscout.core.extensions.putInt
import info.nightscout.core.extensions.putString
import info.nightscout.core.extensions.storeDouble
import info.nightscout.core.extensions.storeInt
import info.nightscout.core.extensions.storeString
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.graph.OverviewData
import info.nightscout.core.ui.dialogs.OKDialog

2
plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt
View file

@ -12,7 +12,7 @@ import android.view.View
import android.view.ViewGroup
import androidx.core.app.NotificationCompat
import androidx.recyclerview.widget.RecyclerView
import info.nightscout.androidaps.services.AlarmSoundServiceHelper
import info.nightscout.core.services.AlarmSoundServiceHelper
import info.nightscout.interfaces.NotificationHolder
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.ActivePlugin

4
plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
View file

@ -12,8 +12,8 @@ import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.extensions.valueToUnitsString
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.iob.generateCOBString
import info.nightscout.core.iob.round

12
plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
View file

@ -3,12 +3,12 @@ package info.nightscout.plugins.general.wear.wearintegration
import android.app.NotificationManager
import android.content.Context
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.toStringShort
import info.nightscout.androidaps.extensions.valueToUnits
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.androidaps.services.AlarmSoundServiceHelper
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.extensions.valueToUnits
import info.nightscout.core.extensions.valueToUnitsString
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.services.AlarmSoundServiceHelper
import info.nightscout.core.graph.data.GlucoseValueDataPoint
import info.nightscout.core.iob.generateCOBString
import info.nightscout.core.iob.round

2
plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt
View file

@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.toStringShort
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.iob.generateCOBString
import info.nightscout.core.iob.round
import info.nightscout.core.utils.fabric.FabricPrivacy

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

@ -1,8 +1,8 @@
package info.nightscout.plugins.insulin
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.putInt
import info.nightscout.androidaps.extensions.storeInt
import info.nightscout.core.extensions.putInt
import info.nightscout.core.extensions.storeInt
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.insulin.Insulin
import info.nightscout.interfaces.profile.ProfileFunction

8
plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
View file

@ -3,10 +3,10 @@ package info.nightscout.plugins.iob.iobCobCalculator
import androidx.collection.LongSparseArray
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.iobCalc
import info.nightscout.androidaps.extensions.toTemporaryBasal
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStoreObject
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.iobCalc
import info.nightscout.core.extensions.toTemporaryBasal
import info.nightscout.core.iob.iobCobCalculator.AutosensDataStoreObject
import info.nightscout.core.graph.OverviewData
import info.nightscout.core.iob.combine
import info.nightscout.core.iob.copy

4
plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
View file

@ -6,8 +6,8 @@ import androidx.work.Worker
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.target
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.extensions.target
import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.core.utils.receivers.DataWorkerStorage

2
plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt
View file

@ -6,7 +6,7 @@ import androidx.work.Worker
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.core.utils.receivers.DataWorkerStorage

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

@ -7,8 +7,8 @@ import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.androidaps.extensions.blockFromJsonArray
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.blockFromJsonArray
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.ui.toast.ToastUtils

2
plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt
View file

@ -7,7 +7,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.extensions.toStringFull
import info.nightscout.core.extensions.toStringFull
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.iob.IobCobCalculator
import info.nightscout.interfaces.profile.ProfileFunction

4
plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt
View file

@ -4,8 +4,8 @@ import android.os.SystemClock
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.androidaps.extensions.plannedRemainingMinutes
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.core.extensions.plannedRemainingMinutes
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.core.utils.fabric.InstanceId

4
plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt
View file

@ -14,8 +14,8 @@ import androidx.lifecycle.Lifecycle
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.extensions.directionToIcon
import info.nightscout.androidaps.extensions.valueToUnitsString
import info.nightscout.core.extensions.directionToIcon
import info.nightscout.core.extensions.valueToUnitsString
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.utils.ActionModeHelper

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

@ -8,7 +8,7 @@ import androidx.work.Worker
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.fromConstant
import info.nightscout.core.extensions.fromConstant
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.database.entities.GlucoseValue

2
plugins/main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps
import android.content.Context
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.EffectiveProfileSwitch

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

@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBaseWithProfile
import info.nightscout.androidaps.TestPumpPlugin
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.plugins.sync.nsclient
import info.nightscout.androidaps.extensions.toJson
import info.nightscout.core.extensions.toJson
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.BolusCalculatorResult

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.plugins.sync.nsclient.extensions
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.EffectiveProfileSwitch
import info.nightscout.database.entities.embedments.InterfaceIDs

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.plugins.sync.nsclient.extensions
import info.nightscout.androidaps.extensions.toTemporaryBasal
import info.nightscout.core.extensions.toTemporaryBasal
import info.nightscout.database.entities.ExtendedBolus
import info.nightscout.database.entities.embedments.InterfaceIDs
import info.nightscout.interfaces.profile.Profile

6
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.plugins.sync.nsclient.extensions
import info.nightscout.androidaps.extensions.fromConstant
import info.nightscout.androidaps.extensions.getCustomizedName
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.fromConstant
import info.nightscout.core.extensions.getCustomizedName
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.ProfileSwitch
import info.nightscout.database.entities.embedments.InterfaceIDs

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.plugins.sync.nsclient.extensions
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.database.entities.TemporaryBasal
import info.nightscout.database.entities.TemporaryBasal.Type.Companion.fromString
import info.nightscout.database.entities.embedments.InterfaceIDs

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
View file

@ -5,7 +5,7 @@ import androidx.work.Worker
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.bolusCalculatorResultFromJson
import info.nightscout.core.extensions.bolusCalculatorResultFromJson
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.database.entities.TherapyEvent
import info.nightscout.database.impl.AppRepository

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.plugins.sync.nsclientV3.extensions
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.EffectiveProfileSwitch
import info.nightscout.database.entities.embedments.InterfaceIDs

4
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.plugins.sync.nsclientV3.extensions
import info.nightscout.androidaps.extensions.fromConstant
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.fromConstant
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.database.entities.ProfileSwitch
import info.nightscout.database.entities.embedments.InterfaceIDs

2
plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.plugins.sync.tidepool.elements
import com.google.gson.annotations.Expose
import info.nightscout.androidaps.extensions.convertedToAbsolute
import info.nightscout.core.extensions.convertedToAbsolute
import info.nightscout.database.entities.TemporaryBasal
import info.nightscout.interfaces.profile.Profile
import info.nightscout.shared.utils.DateUtil

2
pump/dana/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
pump/danar/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

2
pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
View file

@ -3,7 +3,7 @@ package info.nightscout.androidaps
import android.content.Context
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.Config

2
pump/danars/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps
import androidx.collection.ArrayMap
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.extensions.pureProfileFromJson
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin

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