caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:core:interfaces cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-24 14:55:26 +02:00
parent bdfa4a98fc
commit 31926f8835
1449 changed files with 9249 additions and 8682 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,25 @@ 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.interfaces.androidPermissions.AndroidPermission
import app.aaps.interfaces.aps.Loop
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.constraints.ConstraintsChecker
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.logging.UserEntryLogger
import app.aaps.interfaces.maintenance.PrefFileListProvider
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.ProfileFunction
import app.aaps.interfaces.protection.ProtectionCheck
import app.aaps.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.events.EventAppExit
import app.aaps.interfaces.rx.events.EventAppInitialized
import app.aaps.interfaces.rx.events.EventPreferenceChange
import app.aaps.interfaces.rx.events.EventRebuildTabs
import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.interfaces.ui.IconsProvider
import app.aaps.interfaces.versionChecker.VersionCheckerUtils
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.tabs.TabLayoutMediator
import com.google.firebase.crashlytics.FirebaseCrashlytics
@ -51,26 +70,7 @@ 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
import info.nightscout.interfaces.AndroidPermission
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.aps.Loop
import info.nightscout.interfaces.constraints.ConstraintsChecker
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.maintenance.PrefFileListProvider
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.protection.ProtectionCheck
import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
import info.nightscout.interfaces.ui.IconsProvider
import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.events.EventAppExit
import info.nightscout.rx.events.EventAppInitialized
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.events.EventRebuildTabs
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.ui.activities.ProfileHelperActivity
import info.nightscout.ui.activities.StatsActivity
import info.nightscout.ui.activities.TreatmentsActivity

28
app/src/main/kotlin/app/aaps/MainApp.kt
View file

@ -14,6 +14,20 @@ import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.PeriodicWorkRequest
import androidx.work.WorkManager
import app.aaps.di.DaggerAppComponent
import app.aaps.interfaces.alerts.LocalAlertUtils
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.configuration.ConfigBuilder
import app.aaps.interfaces.extensions.runOnUiThread
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.logging.UserEntryLogger
import app.aaps.interfaces.notifications.Notification
import app.aaps.interfaces.plugin.PluginBase
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.ui.UiInteraction
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.receivers.BTReceiver
import app.aaps.receivers.ChargingStateReceiver
import app.aaps.receivers.KeepAliveWorker
@ -32,23 +46,9 @@ import info.nightscout.implementation.db.CompatDBHelper
import info.nightscout.implementation.lifecycle.ProcessLifecycleListener
import info.nightscout.implementation.plugin.PluginStore
import info.nightscout.implementation.receivers.NetworkChangeReceiver
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.LocalAlertUtils
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
import info.nightscout.plugins.aps.utils.StaticInjector
import info.nightscout.plugins.general.overview.notifications.NotificationStore
import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.extensions.runOnUiThread
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.shared.utils.DateUtil
import info.nightscout.ui.activityMonitor.ActivityMonitor
import info.nightscout.ui.widget.Widget
import io.reactivex.rxjava3.disposables.CompositeDisposable

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

@ -8,6 +8,24 @@ import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.extensions.toVisibility
import app.aaps.interfaces.extensions.toVisibilityKeepSpace
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.overview.OverviewMenus
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.DefaultValueHelper
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished
import app.aaps.interfaces.rx.events.EventCustomCalculationFinished
import app.aaps.interfaces.rx.events.EventRefreshOverview
import app.aaps.interfaces.rx.events.EventScale
import app.aaps.interfaces.rx.events.EventUpdateOverviewGraph
import app.aaps.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.T
import com.google.android.material.datepicker.MaterialDatePicker
import com.jjoe64.graphview.GraphView
import dagger.android.HasAndroidInjector
@ -16,25 +34,7 @@ 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.interfaces.Config
import info.nightscout.interfaces.overview.OverviewMenus
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.profile.DefaultValueHelper
import info.nightscout.plugins.general.overview.graphData.GraphData
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventAutosensCalculationFinished
import info.nightscout.rx.events.EventCustomCalculationFinished
import info.nightscout.rx.events.EventRefreshOverview
import info.nightscout.rx.events.EventScale
import info.nightscout.rx.events.EventUpdateOverviewGraph
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.shared.extensions.toVisibilityKeepSpace
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import java.util.Calendar

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

@ -1,22 +1,22 @@
package app.aaps.activities
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.DefaultValueHelper
import app.aaps.interfaces.profile.ProfileFunction
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.bus.RxBus
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.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.profile.DefaultValueHelper
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.utils.DecimalFormatter
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.shared.utils.DateUtil
import javax.inject.Inject
import javax.inject.Singleton

30
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -16,6 +16,21 @@ import androidx.preference.PreferenceManager
import androidx.preference.PreferenceScreen
import androidx.preference.size
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.nsclient.NSSettingsStatus
import app.aaps.interfaces.plugin.PluginBase
import app.aaps.interfaces.profile.ProfileUtil
import app.aaps.interfaces.protection.PasswordCheck
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.NONE
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventPreferenceChange
import app.aaps.interfaces.rx.events.EventRebuildTabs
import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.SafeParse
import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@ -28,14 +43,6 @@ import info.nightscout.automation.AutomationPlugin
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.implementation.plugin.PluginStore
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.nsclient.NSSettingsStatus
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.protection.PasswordCheck
import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC
import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD
import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN
import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.NONE
import info.nightscout.plugins.aps.loop.LoopPlugin
import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
@ -54,16 +61,9 @@ import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.pump.medtrum.MedtrumPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.events.EventRebuildTabs
import info.nightscout.sensitivity.SensitivityAAPSPlugin
import info.nightscout.sensitivity.SensitivityOref1Plugin
import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
import info.nightscout.shared.SafeParse
import info.nightscout.shared.interfaces.ProfileUtil
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.source.AidexPlugin
import info.nightscout.source.DexcomPlugin
import info.nightscout.source.EversensePlugin

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

