:core:main cleanup

.run/Run all tests.run.xml

@@ -13,11 +13,12 @@
           <option value="testFullDebugUnitTest" />
         </list>
       </option>
-      <option name="vmOptions" />
+      <option name="vmOptions" value="-Xmx6g -XX:+UseParallelGC" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>

app/src/main/kotlin/app/aaps/MainActivity.kt

@@ -34,6 +34,8 @@ import app.aaps.activities.PreferencesActivity
 import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
 import app.aaps.configuration.activities.SingleFragmentActivity
 import app.aaps.configuration.setupwizard.SetupWizardActivity
+import app.aaps.core.main.utils.CryptoUtil
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
@@ -65,8 +67,6 @@ import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.locale.LocaleHelper
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.CryptoUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.isRunningRealPumpTest
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources

app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt

@@ -8,6 +8,9 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.extensions.toVisibilityKeepSpace
@@ -30,10 +33,7 @@ import com.google.android.material.datepicker.MaterialDatePicker
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
-import info.nightscout.core.events.EventIobCalculationProgress
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.plugins.general.overview.graphData.GraphData
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign

app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt

@@ -1,5 +1,8 @@
 package app.aaps.activities
 
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.DefaultValueHelper
@@ -11,9 +14,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.overview.OverviewDataImpl
 import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin

app/src/main/kotlin/app/aaps/di/AppComponent.kt

@@ -2,6 +2,7 @@ package app.aaps.di
 
 import app.aaps.MainApp
 import app.aaps.configuration.di.ConfigurationModule
+import app.aaps.core.main.di.CoreModule
 import app.aaps.shared.impl.di.SharedImplModule
 import dagger.BindsInstance
 import dagger.Component
@@ -16,7 +17,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
 import info.nightscout.automation.di.AutomationModule
-import info.nightscout.core.di.CoreModule
 import info.nightscout.core.validators.di.ValidatorsModule
 import info.nightscout.database.impl.DatabaseModule
 import info.nightscout.implementation.di.ImplementationModule

app/src/main/kotlin/app/aaps/di/AppModule.kt

@@ -2,6 +2,7 @@ package app.aaps.di
 
 import android.content.Context
 import app.aaps.MainApp
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.implementations.ConfigImpl
 import app.aaps.implementations.InstantiatorImpl
 import app.aaps.implementations.UiInteractionImpl
