caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:core:interfaces unify package

Browse source
This commit is contained in:
Milos Kozak 2023-09-24 22:55:31 +02:00
parent 2c5e2e3951
commit e5f3545cd3
1455 changed files with 6458 additions and 6459 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

@ -36,25 +36,25 @@ import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.configuration.setupwizard.SetupWizardActivity import app.aaps.configuration.setupwizard.SetupWizardActivity
import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.logging.UserEntryLogger
import app.aaps.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import app.aaps.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.protection.ProtectionCheck
import app.aaps.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.events.EventAppExit import app.aaps.core.interfaces.rx.events.EventAppExit
import app.aaps.interfaces.rx.events.EventAppInitialized import app.aaps.core.interfaces.rx.events.EventAppInitialized
import app.aaps.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.interfaces.rx.events.EventRebuildTabs import app.aaps.core.interfaces.rx.events.EventRebuildTabs
import app.aaps.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.interfaces.ui.IconsProvider import app.aaps.core.interfaces.ui.IconsProvider
import app.aaps.interfaces.versionChecker.VersionCheckerUtils import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.crashlytics.FirebaseCrashlytics

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

@ -14,20 +14,20 @@ import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.PeriodicWorkRequest import androidx.work.PeriodicWorkRequest
import androidx.work.WorkManager import androidx.work.WorkManager
import app.aaps.di.DaggerAppComponent import app.aaps.di.DaggerAppComponent
import app.aaps.interfaces.alerts.LocalAlertUtils import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
import app.aaps.interfaces.extensions.runOnUiThread import app.aaps.core.interfaces.extensions.runOnUiThread
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.logging.UserEntryLogger
import app.aaps.interfaces.notifications.Notification import app.aaps.core.interfaces.notifications.Notification
import app.aaps.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.interfaces.versionChecker.VersionCheckerUtils import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.receivers.BTReceiver import app.aaps.receivers.BTReceiver
import app.aaps.receivers.ChargingStateReceiver import app.aaps.receivers.ChargingStateReceiver
import app.aaps.receivers.KeepAliveWorker import app.aaps.receivers.KeepAliveWorker

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

@ -11,24 +11,24 @@ import android.widget.TextView
import app.aaps.core.main.events.EventIobCalculationProgress import app.aaps.core.main.events.EventIobCalculationProgress
import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.extensions.toVisibility import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.interfaces.extensions.toVisibilityKeepSpace import app.aaps.core.interfaces.extensions.toVisibilityKeepSpace
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.overview.OverviewMenus import app.aaps.core.interfaces.overview.OverviewMenus
import app.aaps.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.DefaultValueHelper import app.aaps.core.interfaces.profile.DefaultValueHelper
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventAutosensCalculationFinished import app.aaps.core.interfaces.rx.events.EventAutosensCalculationFinished
import app.aaps.interfaces.rx.events.EventCustomCalculationFinished import app.aaps.core.interfaces.rx.events.EventCustomCalculationFinished
import app.aaps.interfaces.rx.events.EventRefreshOverview import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.interfaces.rx.events.EventScale import app.aaps.core.interfaces.rx.events.EventScale
import app.aaps.interfaces.rx.events.EventUpdateOverviewGraph import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.datepicker.MaterialDatePicker
import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.GraphView
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

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

@ -3,16 +3,16 @@ package app.aaps.activities
import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.DefaultValueHelper import app.aaps.core.interfaces.profile.DefaultValueHelper
import app.aaps.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.DecimalFormatter
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.implementation.overview.OverviewDataImpl import info.nightscout.implementation.overview.OverviewDataImpl

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

@ -16,21 +16,21 @@ import androidx.preference.PreferenceManager
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import androidx.preference.size import androidx.preference.size
import app.aaps.configuration.maintenance.MaintenancePlugin import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.nsclient.NSSettingsStatus import app.aaps.core.interfaces.nsclient.NSSettingsStatus
import app.aaps.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.profile.ProfileUtil
import app.aaps.interfaces.protection.PasswordCheck import app.aaps.core.interfaces.protection.PasswordCheck
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN
import app.aaps.interfaces.protection.ProtectionCheck.ProtectionType.NONE import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.NONE
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.interfaces.rx.events.EventRebuildTabs import app.aaps.core.interfaces.rx.events.EventRebuildTabs
import app.aaps.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.SafeParse
import dagger.android.support.AndroidSupportInjection import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin

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

@ -6,10 +6,10 @@ import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.implementations.ConfigImpl import app.aaps.implementations.ConfigImpl
import app.aaps.implementations.InstantiatorImpl import app.aaps.implementations.InstantiatorImpl
import app.aaps.implementations.UiInteractionImpl import app.aaps.implementations.UiInteractionImpl
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.objects.Instantiator import app.aaps.core.interfaces.objects.Instantiator
import app.aaps.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.workflow.CalculationWorkflowImpl import app.aaps.workflow.CalculationWorkflowImpl
import dagger.Binds import dagger.Binds
import dagger.Lazy import dagger.Lazy

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

@ -2,7 +2,7 @@ package app.aaps.di
import app.aaps.configuration.configBuilder.ConfigBuilderPlugin import app.aaps.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.configuration.maintenance.MaintenancePlugin import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntKey import dagger.multibindings.IntKey

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

@ -1,8 +1,8 @@
package app.aaps.implementations package app.aaps.implementations
import android.os.Build import android.os.Build
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import java.io.File import java.io.File

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

@ -1,10 +1,10 @@
package app.aaps.implementations package app.aaps.implementations
import app.aaps.interfaces.aps.APSResult import app.aaps.core.interfaces.aps.APSResult
import app.aaps.interfaces.aps.AutosensData import app.aaps.core.interfaces.aps.AutosensData
import app.aaps.interfaces.objects.Instantiator import app.aaps.core.interfaces.objects.Instantiator
import app.aaps.interfaces.profile.ProfileStore import app.aaps.core.interfaces.profile.ProfileStore
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import dagger.Reusable import dagger.Reusable
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.implementation.profile.ProfileStoreObject import info.nightscout.implementation.profile.ProfileStoreObject

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

@ -12,10 +12,10 @@ import app.aaps.activities.MyPreferenceFragment
import app.aaps.activities.PreferencesActivity import app.aaps.activities.PreferencesActivity
import app.aaps.configuration.activities.SingleFragmentActivity import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.events.EventNewNotification
import app.aaps.interfaces.notifications.Notification import app.aaps.core.interfaces.notifications.Notification
import app.aaps.interfaces.nsclient.NSAlarm import app.aaps.core.interfaces.nsclient.NSAlarm
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.ui.toast.ToastUtils

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

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

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

@ -4,11 +4,11 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.os.BatteryManager import android.os.BatteryManager
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.receivers.ReceiverStatusStore import app.aaps.core.interfaces.receivers.ReceiverStatusStore
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventChargingState import app.aaps.core.interfaces.rx.events.EventChargingState
import dagger.android.DaggerBroadcastReceiver import dagger.android.DaggerBroadcastReceiver
import javax.inject.Inject import javax.inject.Inject

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

@ -5,9 +5,9 @@ import android.content.Intent
import android.provider.Telephony import android.provider.Telephony
import androidx.work.Data import androidx.work.Data
import androidx.work.OneTimeWorkRequest import androidx.work.OneTimeWorkRequest
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.receivers.Intents import app.aaps.core.interfaces.receivers.Intents
import dagger.android.DaggerBroadcastReceiver import dagger.android.DaggerBroadcastReceiver
import info.nightscout.core.utils.extensions.copyDouble import info.nightscout.core.utils.extensions.copyDouble
import info.nightscout.core.utils.extensions.copyLong import info.nightscout.core.utils.extensions.copyLong

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

@ -12,21 +12,21 @@ import androidx.work.workDataOf
import app.aaps.configuration.maintenance.MaintenancePlugin import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.interfaces.alerts.LocalAlertUtils import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.interfaces.queue.Command import app.aaps.core.interfaces.queue.Command
import app.aaps.interfaces.queue.CommandQueue import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.EventProfileSwitchChanged import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged
import app.aaps.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.ListenableFuture
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository

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

@ -2,11 +2,11 @@ package app.aaps.receivers
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.pump.Pump import app.aaps.core.interfaces.pump.Pump
import app.aaps.interfaces.utils.TimeChangeType import app.aaps.core.interfaces.utils.TimeChangeType
import com.google.gson.Gson import com.google.gson.Gson
import dagger.android.DaggerBroadcastReceiver import dagger.android.DaggerBroadcastReceiver
import java.util.Date import java.util.Date

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

