Skip to content

Commit 2c5e2e3

Browse files
MilosKozakMilosKozak
committed
:core:main cleanup
1 parent 06e8e00 commit 2c5e2e3

File tree

353 files changed

+734
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+734
-735
lines changed

‎.run/Run all tests.run.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
<option value="testFullDebugUnitTest" />
1414
</list>
1515
</option>
16-
<option name="vmOptions" />
16+
<option name="vmOptions" value="-Xmx6g -XX:+UseParallelGC" />
1717
</ExternalSystemSettings>
1818
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
1919
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2020
<DebugAllEnabled>false</DebugAllEnabled>
21+
<ForceTestExec>false</ForceTestExec>
2122
<method v="2" />
2223
</configuration>
2324
</component>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import app.aaps.activities.PreferencesActivity
3434
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
3535
import app.aaps.configuration.activities.SingleFragmentActivity
3636
import app.aaps.configuration.setupwizard.SetupWizardActivity
37+
import app.aaps.core.main.utils.CryptoUtil
38+
import app.aaps.core.main.utils.fabric.FabricPrivacy
3739
import app.aaps.interfaces.androidPermissions.AndroidPermission
3840
import app.aaps.interfaces.aps.Loop
3941
import app.aaps.interfaces.configuration.Config
@@ -65,8 +67,6 @@ import info.nightscout.core.ui.UIRunnable
6567
import info.nightscout.core.ui.dialogs.OKDialog
6668
import info.nightscout.core.ui.locale.LocaleHelper
6769
import info.nightscout.core.ui.toast.ToastUtils
68-
import info.nightscout.core.utils.CryptoUtil
69-
import info.nightscout.core.utils.fabric.FabricPrivacy
7070
import info.nightscout.core.utils.isRunningRealPumpTest
7171
import info.nightscout.database.entities.UserEntry.Action
7272
import info.nightscout.database.entities.UserEntry.Sources

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import android.view.ViewGroup
88
import android.widget.LinearLayout
99
import android.widget.RelativeLayout
1010
import android.widget.TextView
11+
import app.aaps.core.main.events.EventIobCalculationProgress
12+
import app.aaps.core.main.utils.fabric.FabricPrivacy
13+
import app.aaps.core.main.workflow.CalculationWorkflow
1114
import app.aaps.interfaces.configuration.Config
1215
import app.aaps.interfaces.extensions.toVisibility
1316
import app.aaps.interfaces.extensions.toVisibilityKeepSpace
@@ -30,10 +33,7 @@ import com.google.android.material.datepicker.MaterialDatePicker
3033
import com.jjoe64.graphview.GraphView
3134
import dagger.android.HasAndroidInjector
3235
import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
33-
import info.nightscout.core.events.EventIobCalculationProgress
3436
import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
35-
import info.nightscout.core.utils.fabric.FabricPrivacy
36-
import info.nightscout.core.workflow.CalculationWorkflow
3737
import info.nightscout.plugins.general.overview.graphData.GraphData
3838
import io.reactivex.rxjava3.disposables.CompositeDisposable
3939
import io.reactivex.rxjava3.kotlin.plusAssign

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package app.aaps.activities
22

3+
import app.aaps.core.main.graph.OverviewData
4+
import app.aaps.core.main.utils.fabric.FabricPrivacy
5+
import app.aaps.core.main.workflow.CalculationWorkflow
36
import app.aaps.interfaces.logging.AAPSLogger
47
import app.aaps.interfaces.plugin.ActivePlugin
58
import app.aaps.interfaces.profile.DefaultValueHelper
@@ -11,9 +14,6 @@ import app.aaps.interfaces.sharedPreferences.SP
1114
import app.aaps.interfaces.utils.DateUtil
1215
import app.aaps.interfaces.utils.DecimalFormatter
1316
import dagger.android.HasAndroidInjector
14-
import info.nightscout.core.graph.OverviewData
15-
import info.nightscout.core.utils.fabric.FabricPrivacy
16-
import info.nightscout.core.workflow.CalculationWorkflow
1717
import info.nightscout.database.impl.AppRepository
1818
import info.nightscout.implementation.overview.OverviewDataImpl
1919
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package app.aaps.di
22

33
import app.aaps.MainApp
44
import app.aaps.configuration.di.ConfigurationModule
5+
import app.aaps.core.main.di.CoreModule
56
import app.aaps.shared.impl.di.SharedImplModule
67
import dagger.BindsInstance
78
import dagger.Component
@@ -16,7 +17,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
1617
import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
1718
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
1819
import info.nightscout.automation.di.AutomationModule
19-
import info.nightscout.core.di.CoreModule
2020
import info.nightscout.core.validators.di.ValidatorsModule
2121
import info.nightscout.database.impl.DatabaseModule
2222
import info.nightscout.implementation.di.ImplementationModule

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package app.aaps.di
22

33
import android.content.Context
44
import app.aaps.MainApp
5+
import app.aaps.core.main.workflow.CalculationWorkflow
56
import app.aaps.implementations.ConfigImpl
67
import app.aaps.implementations.InstantiatorImpl
78
import app.aaps.implementations.UiInteractionImpl
@@ -15,7 +16,6 @@ import dagger.Lazy
1516
import dagger.Module
1617
import dagger.Provides
1718
import dagger.android.HasAndroidInjector
18-
import info.nightscout.core.workflow.CalculationWorkflow
1919

2020
@Suppress("unused")
2121
@Module(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import app.aaps.activities.HistoryBrowseActivity
1111
import app.aaps.activities.MyPreferenceFragment
1212
import app.aaps.activities.PreferencesActivity
1313
import app.aaps.configuration.activities.SingleFragmentActivity
14+
import app.aaps.core.main.events.EventNewNotification
1415
import app.aaps.interfaces.notifications.Notification
1516
import app.aaps.interfaces.nsclient.NSAlarm
1617
import app.aaps.interfaces.rx.bus.RxBus
1718
import app.aaps.interfaces.ui.UiInteraction
1819
import dagger.android.HasAndroidInjector
1920
import info.nightscout.androidaps.R
20-
import info.nightscout.core.events.EventNewNotification
2121
import info.nightscout.core.ui.toast.ToastUtils
2222
import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
2323
import info.nightscout.ui.activities.BolusProgressHelperActivity

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import androidx.work.WorkQuery
1010
import androidx.work.WorkerParameters
1111
import androidx.work.workDataOf
1212
import app.aaps.configuration.maintenance.MaintenancePlugin
13+
import app.aaps.core.main.profile.ProfileSealed
14+
import app.aaps.core.main.utils.worker.LoggingWorker
1315
import app.aaps.interfaces.alerts.LocalAlertUtils
1416
import app.aaps.interfaces.aps.Loop
1517
import app.aaps.interfaces.configuration.Config
@@ -27,8 +29,6 @@ import app.aaps.interfaces.utils.DateUtil
2729
import app.aaps.interfaces.utils.T
2830
import com.google.common.util.concurrent.ListenableFuture
2931
import info.nightscout.androidaps.R
30-
import info.nightscout.core.profile.ProfileSealed
31-
import info.nightscout.core.utils.worker.LoggingWorker
3232
import info.nightscout.database.impl.AppRepository
3333
import kotlinx.coroutines.Dispatchers
3434
import java.util.concurrent.TimeUnit

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ import androidx.work.ExistingWorkPolicy
77
import androidx.work.OneTimeWorkRequest
88
import androidx.work.WorkInfo
99
import androidx.work.WorkManager
10+
import app.aaps.core.main.graph.OverviewData
11+
import app.aaps.core.main.utils.fabric.FabricPrivacy
12+
import app.aaps.core.main.workflow.CalculationWorkflow
13+
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB
14+
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
15+
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
1016
import app.aaps.interfaces.iob.IobCobCalculator
1117
import app.aaps.interfaces.logging.AAPSLogger
1218
import app.aaps.interfaces.logging.LTag
@@ -22,14 +28,8 @@ import app.aaps.interfaces.rx.events.EventPreferenceChange
2228
import app.aaps.interfaces.rx.events.EventTherapyEventChange
2329
import app.aaps.interfaces.utils.DateUtil
2430
import dagger.android.HasAndroidInjector
25-
import info.nightscout.core.graph.OverviewData
26-
import info.nightscout.core.utils.fabric.FabricPrivacy
2731
import info.nightscout.core.utils.receivers.DataWorkerStorage
2832
import info.nightscout.core.utils.worker.then
29-
import info.nightscout.core.workflow.CalculationWorkflow
30-
import info.nightscout.core.workflow.CalculationWorkflow.Companion.JOB
31-
import info.nightscout.core.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
32-
import info.nightscout.core.workflow.CalculationWorkflow.Companion.PASS
3333
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
3434
import info.nightscout.workflow.DummyWorker
3535
import info.nightscout.workflow.InvokeLoopWorker

‎core/main/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ dependencies {
3838
}
3939

4040
android {
41-
namespace 'info.nightscout.core.main'
41+
namespace 'app.aaps.core.main'
4242
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.constraints
1+
package app.aaps.core.main.constraints
22

33
import app.aaps.interfaces.constraints.Constraint
44
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package info.nightscout.core.di
1+
package app.aaps.core.main.di
22

3+
import app.aaps.core.main.wizard.BolusWizard
4+
import app.aaps.core.main.wizard.QuickWizardEntry
35
import app.aaps.interfaces.pump.PumpEnactResult
46
import dagger.Module
57
import dagger.android.ContributesAndroidInjector
6-
import info.nightscout.core.wizard.BolusWizard
7-
import info.nightscout.core.wizard.QuickWizardEntry
88

99
@Module
1010
@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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.di
1+
package app.aaps.core.main.di
22

33
import android.content.Context
44
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package info.nightscout.core.di
1+
package app.aaps.core.main.di
22

3+
import app.aaps.core.main.utils.CryptoUtil
34
import dagger.Module
45
import dagger.android.ContributesAndroidInjector
5-
import info.nightscout.core.utils.CryptoUtil
66

77
@Module
88
@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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package info.nightscout.core.events
1+
package app.aaps.core.main.events
22

3+
import app.aaps.core.main.workflow.CalculationWorkflow
34
import app.aaps.interfaces.rx.events.Event
4-
import info.nightscout.core.workflow.CalculationWorkflow
55

66
class EventIobCalculationProgress(val pass: CalculationWorkflow.ProgressData, private val progressPct: Int, val cause: Event?) : Event() {
77

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.events
1+
package app.aaps.core.main.events
22

33
import app.aaps.interfaces.notifications.Notification
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

33
import app.aaps.interfaces.utils.DateUtil
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

33
import app.aaps.interfaces.insulin.Insulin
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

33
import app.aaps.interfaces.aps.AutosensResult
44
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

3+
import app.aaps.core.main.R
34
import app.aaps.interfaces.configuration.Constants
45
import app.aaps.interfaces.db.GlucoseUnit
56
import app.aaps.interfaces.iob.InMemoryGlucoseValue
67
import app.aaps.interfaces.utils.DateUtil
7-
import info.nightscout.core.main.R
88
import info.nightscout.database.entities.GlucoseValue
99
import org.json.JSONObject
1010

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

3+
import app.aaps.core.main.profile.ProfileSealed
34
import app.aaps.interfaces.configuration.Constants
45
import app.aaps.interfaces.db.GlucoseUnit
56
import app.aaps.interfaces.profile.PureProfile
67
import app.aaps.interfaces.utils.DateUtil
78
import app.aaps.interfaces.utils.DecimalFormatter
89
import app.aaps.interfaces.utils.T
9-
import info.nightscout.core.profile.ProfileSealed
1010
import info.nightscout.core.utils.JsonHelper
1111
import info.nightscout.database.entities.ProfileSwitch
1212
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

33
import app.aaps.interfaces.aps.AutosensResult
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

33
import app.aaps.interfaces.configuration.Constants
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.extensions
1+
package app.aaps.core.main.extensions
22

33
import app.aaps.interfaces.db.GlucoseUnit
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.graph
1+
package app.aaps.core.main.graph
22

33
import android.content.Context
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.graph
1+
package app.aaps.core.main.graph
22

33
import android.content.Context
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.graph
1+
package app.aaps.core.main.graph
22

33
import android.content.Context
44
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.graph
1+
package app.aaps.core.main.graph
22

33
import android.content.Context
44
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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
package info.nightscout.core.graph
1+
package app.aaps.core.main.graph
22

33
import android.content.Context
44
import androidx.annotation.AttrRes
55
import androidx.annotation.ColorInt
66
import androidx.annotation.DrawableRes
7+
import app.aaps.core.main.graph.data.DataPointWithLabelInterface
8+
import app.aaps.core.main.graph.data.DeviationDataPoint
9+
import app.aaps.core.main.graph.data.FixedLineGraphSeries
10+
import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
11+
import app.aaps.core.main.graph.data.Scale
12+
import app.aaps.core.main.graph.data.ScaledDataPoint
713
import app.aaps.interfaces.aps.AutosensData
814
import app.aaps.interfaces.aps.AutosensDataStore
915
import app.aaps.interfaces.iob.CobInfo
@@ -13,12 +19,6 @@ import app.aaps.interfaces.iob.IobTotal
1319
import com.jjoe64.graphview.series.BarGraphSeries
1420
import com.jjoe64.graphview.series.DataPoint
1521
import com.jjoe64.graphview.series.LineGraphSeries
16-
import info.nightscout.core.graph.data.DataPointWithLabelInterface
17-
import info.nightscout.core.graph.data.DeviationDataPoint
18-
import info.nightscout.core.graph.data.FixedLineGraphSeries
19-
import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
20-
import info.nightscout.core.graph.data.Scale
21-
import info.nightscout.core.graph.data.ScaledDataPoint
2222
import info.nightscout.database.entities.GlucoseValue
2323
import info.nightscout.database.entities.TemporaryTarget
2424

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package info.nightscout.core.graph
1+
package app.aaps.core.main.graph
22

33
import android.content.Context
44
import android.util.AttributeSet
5+
import app.aaps.core.main.graph.data.AreaGraphSeries
6+
import app.aaps.core.main.graph.data.DoubleDataPoint
57
import app.aaps.interfaces.configuration.Constants
68
import app.aaps.interfaces.db.GlucoseUnit
79
import app.aaps.interfaces.profile.Profile
810
import app.aaps.interfaces.utils.Round
911
import com.jjoe64.graphview.DefaultLabelFormatter
1012
import com.jjoe64.graphview.GraphView
11-
import info.nightscout.core.graph.data.AreaGraphSeries
12-
import info.nightscout.core.graph.data.DoubleDataPoint
1313
import java.text.NumberFormat
1414
import kotlin.math.max
1515
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* with the "Linking Exception" along with this program; if not,
1818
* write to the author Jonas Gehring <g.jjoe64></g.jjoe64>@gmail.com>.
1919
*/
20-
package info.nightscout.core.graph.data
20+
package app.aaps.core.main.graph.data
2121

2222
import android.graphics.Canvas
2323
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.graph.data
1+
package app.aaps.core.main.graph.data
22

33
import android.content.Context
44
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package info.nightscout.core.graph.data
1+
package app.aaps.core.main.graph.data
22

33
import android.content.Context
44
import android.graphics.Paint
5+
import app.aaps.core.main.R
56
import app.aaps.interfaces.resources.ResourceHelper
6-
import info.nightscout.core.main.R
77
import info.nightscout.database.entities.Carbs
88

99
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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.nightscout.core.graph.data
1+
package app.aaps.core.main.graph.data
22

33
import android.content.Context
44
import android.graphics.Paint

0 commit comments

Comments
 (0)