@@ -15,7 +16,6 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.workflow.CalculationWorkflow
 
 @Suppress("unused")
 @Module(

app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt

@@ -11,13 +11,13 @@ import app.aaps.activities.HistoryBrowseActivity
 import app.aaps.activities.MyPreferenceFragment
 import app.aaps.activities.PreferencesActivity
 import app.aaps.configuration.activities.SingleFragmentActivity
+import app.aaps.core.main.events.EventNewNotification
 import app.aaps.interfaces.notifications.Notification
 import app.aaps.interfaces.nsclient.NSAlarm
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
 import info.nightscout.ui.activities.BolusProgressHelperActivity

app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt

@@ -10,6 +10,8 @@ import androidx.work.WorkQuery
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import app.aaps.configuration.maintenance.MaintenancePlugin
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.alerts.LocalAlertUtils
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
@@ -27,8 +29,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import com.google.common.util.concurrent.ListenableFuture
 import info.nightscout.androidaps.R
-import info.nightscout.core.profile.ProfileSealed
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.TimeUnit

app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt

@@ -7,6 +7,12 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
+import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB
+import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
+import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -22,14 +28,8 @@ import app.aaps.interfaces.rx.events.EventPreferenceChange
 import app.aaps.interfaces.rx.events.EventTherapyEventChange
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.utils.worker.then
-import info.nightscout.core.workflow.CalculationWorkflow
-import info.nightscout.core.workflow.CalculationWorkflow.Companion.JOB
-import info.nightscout.core.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
-import info.nightscout.core.workflow.CalculationWorkflow.Companion.PASS
 import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.workflow.DummyWorker
 import info.nightscout.workflow.InvokeLoopWorker

core/main/build.gradle

@@ -38,5 +38,5 @@ dependencies {
 }
 
 android {
-    namespace 'info.nightscout.core.main'
+    namespace 'app.aaps.core.main'
 }

core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt → core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.constraints
+package app.aaps.core.main.constraints
 
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.logging.AAPSLogger

core/main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt → core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt

@@ -1,10 +1,10 @@
-package info.nightscout.core.di
+package app.aaps.core.main.di
 
+import app.aaps.core.main.wizard.BolusWizard
+import app.aaps.core.main.wizard.QuickWizardEntry
 import app.aaps.interfaces.pump.PumpEnactResult
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.core.wizard.BolusWizard
-import info.nightscout.core.wizard.QuickWizardEntry
 
 @Module
 @Suppress("unused")

core/main/src/main/java/info/nightscout/core/di/CoreModule.kt → core/main/src/main/kotlin/app/aaps/core/main/di/CoreModule.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.di
+package app.aaps.core.main.di
 
 import android.content.Context
 import android.os.Build

core/main/src/main/java/info/nightscout/core/di/PreferencesModule.kt → core/main/src/main/kotlin/app/aaps/core/main/di/PreferencesModule.kt

@@ -1,8 +1,8 @@
-package info.nightscout.core.di
+package app.aaps.core.main.di
 
+import app.aaps.core.main.utils.CryptoUtil
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.core.utils.CryptoUtil
 
 @Module
 @Suppress("unused")

core/main/src/main/java/info/nightscout/core/events/EventIobCalculationProgress.kt → core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt

@@ -1,7 +1,7 @@
-package info.nightscout.core.events
+package app.aaps.core.main.events
 
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.rx.events.Event
-import info.nightscout.core.workflow.CalculationWorkflow
 
 class EventIobCalculationProgress(val pass: CalculationWorkflow.ProgressData, private val progressPct: Int, val cause: Event?) : Event() {
 

core/main/src/main/java/info/nightscout/core/events/EventNewNotification.kt → core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.events
+package app.aaps.core.main.events
 
 import app.aaps.interfaces.notifications.Notification
 import app.aaps.interfaces.rx.events.Event

core/main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T

core/main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.insulin.Insulin
 import app.aaps.interfaces.iob.Iob

core/main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.insulin.Insulin

core/main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt

@@ -1,10 +1,10 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
+import app.aaps.core.main.R
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.InMemoryGlucoseValue
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
 import org.json.JSONObject
 

core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt

@@ -1,12 +1,12 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.PureProfile
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.ProfileSwitch
 import org.json.JSONObject

core/main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.insulin.Insulin

core/main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit

core/main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.utils.DateUtil

core/main/src/main/java/info/nightscout/core/graph/ActivityGraph.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.graphics.Color

core/main/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet

core/main/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet

core/main/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet

core/main/src/main/java/info/nightscout/core/graph/OverviewData.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt

@@ -1,9 +1,15 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.DeviationDataPoint
+import app.aaps.core.main.graph.data.FixedLineGraphSeries
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.graph.data.Scale
+import app.aaps.core.main.graph.data.ScaledDataPoint
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.iob.CobInfo
@@ -13,12 +19,6 @@ import app.aaps.interfaces.iob.IobTotal
 import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.DeviationDataPoint
-import info.nightscout.core.graph.data.FixedLineGraphSeries
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
-import info.nightscout.core.graph.data.Scale
-import info.nightscout.core.graph.data.ScaledDataPoint
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TemporaryTarget
 

core/main/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt

@@ -1,15 +1,15 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet
+import app.aaps.core.main.graph.data.AreaGraphSeries
+import app.aaps.core.main.graph.data.DoubleDataPoint
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.Round
 import com.jjoe64.graphview.DefaultLabelFormatter
 import com.jjoe64.graphview.GraphView
-import info.nightscout.core.graph.data.AreaGraphSeries
-import info.nightscout.core.graph.data.DoubleDataPoint
 import java.text.NumberFormat
 import kotlin.math.max
 import kotlin.math.min

core/main/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/AreaGraphSeries.kt

@@ -17,7 +17,7 @@
  * with the "Linking Exception" along with this program; if not,
  * write to the author Jonas Gehring <g.jjoe64></g.jjoe64>@gmail.com>.
  */
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.graphics.Canvas
 import android.graphics.Color

core/main/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint

core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt

@@ -1,9 +1,9 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
+import app.aaps.core.main.R
 import app.aaps.interfaces.resources.ResourceHelper
-import info.nightscout.core.main.R
 import info.nightscout.database.entities.Carbs
 
 class CarbsDataPoint(

core/main/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/DataPointWithLabelInterface.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint