caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:plugins:sensitivity cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 16:21:47 +02:00
parent fb25d1b9d5
commit 08c45b2c0f
10 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,9 @@ import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
import app.aaps.plugins.main.general.wear.WearPlugin import app.aaps.plugins.main.general.wear.WearPlugin
import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin
import app.aaps.plugins.sensitivity.SensitivityOref1Plugin
import app.aaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
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
@ -61,9 +64,6 @@ import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.medtrum.MedtrumPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin
import info.nightscout.sensitivity.SensitivityAAPSPlugin
import info.nightscout.sensitivity.SensitivityOref1Plugin
import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
import info.nightscout.source.AidexPlugin import info.nightscout.source.AidexPlugin
import info.nightscout.source.DexcomPlugin import info.nightscout.source.DexcomPlugin
import info.nightscout.source.EversensePlugin import info.nightscout.source.EversensePlugin
@ -475,7 +475,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
true true
} }
// NSClient copy settings // NSClient copy settings
rh.gs(app.aaps.plugins.main.R.string.key_statuslights_copy_ns) -> { rh.gs(app.aaps.plugins.main.R.string.key_statuslights_copy_ns) -> {
nsSettingStatus.copyStatusLightsNsSettings(context) nsSettingStatus.copyStatusLightsNsSettings(context)
true true
} }

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

@ -29,6 +29,9 @@ import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
import app.aaps.plugins.main.general.themes.ThemeSwitcherPlugin import app.aaps.plugins.main.general.themes.ThemeSwitcherPlugin
import app.aaps.plugins.main.general.wear.WearPlugin import app.aaps.plugins.main.general.wear.WearPlugin
import app.aaps.plugins.main.profile.ProfilePlugin import app.aaps.plugins.main.profile.ProfilePlugin
import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin
import app.aaps.plugins.sensitivity.SensitivityOref1Plugin
import app.aaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntKey import dagger.multibindings.IntKey
@ -52,9 +55,6 @@ import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.medtrum.MedtrumPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin
import info.nightscout.sensitivity.SensitivityAAPSPlugin
import info.nightscout.sensitivity.SensitivityOref1Plugin
import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
import info.nightscout.smoothing.AvgSmoothingPlugin import info.nightscout.smoothing.AvgSmoothingPlugin
import info.nightscout.smoothing.ExponentialSmoothingPlugin import info.nightscout.smoothing.ExponentialSmoothingPlugin
import info.nightscout.smoothing.NoSmoothingPlugin import info.nightscout.smoothing.NoSmoothingPlugin

3
plugins/sensitivity/build.gradle
View file

@ -10,8 +10,9 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android { android {
namespace 'info.nightscout.sensitivity' namespace 'app.aaps.plugins.sensitivity'
} }

2
plugins/sensitivity/src/main/java/info/nightscout/sensitivity/AbstractSensitivityPlugin.kt → plugins/sensitivity/src/main/kotlin/app/aaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity package app.aaps.plugins.sensitivity
import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.aps.AutosensResult import app.aaps.core.interfaces.aps.AutosensResult

6
plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt → plugins/sensitivity/src/main/kotlin/app/aaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity package app.aaps.plugins.sensitivity
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.AutosensDataStore
@ -16,10 +16,10 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import app.aaps.core.utils.Percentile import app.aaps.core.utils.Percentile
import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.TherapyEvent
import app.aaps.plugins.sensitivity.extensions.isPSEvent5minBack
import app.aaps.plugins.sensitivity.extensions.isTherapyEventEvent5minBack
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.sensitivity.extensions.isPSEvent5minBack
import info.nightscout.sensitivity.extensions.isTherapyEventEvent5minBack
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import java.util.Arrays import java.util.Arrays

6
plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt → plugins/sensitivity/src/main/kotlin/app/aaps/plugins/sensitivity/SensitivityOref1Plugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity package app.aaps.plugins.sensitivity
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.AutosensDataStore
@ -19,10 +19,10 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import app.aaps.core.utils.Percentile import app.aaps.core.utils.Percentile
import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.TherapyEvent
import app.aaps.plugins.sensitivity.extensions.isPSEvent5minBack
import app.aaps.plugins.sensitivity.extensions.isTherapyEventEvent5minBack
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.sensitivity.extensions.isPSEvent5minBack
import info.nightscout.sensitivity.extensions.isTherapyEventEvent5minBack
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import java.util.Arrays import java.util.Arrays

6
plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt → plugins/sensitivity/src/main/kotlin/app/aaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity package app.aaps.plugins.sensitivity
import androidx.collection.LongSparseArray import androidx.collection.LongSparseArray
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
@ -16,10 +16,10 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.TherapyEvent
import app.aaps.plugins.sensitivity.extensions.isPSEvent5minBack
import app.aaps.plugins.sensitivity.extensions.isTherapyEventEvent5minBack
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.sensitivity.extensions.isPSEvent5minBack
import info.nightscout.sensitivity.extensions.isTherapyEventEvent5minBack
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

2
plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/ProfileSwitchExtensions.kt → plugins/sensitivity/src/main/kotlin/app/aaps/plugins/sensitivity/extensions/ProfileSwitchExtensions.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity.extensions package app.aaps.plugins.sensitivity.extensions
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.database.entities.ProfileSwitch import app.aaps.database.entities.ProfileSwitch

2
plugins/sensitivity/src/main/java/info/nightscout/sensitivity/extensions/TherapyEventExtensions.kt → plugins/sensitivity/src/main/kotlin/app/aaps/plugins/sensitivity/extensions/TherapyEventExtensions.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity.extensions package app.aaps.plugins.sensitivity.extensions
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.TherapyEvent

2
plugins/sensitivity/src/test/java/info/nightscout/sensitivity/AbstractSensitivityPluginTest.kt → plugins/sensitivity/src/test/kotlin/app/aaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.sensitivity package app.aaps.plugins.sensitivity
import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.aps.AutosensResult import app.aaps.core.interfaces.aps.AutosensResult