caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:core:main cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-24 22:05:21 +02:00
parent 06e8e00d37
commit 2c5e2e3951
353 changed files with 733 additions and 734 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.run/Run all tests.run.xml
View file

@ -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>

4
app/src/main/kotlin/app/aaps/MainActivity.kt
View file

@ -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

6
app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
View file

@ -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

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

@ -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

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

@ -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

2
app/src/main/kotlin/app/aaps/di/AppModule.kt
View file

@ -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(

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

@ -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

4
app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
View file

@ -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

12
app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
View file

@ -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

2
core/main/build.gradle
View file

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

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

@ -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

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

@ -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")

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

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

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

@ -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")

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

@ -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() {

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

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

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

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

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

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

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

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

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

@ -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

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

@ -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

2
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
View file

@ -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

2
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
View file

@ -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

4
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
View file

@ -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(

2
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
View file

@ -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

2
core/main/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/DeviationDataPoint.kt
View file

@ -1,3 +1,3 @@
package info.nightscout.core.graph.data
package app.aaps.core.main.graph.data
class DeviationDataPoint(x: Double, y: Double, var color: Int, scale: Scale) : ScaledDataPoint(x, y, scale)

2
core/main/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/DoubleDataPoint.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.graph.data
package app.aaps.core.main.graph.data
import com.jjoe64.graphview.series.DataPointInterface

2
core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt
View file

@ -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

2
core/main/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt
View file

@ -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

2
core/main/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/FixedLineGraphSeries.kt
View file

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

2
core/main/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt
View file

@ -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

2
core/main/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt
View file

@ -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

2
core/main/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt
View file

@ -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

4
core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/PointsWithLabelGraphSeries.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.graph.data
package app.aaps.core.main.graph.data
import android.graphics.Canvas
import android.graphics.Color
@ -9,9 +9,9 @@ import android.graphics.PorterDuff
import android.graphics.Rect
import android.graphics.Typeface
import androidx.core.content.ContextCompat
import app.aaps.core.main.R
import com.jjoe64.graphview.GraphView
import com.jjoe64.graphview.series.BaseSeries
import info.nightscout.core.main.R
/**
* Series that plots the data as points.

2
core/main/src/main/java/info/nightscout/core/graph/data/Scale.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/Scale.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.graph.data
package app.aaps.core.main.graph.data
class Scale(var shift: Double = 0.0, var multiplier: Double = 1.0) {

2
core/main/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/ScaledDataPoint.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.graph.data
package app.aaps.core.main.graph.data
import com.jjoe64.graphview.series.DataPointInterface

2
core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt
View file

@ -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

4
core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt → core/main/src/main/kotlin/app/aaps/core/main/graph/data/TimeAsXAxisLabelFormatter.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.graph.data
package app.aaps.core.main.graph.data
import com.jjoe64.graphview.DefaultLabelFormatter
import java.text.DateFormat
@ -21,7 +21,7 @@ class TimeAsXAxisLabelFormatter(private val format: String) : DefaultLabelFormat
// Fatal Exception: java.lang.NullPointerException
// Attempt to invoke virtual method 'double com.jjoe64.graphview.Viewport.getMaxY(boolean)' on a null object reference
// com.jjoe64.graphview.DefaultLabelFormatter.formatLabel (DefaultLabelFormatter.java:89)
// info.nightscout.core.graph.data.TimeAsXAxisLabelFormatter.formatLabel (TimeAsXAxisLabelFormatter.java:26)
// app.aaps.core.main.graph.data.TimeAsXAxisLabelFormatter.formatLabel (TimeAsXAxisLabelFormatter.java:26)
// com.jjoe64.graphview.GridLabelRenderer.drawVerticalSteps (GridLabelRenderer.java:1057)
// com.jjoe64.graphview.GridLabelRenderer.draw (GridLabelRenderer.java:866)
// com.jjoe64.graphview.GraphView.onDraw (GraphView.java:296)

2
core/main/src/main/java/info/nightscout/core/iob/CobInfoExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.iob
package app.aaps.core.main.iob
import app.aaps.interfaces.iob.CobInfo
import app.aaps.interfaces.resources.ResourceHelper

2
core/main/src/main/java/info/nightscout/core/iob/GlucoseStatusExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.iob
package app.aaps.core.main.iob
import app.aaps.interfaces.iob.GlucoseStatus
import app.aaps.interfaces.utils.DecimalFormatter

2
core/main/src/main/java/info/nightscout/core/iob/IobTotalExtension.kt → core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt
View file

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

16
core/main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt → core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt
View file

@ -1,5 +1,12 @@
package info.nightscout.core.profile
package app.aaps.core.main.profile
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.extensions.blockValueBySeconds
import app.aaps.core.main.extensions.highTargetBlockValueBySeconds
import app.aaps.core.main.extensions.lowTargetBlockValueBySeconds
import app.aaps.core.main.extensions.shiftBlock
import app.aaps.core.main.extensions.shiftTargetBlock
import app.aaps.core.main.extensions.targetBlockValueBySeconds
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.db.GlucoseUnit
import app.aaps.interfaces.notifications.Notification
@ -12,13 +19,6 @@ import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.HardLimits
import app.aaps.interfaces.utils.T
import info.nightscout.core.events.EventNewNotification
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.utils.MidnightUtils
import info.nightscout.database.entities.EffectiveProfileSwitch
import info.nightscout.database.entities.ProfileSwitch

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

@ -1,4 +1,4 @@
package info.nightscout.core.pump
package app.aaps.core.main.pump
import app.aaps.interfaces.pump.PumpEnactResult
import app.aaps.interfaces.resources.ResourceHelper

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

@ -1,4 +1,4 @@
package info.nightscout.core.pump
package app.aaps.core.main.pump
import app.aaps.interfaces.pump.defs.PumpType
import info.nightscout.database.entities.UserEntry

4
core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt → core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils
package app.aaps.core.main.utils
import android.util.SparseArray
import android.view.ActionMode
@ -8,8 +8,8 @@ import android.view.MenuItem
import androidx.core.view.MenuCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import app.aaps.core.main.R
import app.aaps.interfaces.resources.ResourceHelper
import info.nightscout.core.main.R
class ActionModeHelper<T>(val rh: ResourceHelper, val activity: FragmentActivity?, val fragment: Fragment?) {

3
core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt → core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.core.utils
package app.aaps.core.main.utils
import app.aaps.interfaces.logging.AAPSLogger
import info.nightscout.core.utils.toHex
import org.spongycastle.util.encoders.Base64
import java.nio.ByteBuffer
import java.security.MessageDigest

2
core/main/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt → core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils.extensions
package app.aaps.core.main.utils.extensions
import android.content.Context
import androidx.annotation.AttrRes

2
core/main/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt → core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils.extensions
package app.aaps.core.main.utils.extensions
import androidx.annotation.StringRes
import app.aaps.interfaces.resources.ResourceHelper

2
core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt → core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils.fabric
package app.aaps.core.main.utils.fabric
import android.os.Bundle
import app.aaps.annotations.OpenForTesting

4
core/main/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt → core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.core.utils.worker
package app.aaps.core.main.utils.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import dagger.android.HasAndroidInjector
import info.nightscout.core.utils.fabric.FabricPrivacy
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
import javax.inject.Inject

12
core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt → core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt
View file

@ -1,7 +1,12 @@
package info.nightscout.core.wizard
package app.aaps.core.main.wizard
import android.content.Context
import android.text.Spanned
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.extensions.highValueToUnitsToString
import app.aaps.core.main.extensions.lowValueToUnitsToString
import app.aaps.core.main.iob.round
import app.aaps.core.main.utils.extensions.formatColor
import app.aaps.interfaces.aps.Loop
import app.aaps.interfaces.automation.Automation
import app.aaps.interfaces.configuration.Config
@ -33,13 +38,8 @@ import app.aaps.interfaces.utils.Round
import app.aaps.interfaces.utils.T
import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector
import info.nightscout.core.constraints.ConstraintObject
import info.nightscout.core.extensions.highValueToUnitsToString
import info.nightscout.core.extensions.lowValueToUnitsToString
import info.nightscout.core.iob.round
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.utils.HtmlHelper
import info.nightscout.core.utils.extensions.formatColor
import info.nightscout.database.entities.BolusCalculatorResult
import info.nightscout.database.entities.OfflineEvent
import info.nightscout.database.entities.TemporaryTarget

2
core/main/src/main/java/info/nightscout/core/wizard/QuickWizard.kt → core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.wizard
package app.aaps.core.main.wizard
import app.aaps.interfaces.sharedPreferences.SP
import dagger.android.HasAndroidInjector

6
core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt → core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt
View file

@ -1,6 +1,8 @@
package info.nightscout.core.wizard
package app.aaps.core.main.wizard
import app.aaps.annotations.OpenForTesting
import app.aaps.core.main.extensions.valueToUnits
import app.aaps.core.main.iob.round
import app.aaps.interfaces.aps.Loop
import app.aaps.interfaces.db.PersistenceLayer
import app.aaps.interfaces.iob.GlucoseStatusProvider
@ -12,8 +14,6 @@ import app.aaps.interfaces.profile.ProfileFunction
import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.DateUtil
import dagger.android.HasAndroidInjector
import info.nightscout.core.extensions.valueToUnits
import info.nightscout.core.iob.round
import info.nightscout.core.utils.JsonHelper.safeGetInt
import info.nightscout.core.utils.JsonHelper.safeGetString
import info.nightscout.core.utils.MidnightUtils

4
core/main/src/main/java/info/nightscout/core/workflow/CalculationWorkflow.kt → core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.core.workflow
package app.aaps.core.main.workflow
import app.aaps.core.main.graph.OverviewData
import app.aaps.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.rx.events.Event
import info.nightscout.core.graph.OverviewData
interface CalculationWorkflow {
companion object {

29
core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt → core/main/src/test/kotlin/app/aaps/core/main/constraints/ConstraintObjectTest.kt
View file

@ -1,14 +1,13 @@
package info.nightscout.core.data
package app.aaps.core.main.constraints
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import info.nightscout.core.constraints.ConstraintObject
import org.junit.jupiter.api.Test
/**
* Created by mike on 19.03.2018.
*/
class ConstraintTest : TestBase() {
class ConstraintObjectTest : TestBase() {
@Test fun doTests() {
val b = ConstraintObject(true, aapsLogger)
@ -21,30 +20,30 @@ class ConstraintTest : TestBase() {
assertThat(b.getMostLimitedReasons()).isEmpty()
b.set(true, "Set true", this)
assertThat(b.value()).isTrue()
assertThat(b.getReasons()).isEqualTo("ConstraintTest: Set true")
assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set true")
assertThat(b.getReasons()).isEqualTo("ConstraintObjectTest: Set true")
assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set true")
b.set(false, "Set false", this)
assertThat(b.value()).isFalse()
assertThat(b.getReasons()).isEqualTo("ConstraintTest: Set true\nConstraintTest: Set false")
assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set true\nConstraintTest: Set false")
assertThat(b.getReasons()).isEqualTo("ConstraintObjectTest: Set true\nConstraintObjectTest: Set false")
assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set true\nConstraintObjectTest: Set false")
val d = ConstraintObject(10.0, aapsLogger)
d.set(5.0, "Set 5d", this)
assertThat(d.value()).isWithin(0.01).of(5.0)
assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 5d")
assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 5d")
d.setIfSmaller(6.0, "Set 6d", this)
assertThat(d.value()).isWithin(0.01).of(5.0)
assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d\nConstraintTest: Set 6d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 5d")
assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d\nConstraintObjectTest: Set 6d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 5d")
d.setIfSmaller(4.0, "Set 4d", this)
assertThat(d.value()).isWithin(0.01).of(4.0)
assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 4d")
assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d\nConstraintObjectTest: Set 6d\nConstraintObjectTest: Set 4d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 4d")
assertThat(d.originalValue()).isWithin(0.01).of(10.0)
d.setIfDifferent(7.0, "Set 7d", this)
assertThat(d.value()).isWithin(0.01).of(7.0)
assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 4d\nConstraintTest: Set 7d")
assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d\nConstraintObjectTest: Set 6d\nConstraintObjectTest: Set 4d\nConstraintObjectTest: Set 7d")
assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 4d\nConstraintObjectTest: Set 7d")
assertThat(d.originalValue()).isWithin(0.01).of(10.0)
}
}

2
core/main/src/test/java/info/nightscout/core/extensions/BlockExtensionKtTest.kt → core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.extensions
package app.aaps.core.main.extensions
import app.aaps.interfaces.utils.T
import com.google.common.truth.Truth.assertThat

2
core/main/src/test/java/info/nightscout/core/utils/CryptoUtilTest.kt → core/main/src/test/kotlin/app/aaps/core/main/utils/CryptoUtilTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils
package app.aaps.core.main.utils
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat

4
core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt → core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils
package app.aaps.core.main.utils
import android.content.Context
import app.aaps.interfaces.resources.ResourceHelper
@ -15,7 +15,7 @@ import java.util.Date
import java.util.SimpleTimeZone
import java.util.TimeZone
class DateUtilTest : TestBase() {
class DateUtilImplTest : TestBase() {
@Mock lateinit var context: Context
@Mock lateinit var rh: ResourceHelper

2
core/main/src/test/java/info/nightscout/core/wizard/QuickWizardTest.kt → core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.wizard
package app.aaps.core.main.wizard
import app.aaps.interfaces.aps.Loop
import app.aaps.interfaces.profile.ProfileFunction

4
core/main/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.core.graph.data
package app.aaps.interfaces.iob
import android.content.Context
import android.graphics.Color
import app.aaps.core.main.graph.data.InMemoryGlucoseValueDataPoint
import app.aaps.interfaces.db.GlucoseUnit
import app.aaps.interfaces.iob.InMemoryGlucoseValue
import app.aaps.interfaces.profile.DefaultValueHelper
import app.aaps.interfaces.profile.ProfileFunction
import app.aaps.interfaces.resources.ResourceHelper

3
core/main/src/test/java/info/nightscout/core/data/IobTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.core.data
package app.aaps.interfaces.iob
import app.aaps.interfaces.iob.Iob
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test

15
core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt
View file

@ -1,17 +1,16 @@
package info.nightscout.core.data
package app.aaps.interfaces.iob
import android.content.Context
import app.aaps.interfaces.iob.IobTotal
import app.aaps.core.main.iob.combine
import app.aaps.core.main.iob.copy
import app.aaps.core.main.iob.determineBasalJson
import app.aaps.core.main.iob.json
import app.aaps.core.main.iob.plus
import app.aaps.core.main.iob.round
import app.aaps.interfaces.utils.DateUtil
import app.aaps.shared.impl.utils.DateUtilImpl
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
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 org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

3
core/main/src/test/java/info/nightscout/core/data/MealDataTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.core.data
package app.aaps.interfaces.iob
import app.aaps.interfaces.iob.MealData
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test

4
core/main/src/test/java/info/nightscout/core/interfaces/PluginDescriptionTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt
View file

@ -1,8 +1,6 @@
package info.nightscout.core.interfaces
package app.aaps.interfaces.plugin
import androidx.fragment.app.Fragment
import app.aaps.interfaces.plugin.PluginDescription
import app.aaps.interfaces.plugin.PluginType
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test

8
core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt
View file

@ -1,6 +1,8 @@
package info.nightscout.core.data
package app.aaps.interfaces.profile
import android.content.Context
import app.aaps.core.main.extensions.pureProfileFromJson
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.resources.ResourceHelper
@ -13,8 +15,6 @@ import app.aaps.shared.tests.TestBase
import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import org.json.JSONObject
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
@ -27,7 +27,7 @@ import java.util.Calendar
/**
* Created by mike on 18.03.2018.
*/
class ProfileTest : TestBase() {
class ProfileSealedTest : TestBase() {
@Mock lateinit var activePluginProvider: ActivePlugin
@Mock lateinit var rh: ResourceHelper

3
core/main/src/test/java/info/nightscout/core/data/DetailedBolusInfoTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.core.data
package app.aaps.interfaces.pump
import android.content.Context
import app.aaps.interfaces.pump.DetailedBolusInfo
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import com.google.gson.Gson

6
core/main/src/test/java/info/nightscout/core/interfaces/PumpDescriptionTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt
View file

@ -1,9 +1,5 @@
package info.nightscout.core.interfaces
package app.aaps.interfaces.pump.defs
import app.aaps.interfaces.pump.defs.PumpCapability
import app.aaps.interfaces.pump.defs.PumpDescription
import app.aaps.interfaces.pump.defs.PumpTempBasalType
import app.aaps.interfaces.pump.defs.PumpType
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test

3
core/main/src/test/java/info/nightscout/core/utils/MidnightTimeTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.core.utils
package app.aaps.interfaces.utils
import app.aaps.interfaces.utils.MidnightTime
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test
import java.util.Calendar

3
core/main/src/test/java/info/nightscout/core/utils/RoundTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.core.utils
package app.aaps.interfaces.utils
import app.aaps.interfaces.utils.Round
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test

3
core/main/src/test/java/info/nightscout/core/utils/TTest.kt → core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.core.utils
package app.aaps.interfaces.utils
import app.aaps.interfaces.utils.T
import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test
import kotlin.math.abs

3
core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt → core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.core.utils
package app.aaps.core.utils
import com.google.common.truth.Truth.assertThat
import info.nightscout.core.utils.JsonHelper
import org.json.JSONObject
import org.junit.jupiter.api.Test

2
core/main/src/test/java/info/nightscout/core/utils/StringUtilsTest.kt → core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.utils
package app.aaps.core.utils.receivers
import com.google.common.truth.Truth.assertThat
import info.nightscout.core.utils.receivers.StringUtils

2
core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt → core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.pump.common.utils
package app.aaps.pump.common.utils
import com.google.common.truth.Truth.assertThat
import info.nightscout.core.utils.DateTimeUtil

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

@ -1,5 +1,6 @@
package info.nightscout.implementation
import app.aaps.core.main.events.EventNewNotification
import app.aaps.interfaces.alerts.LocalAlertUtils
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.configuration.Constants
@ -16,7 +17,6 @@ import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.T
import info.nightscout.core.events.EventNewNotification
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.TherapyEvent
import info.nightscout.database.entities.UserEntry.Action

2
implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.implementation.di
import app.aaps.core.main.graph.OverviewData
import app.aaps.interfaces.alerts.LocalAlertUtils
import app.aaps.interfaces.db.PersistenceLayer
import app.aaps.interfaces.iob.GlucoseStatusProvider
@ -34,7 +35,6 @@ import app.aaps.interfaces.utils.TrendCalculator
import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.core.graph.OverviewData
import info.nightscout.implementation.DefaultValueHelperImpl
import info.nightscout.implementation.HardLimitsImpl
import info.nightscout.implementation.LocalAlertUtilsImpl

4
implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
View file

@ -1,6 +1,8 @@
package info.nightscout.implementation.iob
import app.aaps.annotations.OpenForTesting
import app.aaps.core.main.iob.asRounded
import app.aaps.core.main.iob.log
import app.aaps.interfaces.iob.GlucoseStatus
import app.aaps.interfaces.iob.GlucoseStatusProvider
import app.aaps.interfaces.iob.IobCobCalculator
@ -9,8 +11,6 @@ import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.DecimalFormatter
import dagger.Reusable
import info.nightscout.core.iob.asRounded
import info.nightscout.core.iob.log
import javax.inject.Inject
import kotlin.math.roundToLong

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

@ -4,6 +4,20 @@ import android.content.Context
import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
import androidx.annotation.DrawableRes
import app.aaps.core.main.R
import app.aaps.core.main.extensions.convertedToPercent
import app.aaps.core.main.extensions.isInProgress
import app.aaps.core.main.extensions.toStringFull
import app.aaps.core.main.extensions.toStringShort
import app.aaps.core.main.extensions.valueToUnits
import app.aaps.core.main.graph.OverviewData
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.core.main.iob.round
import app.aaps.interfaces.aps.AutosensData
import app.aaps.interfaces.aps.AutosensDataStore
import app.aaps.interfaces.iob.CobInfo
@ -22,20 +36,6 @@ import app.aaps.interfaces.utils.T
import com.jjoe64.graphview.series.BarGraphSeries
import com.jjoe64.graphview.series.DataPoint
import com.jjoe64.graphview.series.LineGraphSeries
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
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.core.iob.round
import info.nightscout.core.main.R
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.entities.TemporaryTarget

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

@ -1,5 +1,8 @@
package info.nightscout.implementation.profile
import app.aaps.core.main.extensions.fromConstant
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.db.GlucoseUnit
import app.aaps.interfaces.logging.AAPSLogger
@ -17,9 +20,6 @@ import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.HardLimits
import app.aaps.interfaces.utils.T
import info.nightscout.core.extensions.fromConstant
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.ProfileSwitch
import info.nightscout.database.impl.AppRepository

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

@ -1,6 +1,8 @@
package info.nightscout.implementation.profile
import androidx.collection.ArrayMap
import app.aaps.core.main.extensions.pureProfileFromJson
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.plugin.ActivePlugin
@ -11,8 +13,6 @@ import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.HardLimits
import dagger.android.HasAndroidInjector
import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.JsonHelper
import org.json.JSONException
import org.json.JSONObject

4
implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt
View file

@ -11,13 +11,13 @@ import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.TextView
import androidx.annotation.StringRes
import app.aaps.core.main.R
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.interfaces.protection.PasswordCheck
import app.aaps.interfaces.sharedPreferences.SP
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.Reusable
import info.nightscout.core.main.R
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.CryptoUtil
import javax.inject.Inject
@Reusable

8
implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt
View file

@ -1,5 +1,9 @@
package info.nightscout.implementation.pump
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.pump.fromDbPumpType
import app.aaps.core.main.pump.toDbPumpType
import app.aaps.core.main.pump.toDbSource
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.logging.UserEntryLogger
@ -15,10 +19,6 @@ import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.T
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.pump.fromDbPumpType
import info.nightscout.core.pump.toDbPumpType
import info.nightscout.core.pump.toDbSource
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.Carbs

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

@ -1,10 +1,10 @@
package info.nightscout.implementation.pump
import android.widget.TextView
import app.aaps.core.main.extensions.isOlderThan
import app.aaps.interfaces.pump.WarnColors
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.utils.DateUtil
import info.nightscout.core.extensions.isOlderThan
import info.nightscout.database.entities.TherapyEvent
import javax.inject.Inject
import javax.inject.Singleton

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

@ -8,6 +8,11 @@ import android.os.SystemClock
import android.text.Spanned
import androidx.appcompat.app.AppCompatActivity
import app.aaps.annotations.OpenForTesting
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.extensions.getCustomizedName
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.interfaces.androidPermissions.AndroidPermission
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.constraints.ConstraintsChecker
@ -39,12 +44,7 @@ import app.aaps.interfaces.ui.UiInteraction
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.DecimalFormatter
import dagger.android.HasAndroidInjector
import info.nightscout.core.constraints.ConstraintObject
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.extensions.getCustomizedName
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.utils.HtmlHelper
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.EffectiveProfileSwitch
import info.nightscout.database.entities.ProfileSwitch

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

@ -39,7 +39,7 @@ class CommandBolus(
override fun log(): String {
return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, detailedBolusInfo.insulin) else "") +
if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(info.nightscout.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(app.aaps.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
}
override fun cancel() {

2
implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
View file

@ -21,6 +21,6 @@ class IconsProviderImplementation @Inject constructor(private val config: Config
when {
config.NSCLIENT -> R.drawable.ic_notif_nsclient
config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
else -> info.nightscout.core.main.R.drawable.ic_notif_aaps
else -> app.aaps.core.main.R.drawable.ic_notif_aaps
}
}

2
implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
View file

@ -18,10 +18,10 @@ import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.content.ContextCompat
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.interfaces.resources.ResourceHelper
import info.nightscout.core.ui.getThemeColor
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.core.utils.fabric.FabricPrivacy
import java.util.Locale
import javax.inject.Inject

4
implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
View file

@ -53,7 +53,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: Da
if (includeCarbs)
row.addView(TextView(context).apply {
gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(
info.nightscout.core.main.R.string.format_carbs, carbs
app.aaps.core.main.R.string.format_carbs, carbs
.toInt()
)
})
@ -87,7 +87,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i
if (includeCarbs)
row.addView(TextView(context).apply {
gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(
info.nightscout.core.main.R.string.format_carbs, carbs
app.aaps.core.main.R.string.format_carbs, carbs
.toInt()
)
})

2
implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.implementation.userEntry
import android.text.Spanned
import app.aaps.core.main.R
import app.aaps.interfaces.configuration.Constants
import app.aaps.interfaces.db.GlucoseUnit
import app.aaps.interfaces.profile.ProfileUtil
@ -10,7 +11,6 @@ import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.DecimalFormatter
import app.aaps.interfaces.utils.Translator
import dagger.Reusable
import info.nightscout.core.main.R
import info.nightscout.core.utils.HtmlHelper
import info.nightscout.database.entities.UserEntry
import info.nightscout.database.entities.UserEntry.Action

4
implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
View file

@ -1,5 +1,7 @@
package info.nightscout.implementation.iob
import app.aaps.core.main.iob.asRounded
import app.aaps.core.main.iob.log
import app.aaps.interfaces.aps.AutosensDataStore
import app.aaps.interfaces.iob.GlucoseStatus
import app.aaps.interfaces.iob.InMemoryGlucoseValue
@ -7,8 +9,6 @@ import app.aaps.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.utils.T
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import info.nightscout.core.iob.asRounded
import info.nightscout.core.iob.log
import info.nightscout.database.entities.GlucoseValue
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test

4
implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
View file

@ -3,6 +3,8 @@ package info.nightscout.implementation.queue
import android.content.Context
import android.os.Handler
import android.os.PowerManager
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.interfaces.androidPermissions.AndroidPermission
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.constraints.ConstraintsChecker
@ -28,8 +30,6 @@ import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.core.constraints.ConstraintObject
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.Bolus
import info.nightscout.database.impl.AppRepository

2
implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
View file

@ -2,6 +2,7 @@ package info.nightscout.implementation.queue
import android.content.Context
import android.os.PowerManager
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.interfaces.androidPermissions.AndroidPermission
import app.aaps.interfaces.constraints.ConstraintsChecker
import app.aaps.interfaces.db.PersistenceLayer
@ -14,7 +15,6 @@ import app.aaps.shared.tests.TestPumpPlugin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.core.constraints.ConstraintObject
import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
import org.junit.jupiter.api.BeforeEach

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