@ -13,20 +13,20 @@ import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB 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.MAIN_CALCULATION
import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
import app.aaps.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event
import app.aaps.interfaces.rx.events.EventAppInitialized import app.aaps.core.interfaces.rx.events.EventAppInitialized
import app.aaps.interfaces.rx.events.EventNewHistoryData import app.aaps.core.interfaces.rx.events.EventNewHistoryData
import app.aaps.interfaces.rx.events.EventOfflineChange import app.aaps.core.interfaces.rx.events.EventOfflineChange
import app.aaps.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.interfaces.rx.events.EventTherapyEventChange import app.aaps.core.interfaces.rx.events.EventTherapyEventChange
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.then import info.nightscout.core.utils.worker.then

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

@ -1,12 +1,12 @@
package app.aaps.configuration.maintenance package app.aaps.configuration.maintenance
import android.content.Context import android.content.Context
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.logging.LoggerUtils import app.aaps.core.interfaces.logging.LoggerUtils
import app.aaps.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import app.aaps.interfaces.nsclient.NSSettingsStatus import app.aaps.core.interfaces.nsclient.NSSettingsStatus
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

2
core/interfaces/build.gradle
View file

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

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

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

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

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

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

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

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

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

6
core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/APSResult.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/APSResult.kt
View file

@ -1,8 +1,8 @@
package app.aaps.interfaces.aps package app.aaps.core.interfaces.aps
import android.text.Spanned import android.text.Spanned
import app.aaps.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.Constraint
import app.aaps.interfaces.iob.IobTotal import app.aaps.core.interfaces.iob.IobTotal
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.GlucoseValue
import org.json.JSONObject import org.json.JSONObject

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

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

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

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

8
core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/AutosensDataStore.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/AutosensDataStore.kt
View file