@ -5,6 +5,10 @@ import app.aaps.MainApp
import app.aaps.implementations.ConfigImpl
import app.aaps.implementations.InstantiatorImpl
import app.aaps.implementations.UiInteractionImpl
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.objects.Instantiator
import app.aaps.interfaces.plugin.PluginBase
import app.aaps.interfaces.ui.UiInteraction
import app.aaps.workflow.CalculationWorkflowImpl
import dagger.Binds
import dagger.Lazy
@ -12,10 +16,6 @@ import dagger.Module
import dagger.Provides
import dagger.android.HasAndroidInjector
import info.nightscout.core.workflow.CalculationWorkflow
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.profile.Instantiator
import info.nightscout.interfaces.ui.UiInteraction
@Suppress("unused")
@Module(

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

@ -2,6 +2,7 @@ package app.aaps.di
import app.aaps.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.interfaces.plugin.PluginBase
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntKey
@ -19,7 +20,6 @@ import info.nightscout.insulin.InsulinLyumjevPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.insulin.InsulinOrefRapidActingPlugin
import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.plugins.aps.loop.LoopPlugin
import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin

4
app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt
View file

@ -1,10 +1,10 @@
package app.aaps.implementations
import android.os.Build
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.maintenance.PrefFileListProvider
import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.maintenance.PrefFileListProvider
import java.io.File
import javax.inject.Inject
import javax.inject.Singleton

10
app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt
View file

@ -1,15 +1,15 @@
package app.aaps.implementations
import app.aaps.interfaces.aps.APSResult
import app.aaps.interfaces.aps.AutosensData
import app.aaps.interfaces.objects.Instantiator
import app.aaps.interfaces.profile.ProfileStore
import app.aaps.interfaces.utils.DateUtil
import dagger.Reusable
import dagger.android.HasAndroidInjector
import info.nightscout.implementation.profile.ProfileStoreObject
import info.nightscout.interfaces.aps.APSResult
import info.nightscout.interfaces.aps.AutosensData
import info.nightscout.interfaces.profile.Instantiator
import info.nightscout.interfaces.profile.ProfileStore
import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
import info.nightscout.shared.utils.DateUtil
import org.json.JSONObject
import javax.inject.Inject

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

@ -11,15 +11,15 @@ import app.aaps.activities.HistoryBrowseActivity
import app.aaps.activities.MyPreferenceFragment
import app.aaps.activities.PreferencesActivity
import app.aaps.configuration.activities.SingleFragmentActivity
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.interfaces.notifications.Notification
import info.nightscout.interfaces.nsclient.NSAlarm
import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
import info.nightscout.rx.bus.RxBus
import info.nightscout.ui.activities.BolusProgressHelperActivity
import info.nightscout.ui.activities.ErrorHelperActivity
import info.nightscout.ui.activities.QuickWizardListActivity

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

@ -3,10 +3,10 @@ package app.aaps.receivers
import android.bluetooth.BluetoothDevice
import android.content.Context
import android.content.Intent
import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventBTChange
import dagger.android.DaggerBroadcastReceiver
import info.nightscout.core.utils.extensions.safeGetParcelableExtra
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventBTChange
import javax.inject.Inject
class BTReceiver : DaggerBroadcastReceiver() {

2
core/interfaces/src/main/java/info/nightscout/rx/logging/BundleLogger.kt → app/src/main/kotlin/app/aaps/receivers/BundleLogger.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.rx.logging
package app.aaps.receivers
import android.os.Bundle

10
app/src/main/kotlin/app/aaps/receivers/ChargingStateReceiver.kt
View file

@ -4,12 +4,12 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.BatteryManager
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.receivers.ReceiverStatusStore
import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventChargingState
import dagger.android.DaggerBroadcastReceiver
import info.nightscout.interfaces.receivers.ReceiverStatusStore
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventChargingState
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import javax.inject.Inject
class ChargingStateReceiver : DaggerBroadcastReceiver() {

7
app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt
View file

@ -5,16 +5,15 @@ import android.content.Intent
import android.provider.Telephony
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.receivers.Intents
import dagger.android.DaggerBroadcastReceiver
import info.nightscout.core.utils.extensions.copyDouble
import info.nightscout.core.utils.extensions.copyLong
import info.nightscout.core.utils.extensions.copyString
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.interfaces.receivers.Intents
import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.BundleLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.source.AidexPlugin
import info.nightscout.source.DexcomPlugin
import info.nightscout.source.EversensePlugin

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

@ -10,26 +10,26 @@ import androidx.work.WorkQuery
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.interfaces.alerts.LocalAlertUtils
import app.aaps.interfaces.aps.Loop
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.ProfileFunction
import app.aaps.interfaces.queue.Command
import app.aaps.interfaces.queue.CommandQueue
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventProfileSwitchChanged
import app.aaps.interfaces.sharedPreferences.SP
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 info.nightscout.interfaces.Config
import info.nightscout.interfaces.LocalAlertUtils
import info.nightscout.interfaces.aps.Loop
import info.nightscout.interfaces.iob.IobCobCalculator
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.queue.Command
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventProfileSwitchChanged
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T
import kotlinx.coroutines.Dispatchers
import java.util.concurrent.TimeUnit
import javax.inject.Inject

11
app/src/main/kotlin/app/aaps/receivers/TimeDateOrTZChangeReceiver.kt
View file

@ -2,14 +2,13 @@ package app.aaps.receivers
import android.content.Context
import android.content.Intent
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.pump.Pump
import app.aaps.interfaces.utils.TimeChangeType
import com.google.gson.Gson
import dagger.android.DaggerBroadcastReceiver
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.pump.Pump
import info.nightscout.interfaces.utils.TimeChangeType
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.BundleLogger
import info.nightscout.rx.logging.LTag
import java.util.Date
import java.util.TimeZone
import javax.inject.Inject

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

@ -7,6 +7,20 @@ import androidx.work.ExistingWorkPolicy
import androidx.work.OneTimeWorkRequest
import androidx.work.WorkInfo
import androidx.work.WorkManager
import app.aaps.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag
import app.aaps.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.Event
import app.aaps.interfaces.rx.events.EventAppInitialized
import app.aaps.interfaces.rx.events.EventNewHistoryData
import app.aaps.interfaces.rx.events.EventOfflineChange
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
@ -16,21 +30,7 @@ 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.interfaces.iob.IobCobCalculator
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.Event
import info.nightscout.rx.events.EventAppInitialized
import info.nightscout.rx.events.EventNewHistoryData
import info.nightscout.rx.events.EventOfflineChange
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.events.EventTherapyEventChange
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil
import info.nightscout.workflow.DummyWorker
import info.nightscout.workflow.InvokeLoopWorker
import info.nightscout.workflow.LoadBgDataWorker

12
app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt
View file

@ -1,15 +1,15 @@
package app.aaps.configuration.maintenance
import android.content.Context
import app.aaps.interfaces.configuration.Config
import app.aaps.interfaces.logging.LoggerUtils
import app.aaps.interfaces.maintenance.PrefFileListProvider
import app.aaps.interfaces.nsclient.NSSettingsStatus
import app.aaps.interfaces.resources.ResourceHelper
import app.aaps.interfaces.sharedPreferences.SP
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.logging.LoggerUtils
import info.nightscout.interfaces.maintenance.PrefFileListProvider
import info.nightscout.interfaces.nsclient.NSSettingsStatus
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
core/interfaces/build.gradle
View file

@ -15,7 +15,7 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.interfaces'
namespace 'app.aaps.interfaces'
defaultConfig {
minSdkVersion 25 // for wear
}

0
core/interfaces/src/debug/java/app/aaps/annotations/OpenForTesting.kt → core/interfaces/src/debug/kotlin/app/aaps/annotations/OpenForTesting.kt
View file

3
core/interfaces/src/main/java/info/nightscout/interfaces/actions/Actions.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.interfaces.actions
interface Actions

5
core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Safety.kt
View file

@ -1,5 +0,0 @@
package info.nightscout.interfaces.constraints
import info.nightscout.interfaces.ConfigExportImport
interface Safety : ConfigExportImport

8
core/interfaces/src/main/java/info/nightscout/interfaces/profiling/Profiler.kt
View file

@ -1,8 +0,0 @@
package info.nightscout.interfaces.profiling
import info.nightscout.rx.logging.LTag
interface Profiler {
fun log(lTag: LTag, function: String, start: Long)
}

3
core/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodDash.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.interfaces.pump
interface OmnipodDash

3
core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseSettings.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.interfaces.pump.defs
class DoseSettings constructor(val step: Double, val durationStep: Int, val maxDuration: Int, val minDose: Double, val maxDose: Double = Double.MAX_VALUE)

3
core/interfaces/src/main/java/info/nightscout/interfaces/sync/Tidepool.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.interfaces.sync
interface Tidepool : Sync

156
core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/UserEntryMapper.kt
View file

@ -1,156 +0,0 @@
package info.nightscout.interfaces.userEntry
import info.nightscout.database.entities.UserEntry
class UserEntryMapper {
enum class Action (val db: UserEntry.Action) {
BOLUS (UserEntry.Action.BOLUS),
SMB (UserEntry.Action.SMB),
BOLUS_ADVISOR (UserEntry.Action.BOLUS_ADVISOR),
EXTENDED_BOLUS (UserEntry.Action.EXTENDED_BOLUS),
SUPERBOLUS_TBR (UserEntry.Action.SUPERBOLUS_TBR),
CARBS (UserEntry.Action.CARBS),
EXTENDED_CARBS (UserEntry.Action.EXTENDED_CARBS),
TEMP_BASAL (UserEntry.Action.TEMP_BASAL),
TT (UserEntry.Action.TT),
NEW_PROFILE (UserEntry.Action.NEW_PROFILE),
CLONE_PROFILE (UserEntry.Action.CLONE_PROFILE),
STORE_PROFILE (UserEntry.Action.STORE_PROFILE),
PROFILE_SWITCH (UserEntry.Action.PROFILE_SWITCH),
PROFILE_SWITCH_CLONED (UserEntry.Action.PROFILE_SWITCH_CLONED),
CLOSED_LOOP_MODE (UserEntry.Action.CLOSED_LOOP_MODE),
LGS_LOOP_MODE (UserEntry.Action.LGS_LOOP_MODE),
OPEN_LOOP_MODE (UserEntry.Action.OPEN_LOOP_MODE),
LOOP_DISABLED (UserEntry.Action.LOOP_DISABLED),
LOOP_ENABLED (UserEntry.Action.LOOP_ENABLED),
RECONNECT (UserEntry.Action.RECONNECT),
DISCONNECT (UserEntry.Action.DISCONNECT),
RESUME (UserEntry.Action.RESUME),
SUSPEND (UserEntry.Action.SUSPEND),
HW_PUMP_ALLOWED (UserEntry.Action.HW_PUMP_ALLOWED),
CLEAR_PAIRING_KEYS (UserEntry.Action.CLEAR_PAIRING_KEYS),
ACCEPTS_TEMP_BASAL (UserEntry.Action.ACCEPTS_TEMP_BASAL),
CANCEL_TEMP_BASAL (UserEntry.Action.CANCEL_TEMP_BASAL),
CANCEL_BOLUS (UserEntry.Action.CANCEL_BOLUS),
CANCEL_EXTENDED_BOLUS (UserEntry.Action.CANCEL_EXTENDED_BOLUS),
CANCEL_TT (UserEntry.Action.CANCEL_TT),
CAREPORTAL (UserEntry.Action.CAREPORTAL),
SITE_CHANGE (UserEntry.Action.SITE_CHANGE),
RESERVOIR_CHANGE (UserEntry.Action.RESERVOIR_CHANGE),
CALIBRATION (UserEntry.Action.CALIBRATION),
PRIME_BOLUS (UserEntry.Action.PRIME_BOLUS),
TREATMENT (UserEntry.Action.TREATMENT),
CAREPORTAL_NS_REFRESH (UserEntry.Action.CAREPORTAL_NS_REFRESH),
PROFILE_SWITCH_NS_REFRESH (UserEntry.Action.PROFILE_SWITCH_NS_REFRESH),
TREATMENTS_NS_REFRESH (UserEntry.Action.TREATMENTS_NS_REFRESH),
TT_NS_REFRESH (UserEntry.Action.TT_NS_REFRESH),
AUTOMATION_REMOVED (UserEntry.Action.AUTOMATION_REMOVED),
BG_REMOVED (UserEntry.Action.BG_REMOVED),
CAREPORTAL_REMOVED (UserEntry.Action.CAREPORTAL_REMOVED),
EXTENDED_BOLUS_REMOVED (UserEntry.Action.EXTENDED_BOLUS_REMOVED),
FOOD_REMOVED (UserEntry.Action.FOOD_REMOVED),
PROFILE_REMOVED (UserEntry.Action.PROFILE_REMOVED),
PROFILE_SWITCH_REMOVED (UserEntry.Action.PROFILE_SWITCH_REMOVED),
RESTART_EVENTS_REMOVED (UserEntry.Action.RESTART_EVENTS_REMOVED),
TREATMENT_REMOVED (UserEntry.Action.TREATMENT_REMOVED),
BOLUS_REMOVED (UserEntry.Action.BOLUS_REMOVED),
CARBS_REMOVED (UserEntry.Action.CARBS_REMOVED),
TEMP_BASAL_REMOVED (UserEntry.Action.TEMP_BASAL_REMOVED),
TT_REMOVED (UserEntry.Action.TT_REMOVED),
NS_PAUSED (UserEntry.Action.NS_PAUSED),
NS_RESUME (UserEntry.Action.NS_RESUME),
NS_QUEUE_CLEARED (UserEntry.Action.NS_QUEUE_CLEARED),
NS_SETTINGS_COPIED (UserEntry.Action.NS_SETTINGS_COPIED),
ERROR_DIALOG_OK (UserEntry.Action.ERROR_DIALOG_OK),
ERROR_DIALOG_MUTE (UserEntry.Action.ERROR_DIALOG_MUTE),
ERROR_DIALOG_MUTE_5MIN (UserEntry.Action.ERROR_DIALOG_MUTE_5MIN),
OBJECTIVE_STARTED (UserEntry.Action.OBJECTIVE_STARTED),
OBJECTIVE_UNSTARTED (UserEntry.Action.OBJECTIVE_UNSTARTED),
OBJECTIVES_SKIPPED (UserEntry.Action.OBJECTIVES_SKIPPED),
STAT_RESET (UserEntry.Action.STAT_RESET),
DELETE_LOGS (UserEntry.Action.DELETE_LOGS),
DELETE_FUTURE_TREATMENTS (UserEntry.Action.DELETE_FUTURE_TREATMENTS),
EXPORT_SETTINGS (UserEntry.Action.EXPORT_SETTINGS),
IMPORT_SETTINGS (UserEntry.Action.IMPORT_SETTINGS),
RESET_DATABASES (UserEntry.Action.RESET_DATABASES),
EXPORT_DATABASES (UserEntry.Action.EXPORT_DATABASES),
IMPORT_DATABASES (UserEntry.Action.IMPORT_DATABASES),
OTP_EXPORT (UserEntry.Action.OTP_EXPORT),
OTP_RESET (UserEntry.Action.OTP_RESET),
STOP_SMS (UserEntry.Action.STOP_SMS),
FOOD (UserEntry.Action.FOOD),
EXPORT_CSV (UserEntry.Action.EXPORT_CSV),
START_AAPS (UserEntry.Action.START_AAPS),
EXIT_AAPS (UserEntry.Action.EXIT_AAPS),
UNKNOWN (UserEntry.Action.UNKNOWN)
;
}
enum class Sources (val db: UserEntry.Sources) {
TreatmentDialog (UserEntry.Sources.TreatmentDialog),
InsulinDialog (UserEntry.Sources.InsulinDialog),
CarbDialog (UserEntry.Sources.CarbDialog),
WizardDialog (UserEntry.Sources.WizardDialog),
QuickWizard (UserEntry.Sources.QuickWizard),
ExtendedBolusDialog (UserEntry.Sources.ExtendedBolusDialog),
TTDialog (UserEntry.Sources.TTDialog),
ProfileSwitchDialog (UserEntry.Sources.ProfileSwitchDialog),
LoopDialog (UserEntry.Sources.LoopDialog),
TempBasalDialog (UserEntry.Sources.TempBasalDialog),
CalibrationDialog (UserEntry.Sources.CalibrationDialog),
FillDialog (UserEntry.Sources.FillDialog),
BgCheck (UserEntry.Sources.BgCheck),
SensorInsert (UserEntry.Sources.SensorInsert),
BatteryChange (UserEntry.Sources.BatteryChange),
Note (UserEntry.Sources.Note),
Exercise (UserEntry.Sources.Exercise),
Question (UserEntry.Sources.Question),
Announcement (UserEntry.Sources.Announcement),
Actions (UserEntry.Sources.Actions),
Automation (UserEntry.Sources.Automation),
Autotune (UserEntry.Sources.Autotune),
BG (UserEntry.Sources.BG),
Aidex (UserEntry.Sources.Aidex),
Dexcom (UserEntry.Sources.Dexcom),
Eversense (UserEntry.Sources.Eversense),
Glimp (UserEntry.Sources.Glimp),
MM640g (UserEntry.Sources.MM640g),
NSClientSource (UserEntry.Sources.BG),
PocTech (UserEntry.Sources.PocTech),
Tomato (UserEntry.Sources.Tomato),
Xdrip (UserEntry.Sources.Xdrip),
LocalProfile (UserEntry.Sources.LocalProfile),
Loop (UserEntry.Sources.Loop),
Maintenance (UserEntry.Sources.Maintenance),
NSClient (UserEntry.Sources.NSClient),
NSProfile (UserEntry.Sources.NSProfile),
Objectives (UserEntry.Sources.Objectives),
Pump (UserEntry.Sources.Pump),
Dana (UserEntry.Sources.Dana),
DanaR (UserEntry.Sources.DanaR),
DanaRC (UserEntry.Sources.DanaRC),
DanaRv2 (UserEntry.Sources.DanaRv2),
DanaRS (UserEntry.Sources.DanaRS),
DanaI (UserEntry.Sources.DanaI),
DiaconnG8 (UserEntry.Sources.DiaconnG8),
Insight (UserEntry.Sources.Insight),
Combo (UserEntry.Sources.Combo),
Medtronic (UserEntry.Sources.Medtronic),
Omnipod (UserEntry.Sources.Omnipod),
OmnipodEros (UserEntry.Sources.OmnipodEros),
OmnipodDash (UserEntry.Sources.OmnipodDash),
EOPatch2 (UserEntry.Sources.EOPatch2),
MDI (UserEntry.Sources.MDI),
VirtualPump (UserEntry.Sources.VirtualPump),
SMS (UserEntry.Sources.SMS),
Treatments (UserEntry.Sources.Treatments),
Wear (UserEntry.Sources.Wear),
Food (UserEntry.Sources.Food),
ConfigBuilder (UserEntry.Sources.ConfigBuilder),
Overview (UserEntry.Sources.Overview),
Stats (UserEntry.Sources.Stats),
Aaps (UserEntry.Sources.Aaps),
Unknown(UserEntry.Sources.Unknown)
;
}
}

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventAppExit.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventAppExit : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventAppInitialized : Event()

5
core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
View file

@ -1,5 +0,0 @@
package info.nightscout.rx.events
import info.nightscout.rx.weardata.EventData
class EventMobileToWear(val payload: EventData) : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventNSClientRestart : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventOfflineChange : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventQueueChanged : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventRebuildTabs constructor(var recreate: Boolean = false) : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventRefreshButtonState (val newState : Boolean): Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventRefreshOverview(var from: String, val now : Boolean = false) : Event()

3
core/interfaces/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
View file

@ -1,3 +0,0 @@
package info.nightscout.rx.events
class EventThemeSwitch : Event()

5
core/interfaces/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt
View file

@ -1,5 +0,0 @@
package info.nightscout.rx.events
import info.nightscout.rx.weardata.EventData
class EventWearCwfExported(val payload: EventData.ActionSetCustomWatchface): Event()

5
core/interfaces/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt
View file

@ -1,5 +0,0 @@
package info.nightscout.rx.events
import info.nightscout.rx.weardata.EventData
class EventWearDataToMobile(val payload: EventData) : Event()

5
core/interfaces/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
View file

@ -1,5 +0,0 @@
package info.nightscout.rx.events
import info.nightscout.rx.weardata.EventData
class EventWearToMobile(val payload: EventData) : Event()

3
core/interfaces/src/main/kotlin/app/aaps/interfaces/actions/Actions.kt Normal file
View file

@ -0,0 +1,3 @@
package app.aaps.interfaces.actions
interface Actions

2
core/interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/alerts/LocalAlertUtils.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces
package app.aaps.interfaces.alerts
interface LocalAlertUtils {

4
core/interfaces/src/main/java/info/nightscout/interfaces/AndroidPermission.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/androidPermissions/AndroidPermission.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.interfaces
package app.aaps.interfaces.androidPermissions
import android.content.Context
import androidx.fragment.app.FragmentActivity
import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.interfaces.smsCommunicator.SmsCommunicator
interface AndroidPermission {

2
core/interfaces/src/main/java/info/nightscout/interfaces/aps/APS.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APS.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
interface APS {

7
core/interfaces/src/main/java/info/nightscout/interfaces/aps/APSResult.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APSResult.kt
View file

@ -1,13 +1,14 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
import android.text.Spanned
import app.aaps.interfaces.constraints.Constraint
import app.aaps.interfaces.iob.IobTotal
import dagger.android.HasAndroidInjector
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.interfaces.constraints.Constraint
import info.nightscout.interfaces.iob.IobTotal
import org.json.JSONObject
interface APSResult {
var date: Long
var json: JSONObject?
var reason: String

2
core/interfaces/src/main/java/info/nightscout/interfaces/ApsMode.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/ApsMode.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces
package app.aaps.interfaces.aps
enum class ApsMode {
OPEN,

2
core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensData.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensData.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
interface AutosensData {

9
core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensDataStore.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensDataStore.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
import androidx.collection.LongSparseArray
import app.aaps.interfaces.iob.InMemoryGlucoseValue
import app.aaps.interfaces.logging.AAPSLogger
import app.aaps.interfaces.utils.DateUtil
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.interfaces.iob.InMemoryGlucoseValue
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.utils.DateUtil
interface AutosensDataStore {
@ -21,6 +21,7 @@ interface AutosensDataStore {
* @return InMemoryGlucoseValue or null
*/
fun lastBg(): InMemoryGlucoseValue?
/**
* Provide last bucketed InMemoryGlucoseValue or null if none exists within the last 9 minutes
*

2
core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensResult.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
data class AutosensResult(

2
core/interfaces/src/main/java/info/nightscout/interfaces/aps/BasalData.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/BasalData.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
class BasalData {

10
core/interfaces/src/main/java/info/nightscout/interfaces/aps/DetermineBasalAdapter.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/DetermineBasalAdapter.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
import info.nightscout.interfaces.iob.GlucoseStatus
import info.nightscout.interfaces.iob.IobTotal
import info.nightscout.interfaces.iob.MealData
import info.nightscout.interfaces.profile.Profile
import app.aaps.interfaces.iob.GlucoseStatus
import app.aaps.interfaces.iob.IobTotal
import app.aaps.interfaces.iob.MealData
import app.aaps.interfaces.profile.Profile
interface DetermineBasalAdapter {

8
core/interfaces/src/main/java/info/nightscout/interfaces/aps/Loop.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Loop.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
import app.aaps.interfaces.constraints.Constraint
import app.aaps.interfaces.profile.Profile
import app.aaps.interfaces.pump.PumpEnactResult
import info.nightscout.database.entities.OfflineEvent
import info.nightscout.interfaces.constraints.Constraint
import info.nightscout.interfaces.profile.Profile
import info.nightscout.interfaces.pump.PumpEnactResult
interface Loop {

7
core/interfaces/src/main/java/info/nightscout/interfaces/aps/SMBDefaults.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/SMBDefaults.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
@Suppress("SpellCheckingInspection")
object SMBDefaults {
@ -22,13 +22,14 @@ object SMBDefaults {
// const val remainingCarbsFraction = 1.0 // fraction of carbs we'll assume will absorb over 4h if we don't yet see carb absorption
// USED IN DETERMINE_BASAL
const val low_temptarget_lowers_sensitivity = false // lower sensitivity for temptargets <= 99.
const val low_temptarget_lowers_sensitivity = false // lower sensitivity for temptargets <= 99.
const val high_temptarget_raises_sensitivity = false // raise sensitivity for temptargets >= 111. synonym for exercise_mode
const val sensitivity_raises_target = true // raise BG target when autosens detects sensitivity
const val resistance_lowers_target = false // lower BG target when autosens detects resistance
const val adv_target_adjustments = false // lower target automatically when BG and eventualBG are high
const val exercise_mode = false // when true, > 105 mg/dL high temp target adjusts sensitivityRatio for exercise_mode. This majorly changes the behavior of high temp targets from before. synonym for high_temptarget_raises_sensitivity
const val exercise_mode =
false // when true, > 105 mg/dL high temp target adjusts sensitivityRatio for exercise_mode. This majorly changes the behavior of high temp targets from before. synonym for high_temptarget_raises_sensitivity
const val half_basal_exercise_target = 160 // when temptarget is 160 mg/dL *and* exercise_mode=true, run 50% basal at this level (120 = 75%; 140 = 60%)
// create maxCOB and default it to 120 because that's the most a typical body can absorb over 4 hours.

5
core/interfaces/src/main/java/info/nightscout/interfaces/aps/Sensitivity.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Sensitivity.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
import info.nightscout.interfaces.ConfigExportImport
import app.aaps.interfaces.configuration.ConfigExportImport
interface Sensitivity : ConfigExportImport {
@ -23,6 +23,7 @@ interface Sensitivity : ConfigExportImport {
val isMinCarbsAbsorptionDynamic: Boolean
val isOref1: Boolean
companion object {
const val MIN_HOURS = 1.0

3
core/interfaces/src/main/java/info/nightscout/interfaces/aps/VariableSensitivityResult.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/VariableSensitivityResult.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.interfaces.aps
package app.aaps.interfaces.aps
interface VariableSensitivityResult {
var variableSens: Double?
}

2
core/interfaces/src/main/java/info/nightscout/interfaces/automation/Automation.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/Automation.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.automation
package app.aaps.interfaces.automation
interface Automation {

5
core/interfaces/src/main/java/info/nightscout/interfaces/automation/AutomationEvent.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/AutomationEvent.kt
View file

@ -1,8 +1,9 @@
package info.nightscout.interfaces.automation
package app.aaps.interfaces.automation
interface AutomationEvent {
var isEnabled: Boolean
var title: String
fun canRun(): Boolean
fun preconditionCanRun() : Boolean
fun preconditionCanRun(): Boolean
}

2
core/interfaces/src/main/java/info/nightscout/interfaces/autotune/Autotune.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/autotune/Autotune.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.autotune
package app.aaps.interfaces.autotune
interface Autotune {

2
core/interfaces/src/main/java/info/nightscout/interfaces/bgQualityCheck/BgQualityCheck.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/bgQualityCheck/BgQualityCheck.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.bgQualityCheck
package app.aaps.interfaces.bgQualityCheck
import androidx.annotation.DrawableRes

5
core/interfaces/src/main/java/info/nightscout/interfaces/Config.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Config.kt
View file

@ -1,7 +1,8 @@
package info.nightscout.interfaces
package app.aaps.interfaces.configuration
@Suppress("PropertyName")
interface Config {
val SUPPORTED_NS_VERSION: Int
val APS: Boolean
val NSCLIENT: Boolean // aapsclient || aapsclient2
@ -17,7 +18,7 @@ interface Config {
val VERSION: String
val APPLICATION_ID: String
val DEBUG: Boolean
val currentDeviceModelString : String
val currentDeviceModelString: String
val appName: Int
var appInitialized: Boolean

6
core/interfaces/src/main/java/info/nightscout/interfaces/ConfigBuilder.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigBuilder.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.interfaces
package app.aaps.interfaces.configuration
import android.widget.LinearLayout
import androidx.annotation.StringRes
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginType
import app.aaps.interfaces.plugin.PluginBase
import app.aaps.interfaces.plugin.PluginType
interface ConfigBuilder {

2
core/interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/ConfigExportImport.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces
package app.aaps.interfaces.configuration
import org.json.JSONObject

2
core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Constants.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces
package app.aaps.interfaces.configuration
/**
* Created by mike on 07.06.2016.

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

@ -1,4 +1,4 @@
package info.nightscout.interfaces.constraints
package app.aaps.interfaces.constraints
interface Constraint<T : Comparable<T>> {

4
core/interfaces/src/main/java/info/nightscout/interfaces/constraints/ConstraintsChecker.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/ConstraintsChecker.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.interfaces.constraints
package app.aaps.interfaces.constraints
import info.nightscout.interfaces.profile.Profile
import app.aaps.interfaces.profile.Profile
/**
* Constraints interface

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

@ -1,4 +1,4 @@
package info.nightscout.interfaces.constraints
package app.aaps.interfaces.constraints
interface Objectives {
companion object {

4
core/interfaces/src/main/java/info/nightscout/interfaces/constraints/PluginConstraints.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/PluginConstraints.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.interfaces.constraints
package app.aaps.interfaces.constraints
import info.nightscout.interfaces.profile.Profile
import app.aaps.interfaces.profile.Profile
/**
* PluginConstraints interface

5
core/interfaces/src/main/kotlin/app/aaps/interfaces/constraints/Safety.kt Normal file
View file

@ -0,0 +1,5 @@
package app.aaps.interfaces.constraints
import app.aaps.interfaces.configuration.ConfigExportImport
interface Safety : ConfigExportImport

2
core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/db/GlucoseUnit.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces
package app.aaps.interfaces.db
@Suppress("SpellCheckingInspection")
enum class GlucoseUnit(val asText: String) {

4
core/interfaces/src/main/java/info/nightscout/interfaces/db/PersistenceLayer.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/db/PersistenceLayer.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.interfaces.db
package app.aaps.interfaces.db
import app.aaps.interfaces.queue.Callback
import dagger.android.HasAndroidInjector
import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.Bolus
@ -8,7 +9,6 @@ import info.nightscout.database.entities.Carbs
import info.nightscout.database.entities.EffectiveProfileSwitch
import info.nightscout.database.entities.TemporaryTarget
import info.nightscout.database.entities.UserEntry
import info.nightscout.interfaces.queue.Callback
import io.reactivex.rxjava3.core.Single
interface PersistenceLayer {

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

@ -1,4 +1,4 @@
package info.nightscout.shared.extensions
package app.aaps.interfaces.extensions
import android.os.Handler
import android.os.Looper

8
core/interfaces/src/main/java/info/nightscout/interfaces/insulin/Insulin.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/insulin/Insulin.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.interfaces.insulin
package app.aaps.interfaces.insulin
import app.aaps.interfaces.configuration.ConfigExportImport
import app.aaps.interfaces.iob.Iob
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.embedments.InsulinConfiguration
import info.nightscout.interfaces.ConfigExportImport
import info.nightscout.interfaces.iob.Iob
interface Insulin : ConfigExportImport {
@ -32,5 +32,5 @@ interface Insulin : ConfigExportImport {
fun iobCalcForTreatment(bolus: Bolus, time: Long, dia: Double): Iob
val insulinConfiguration : InsulinConfiguration
val insulinConfiguration: InsulinConfiguration
}

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

@ -1,4 +1,4 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
/** All COB up to now, including carbs not yet processed by IobCob calculation. */
data class CobInfo(val timestamp: Long, val displayCob: Double?, val futureCarbs: Double)

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

@ -1,4 +1,4 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
data class GlucoseStatus(
val glucose: Double,

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

@ -1,6 +1,7 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
interface GlucoseStatusProvider {
val glucoseStatusData: GlucoseStatus?
fun getGlucoseStatusData(allowOldData: Boolean = false): GlucoseStatus?
}

4
core/interfaces/src/main/java/info/nightscout/interfaces/iob/InMemoryGlucoseValue.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValue.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
import info.nightscout.database.entities.GlucoseValue
@ -7,7 +7,7 @@ import info.nightscout.database.entities.GlucoseValue
* It may correspond to GlucoseValue value in db
* but because of 5 min recalculations and smoothing it may not
*/
class InMemoryGlucoseValue constructor(
class InMemoryGlucoseValue(
var timestamp: Long = 0L,
/**
* Value in mg/dl

18
core/interfaces/src/main/java/info/nightscout/interfaces/iob/Iob.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/Iob.kt
View file

@ -1,26 +1,10 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
class Iob {
var iobContrib = 0.0
var activityContrib = 0.0
fun iobContrib(iobContrib: Double): Iob {
this.iobContrib = iobContrib
return this
}
fun activityContrib(activityContrib: Double): Iob {
this.activityContrib = activityContrib
return this
}
operator fun plus(iob: Iob): Iob {
iobContrib += iob.iobContrib
activityContrib += iob.activityContrib
return this
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other == null || javaClass != other.javaClass) return false

12
core/interfaces/src/main/java/info/nightscout/interfaces/iob/IobCobCalculator.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobCobCalculator.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
import app.aaps.interfaces.aps.AutosensData
import app.aaps.interfaces.aps.AutosensDataStore
import app.aaps.interfaces.aps.AutosensResult
import app.aaps.interfaces.aps.BasalData
import app.aaps.interfaces.profile.Profile
import info.nightscout.database.entities.ExtendedBolus
import info.nightscout.database.entities.TemporaryBasal
import info.nightscout.interfaces.aps.AutosensData
import info.nightscout.interfaces.aps.AutosensDataStore
import info.nightscout.interfaces.aps.AutosensResult
import info.nightscout.interfaces.aps.BasalData
import info.nightscout.interfaces.profile.Profile
import org.json.JSONArray
interface IobCobCalculator {

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

@ -1,4 +1,4 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
@Suppress("SpellCheckingInspection")
open class IobTotal(val time: Long) {
@ -15,5 +15,6 @@ open class IobTotal(val time: Long) {
var iobWithZeroTemp: IobTotal? = null
var netInsulin = 0.0 // for calculations from temp basals only
var extendedBolusInsulin = 0.0 // total insulin for extended bolus
companion object
}

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

@ -1,4 +1,4 @@
package info.nightscout.interfaces.iob
package app.aaps.interfaces.iob
class MealData {

3
core/interfaces/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/AAPSLogger.kt
View file

@ -1,10 +1,11 @@
package info.nightscout.rx.logging
package app.aaps.interfaces.logging
/**
* Created by adrian on 2019-12-27.
*/
interface AAPSLogger {
fun debug(message: String)
fun debug(enable: Boolean, tag: LTag, message: String)
fun debug(tag: LTag, message: String)

3
core/interfaces/src/main/java/info/nightscout/rx/interfaces/L.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/L.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.rx.interfaces
package app.aaps.interfaces.logging
interface L {
fun resetToDefaults()
fun findByName(name: String): LogElement
fun getLogElements(): List<LogElement>

4
core/interfaces/src/main/java/info/nightscout/rx/logging/LTag.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LTag.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.rx.logging
package app.aaps.interfaces.logging
enum class LTag(val tag: String, val defaultValue : Boolean = true, val requiresRestart: Boolean = false) {
enum class LTag(val tag: String, val defaultValue: Boolean = true, val requiresRestart: Boolean = false) {
CORE("CORE"),
APS("APS"),
AUTOSENS("AUTOSENS", defaultValue = false),

2
core/interfaces/src/main/java/info/nightscout/rx/interfaces/LogElement.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LogElement.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.rx.interfaces
package app.aaps.interfaces.logging
interface LogElement {

2
core/interfaces/src/main/java/info/nightscout/interfaces/logging/LoggerUtils.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LoggerUtils.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.logging
package app.aaps.interfaces.logging
interface LoggerUtils {

6
core/interfaces/src/main/java/info/nightscout/interfaces/logging/UserEntryLogger.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/UserEntryLogger.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.interfaces.logging
package app.aaps.interfaces.logging
import app.aaps.interfaces.userEntry.UserEntryMapper
import app.aaps.interfaces.userEntry.ValueWithUnitMapper
import info.nightscout.database.entities.UserEntry
import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources
import info.nightscout.database.entities.ValueWithUnit
import info.nightscout.interfaces.userEntry.UserEntryMapper
import info.nightscout.interfaces.userEntry.ValueWithUnitMapper
interface UserEntryLogger {

4
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/ImportExportPrefs.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/ImportExportPrefs.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import info.nightscout.rx.weardata.CwfData
import app.aaps.interfaces.rx.weardata.CwfData
interface ImportExportPrefs {

4
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefFileListProvider.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefFileListProvider.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
import info.nightscout.rx.weardata.CwfData
import app.aaps.interfaces.rx.weardata.CwfData
import java.io.File
interface PrefFileListProvider {

2
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefMetadata.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefMetadata.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
import android.os.Parcelable
import kotlinx.parcelize.Parcelize

2
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFile.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsFile.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
import android.os.Parcelable
import kotlinx.parcelize.Parcelize

2
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsImportDir.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsImportDir.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
enum class PrefsImportDir {
ROOT_DIR,

2
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsMetadataKey.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsMetadataKey.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
import android.content.Context

2
core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsStatus.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/maintenance/PrefsStatus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.maintenance
package app.aaps.interfaces.maintenance
import android.os.Parcelable

2
core/interfaces/src/main/java/info/nightscout/interfaces/notifications/Notification.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/Notification.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.notifications
package app.aaps.interfaces.notifications
import android.content.Context
import androidx.annotation.RawRes

7
core/interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationHolder.kt
View file

@ -1,12 +1,13 @@
package info.nightscout.interfaces
package app.aaps.interfaces.notifications
import android.app.Notification
import android.app.PendingIntent
import android.content.Context
interface NotificationHolder {
val channelID : String
val notificationID : Int
val channelID: String
val notificationID: Int
var notification: Notification
fun openAppIntent(context: Context): PendingIntent?

2
core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationUserMessage.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.notifications
package app.aaps.interfaces.notifications
class NotificationUserMessage(text: String) : Notification() {

2
core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSAlarm.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSAlarm.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.nsclient
package app.aaps.interfaces.nsclient
interface NSAlarm {
/*

2
core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSSettingsStatus.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSettingsStatus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.nsclient
package app.aaps.interfaces.nsclient
import android.content.Context
import org.json.JSONObject

2
core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSSgv.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/NSSgv.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.nsclient
package app.aaps.interfaces.nsclient
/**
*

12
core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/ProcessedDeviceStatusData.kt → core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/ProcessedDeviceStatusData.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.interfaces.nsclient
package app.aaps.interfaces.nsclient
import android.text.Spanned
import app.aaps.interfaces.aps.APSResult
import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.aps.APSResult
import org.json.JSONObject
interface ProcessedDeviceStatusData {
@ -12,14 +12,6 @@ interface ProcessedDeviceStatusData {
URGENT(2),
WARN(1),
INFO(0);
fun toColor(): String =
when (level) {
INFO.level -> "white"
WARN.level -> "yellow"
URGENT.level -> "red"
else -> "white"
}
}
class PumpData {

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