@ -1,9 +1,9 @@
package app.aaps.interfaces.aps package app.aaps.core.interfaces.aps
import androidx.collection.LongSparseArray import androidx.collection.LongSparseArray
import app.aaps.interfaces.iob.InMemoryGlucoseValue import app.aaps.core.interfaces.iob.InMemoryGlucoseValue
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.GlucoseValue
interface AutosensDataStore { interface AutosensDataStore {

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

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

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

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

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

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

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/SMBDefaults.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/SMBDefaults.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.aps package app.aaps.core.interfaces.aps
@Suppress("SpellCheckingInspection") @Suppress("SpellCheckingInspection")
object SMBDefaults { object SMBDefaults {

4
core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/Sensitivity.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/Sensitivity.kt
View file

@ -1,6 +1,6 @@
package app.aaps.interfaces.aps package app.aaps.core.interfaces.aps
import app.aaps.interfaces.configuration.ConfigExportImport import app.aaps.core.interfaces.configuration.ConfigExportImport
interface Sensitivity : ConfigExportImport { interface Sensitivity : ConfigExportImport {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/aps/VariableSensitivityResult.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/aps/VariableSensitivityResult.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.aps package app.aaps.core.interfaces.aps
interface VariableSensitivityResult { interface VariableSensitivityResult {

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/automation/AutomationEvent.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/automation/AutomationEvent.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.automation package app.aaps.core.interfaces.automation
interface AutomationEvent { interface AutomationEvent {

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

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

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/configuration/Config.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Config.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.configuration package app.aaps.core.interfaces.configuration
@Suppress("PropertyName") @Suppress("PropertyName")
interface Config { interface Config {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
package app.aaps.interfaces.db package app.aaps.core.interfaces.db
import app.aaps.interfaces.queue.Callback import app.aaps.core.interfaces.queue.Callback
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.ValueWrapper import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Bolus

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

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

6
core/interfaces/src/main/kotlin/app/aaps/interfaces/insulin/Insulin.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/insulin/Insulin.kt
View file

@ -1,7 +1,7 @@
package app.aaps.interfaces.insulin package app.aaps.core.interfaces.insulin
import app.aaps.interfaces.configuration.ConfigExportImport import app.aaps.core.interfaces.configuration.ConfigExportImport
import app.aaps.interfaces.iob.Iob import app.aaps.core.interfaces.iob.Iob
import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.embedments.InsulinConfiguration import info.nightscout.database.entities.embedments.InsulinConfiguration

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

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

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/GlucoseStatusProvider.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/GlucoseStatusProvider.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.iob package app.aaps.core.interfaces.iob
interface GlucoseStatusProvider { interface GlucoseStatusProvider {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValue.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/InMemoryGlucoseValue.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.iob package app.aaps.core.interfaces.iob
import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.GlucoseValue

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/Iob.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/Iob.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.iob package app.aaps.core.interfaces.iob
class Iob { class Iob {

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/iob/IobTotal.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/iob/IobTotal.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.iob package app.aaps.core.interfaces.iob
@Suppress("SpellCheckingInspection") @Suppress("SpellCheckingInspection")
open class IobTotal(val time: Long) { open class IobTotal(val time: Long) {

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/AAPSLogger.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/AAPSLogger.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.logging package app.aaps.core.interfaces.logging
/** /**
* Created by adrian on 2019-12-27. * Created by adrian on 2019-12-27.

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/L.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/L.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.logging package app.aaps.core.interfaces.logging
interface L { interface L {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/logging/LTag.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LTag.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.logging package app.aaps.core.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"), CORE("CORE"),

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

@ -1,4 +1,4 @@
package app.aaps.interfaces.logging package app.aaps.core.interfaces.logging
interface LogElement { interface LogElement {

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

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

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

@ -1,7 +1,7 @@
package app.aaps.interfaces.logging package app.aaps.core.interfaces.logging
import app.aaps.interfaces.userEntry.UserEntryMapper import app.aaps.core.interfaces.userEntry.UserEntryMapper
import app.aaps.interfaces.userEntry.ValueWithUnitMapper import app.aaps.core.interfaces.userEntry.ValueWithUnitMapper
import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry
import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.UserEntry.Sources

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/notifications/NotificationHolder.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationHolder.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.notifications package app.aaps.core.interfaces.notifications
import android.app.Notification import android.app.Notification
import android.app.PendingIntent import android.app.PendingIntent

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

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

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

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

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

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

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

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

4
core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/ProcessedDeviceStatusData.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/ProcessedDeviceStatusData.kt
View file

@ -1,7 +1,7 @@
package app.aaps.interfaces.nsclient package app.aaps.core.interfaces.nsclient
import android.text.Spanned import android.text.Spanned
import app.aaps.interfaces.aps.APSResult import app.aaps.core.interfaces.aps.APSResult
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import org.json.JSONObject import org.json.JSONObject

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/nsclient/StoreDataForDb.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/nsclient/StoreDataForDb.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.nsclient package app.aaps.core.interfaces.nsclient
import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.BolusCalculatorResult

8
core/interfaces/src/main/kotlin/app/aaps/interfaces/objects/Instantiator.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/objects/Instantiator.kt
View file

@ -1,8 +1,8 @@
package app.aaps.interfaces.objects package app.aaps.core.interfaces.objects
import app.aaps.interfaces.aps.APSResult import app.aaps.core.interfaces.aps.APSResult
import app.aaps.interfaces.aps.AutosensData import app.aaps.core.interfaces.aps.AutosensData
import app.aaps.interfaces.profile.ProfileStore import app.aaps.core.interfaces.profile.ProfileStore
import org.json.JSONObject import org.json.JSONObject
interface Instantiator { interface Instantiator {

6
core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/Overview.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/Overview.kt
View file

@ -1,8 +1,8 @@
package app.aaps.interfaces.overview package app.aaps.core.interfaces.overview
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.interfaces.configuration.ConfigExportImport import app.aaps.core.interfaces.configuration.ConfigExportImport
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
interface Overview : ConfigExportImport { interface Overview : ConfigExportImport {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/overview/OverviewMenus.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.overview package app.aaps.core.interfaces.overview
import android.content.Context import android.content.Context
import android.widget.ImageButton import android.widget.ImageButton

28
core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/ActivePlugin.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/ActivePlugin.kt
View file

@ -1,18 +1,18 @@
package app.aaps.interfaces.plugin package app.aaps.core.interfaces.plugin
import app.aaps.interfaces.aps.APS import app.aaps.core.interfaces.aps.APS
import app.aaps.interfaces.aps.Sensitivity import app.aaps.core.interfaces.aps.Sensitivity
import app.aaps.interfaces.constraints.Objectives import app.aaps.core.interfaces.constraints.Objectives
import app.aaps.interfaces.constraints.Safety import app.aaps.core.interfaces.constraints.Safety
import app.aaps.interfaces.insulin.Insulin import app.aaps.core.interfaces.insulin.Insulin
import app.aaps.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.iob.IobCobCalculator
import app.aaps.interfaces.overview.Overview import app.aaps.core.interfaces.overview.Overview
import app.aaps.interfaces.profile.ProfileSource import app.aaps.core.interfaces.profile.ProfileSource
import app.aaps.interfaces.pump.Pump import app.aaps.core.interfaces.pump.Pump
import app.aaps.interfaces.smoothing.Smoothing import app.aaps.core.interfaces.smoothing.Smoothing
import app.aaps.interfaces.source.BgSource import app.aaps.core.interfaces.source.BgSource
import app.aaps.interfaces.sync.NsClient import app.aaps.core.interfaces.sync.NsClient
import app.aaps.interfaces.sync.Sync import app.aaps.core.interfaces.sync.Sync
interface ActivePlugin { interface ActivePlugin {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/OwnDatabasePlugin.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/OwnDatabasePlugin.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.plugin package app.aaps.core.interfaces.plugin
interface OwnDatabasePlugin { interface OwnDatabasePlugin {

8
core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginBase.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginBase.kt
View file

@ -1,10 +1,10 @@
package app.aaps.interfaces.plugin package app.aaps.core.interfaces.plugin
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import app.aaps.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
/** /**

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginDescription.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginDescription.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.plugin package app.aaps.core.interfaces.plugin
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginFragment.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginFragment.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.plugin package app.aaps.core.interfaces.plugin
interface PluginFragment { interface PluginFragment {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/plugin/PluginType.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/plugin/PluginType.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.plugin package app.aaps.core.interfaces.plugin
/** /**
* Main plugin type * Main plugin type

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/DefaultValueHelper.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/DefaultValueHelper.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
interface DefaultValueHelper { interface DefaultValueHelper {

18
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/Profile.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/Profile.kt
View file

@ -1,13 +1,13 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
import app.aaps.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.interfaces.pump.Pump import app.aaps.core.interfaces.pump.Pump
import app.aaps.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.interfaces.utils.Round import app.aaps.core.interfaces.utils.Round
import org.json.JSONObject import org.json.JSONObject
interface Profile { interface Profile {

4
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileFunction.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileFunction.kt
View file

@ -1,6 +1,6 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
import app.aaps.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.ProfileSwitch
interface ProfileFunction { interface ProfileFunction {

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileSource.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileSource.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import org.json.JSONArray import org.json.JSONArray

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileStore.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileStore.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
import org.json.JSONObject import org.json.JSONObject

6
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/ProfileUtil.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/ProfileUtil.kt
View file

@ -1,11 +1,11 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
import app.aaps.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
interface ProfileUtil { interface ProfileUtil {
/** /**
* Units selected in [app.aaps.interfaces.sharedPreferences.SP] * Units selected in [app.aaps.core.interfaces.sharedPreferences.SP]
* *
* @return GlucoseUnit for UI * @return GlucoseUnit for UI
*/ */

4
core/interfaces/src/main/kotlin/app/aaps/interfaces/profile/PureProfile.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profile/PureProfile.kt
View file

@ -1,6 +1,6 @@
package app.aaps.interfaces.profile package app.aaps.core.interfaces.profile
import app.aaps.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.data.Block
import info.nightscout.database.entities.data.TargetBlock import info.nightscout.database.entities.data.TargetBlock
import org.json.JSONObject import org.json.JSONObject

8
core/interfaces/src/main/kotlin/app/aaps/core/interfaces/profiling/Profiler.kt Normal file
View file

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

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/PasswordCheck.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/PasswordCheck.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.protection package app.aaps.core.interfaces.protection
import android.content.Context import android.content.Context
import androidx.annotation.StringRes import androidx.annotation.StringRes

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/protection/ProtectionCheck.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/protection/ProtectionCheck.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.protection package app.aaps.core.interfaces.protection
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BlePreCheck.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BlePreCheck.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.pump package app.aaps.core.interfaces.pump
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity

2
core/interfaces/src/main/kotlin/app/aaps/interfaces/pump/BolusProgressData.kt → core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BolusProgressData.kt
View file

@ -1,4 +1,4 @@
package app.aaps.interfaces.pump package app.aaps.core.interfaces.pump
object BolusProgressData { object BolusProgressData {

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