caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:plugins:insulin cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 13:07:44 +02:00
parent a4907b212a
commit 905916e1eb
20 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,8 @@ import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin
import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@ -47,8 +49,6 @@ import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
import info.nightscout.plugins.general.wear.WearPlugin
import info.nightscout.plugins.sync.nsclient.NSClientPlugin

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

@ -7,6 +7,8 @@ import app.aaps.implementation.di.ImplementationModule
import app.aaps.plugins.aps.di.ApsModule
import app.aaps.plugins.automation.di.AutomationModule
import app.aaps.plugins.configuration.di.ConfigurationModule
import app.aaps.plugins.constraints.di.PluginsConstraintsModule
import app.aaps.plugins.insulin.di.InsulinModule
import app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance
import dagger.Component
@ -21,8 +23,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.database.impl.DatabaseModule
import info.nightscout.insulin.di.InsulinModule
import app.aaps.plugins.constraints.di.PluginsConstraintsModule
import info.nightscout.plugins.di.PluginsModule
import info.nightscout.plugins.sync.di.OpenHumansModule
import info.nightscout.plugins.sync.di.SyncModule

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

@ -9,6 +9,17 @@ import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin
import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import app.aaps.plugins.constraints.storage.StorageConstraintPlugin
import app.aaps.plugins.constraints.versionChecker.VersionCheckerPlugin
import app.aaps.plugins.insulin.InsulinLyumjevPlugin
import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin
import app.aaps.plugins.insulin.InsulinOrefRapidActingPlugin
import app.aaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntKey
@ -21,17 +32,6 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
import info.nightscout.insulin.InsulinLyumjevPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.insulin.InsulinOrefRapidActingPlugin
import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin
import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin
import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import app.aaps.plugins.constraints.storage.StorageConstraintPlugin
import app.aaps.plugins.constraints.versionChecker.VersionCheckerPlugin
import info.nightscout.plugins.general.actions.ActionsPlugin
import info.nightscout.plugins.general.food.FoodPlugin
import info.nightscout.plugins.general.overview.OverviewPlugin

2
plugins/insulin/build.gradle
View file

@ -11,7 +11,7 @@ apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.insulin'
namespace 'app.aaps.plugins.insulin'
}

4
plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt → plugins/insulin/src/main/kotlin/app/aaps/plugins/insulin/InsulinFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import android.os.Bundle
import android.view.LayoutInflater
@ -6,8 +6,8 @@ import android.view.View
import android.view.ViewGroup
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.plugins.insulin.databinding.InsulinFragmentBinding
import dagger.android.support.DaggerFragment
import info.nightscout.insulin.databinding.InsulinFragmentBinding
import javax.inject.Inject
class InsulinFragment : DaggerFragment() {

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

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

@ -1,7 +1,5 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.main.utils.extensions.putInt
import app.aaps.core.main.utils.extensions.storeInt
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin
import app.aaps.core.interfaces.logging.AAPSLogger
@ -11,6 +9,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.main.utils.extensions.putInt
import app.aaps.core.main.utils.extensions.storeInt
import dagger.android.HasAndroidInjector
import org.json.JSONObject
import javax.inject.Inject

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

4
plugins/insulin/src/main/java/info/nightscout/insulin/di/InsulinModule.kt → plugins/insulin/src/main/kotlin/app/aaps/plugins/insulin/di/InsulinModule.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.insulin.di
package app.aaps.plugins.insulin.di
import app.aaps.plugins.insulin.InsulinFragment
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.insulin.InsulinFragment
@Module
@Suppress("unused")

2
plugins/insulin/src/main/res/layout/insulin_fragment.xml
View file

@ -2,7 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="info.nightscout.insulin.InsulinFragment">
tools:context=".InsulinFragment">
<LinearLayout
android:layout_width="match_parent"

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.configuration.Constants

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

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

@ -1,4 +1,4 @@
package info.nightscout.insulin
package app.aaps.plugins.insulin
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.insulin.Insulin

2
plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt
View file

@ -6,9 +6,9 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.extensions.iobCalc
import app.aaps.database.entities.Bolus
import app.aaps.plugins.insulin.InsulinLyumjevPlugin
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import info.nightscout.insulin.InsulinLyumjevPlugin
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt
View file

@ -11,9 +11,9 @@ import app.aaps.core.main.extensions.isInProgress
import app.aaps.core.main.extensions.toTemporaryBasal
import app.aaps.database.entities.ExtendedBolus
import app.aaps.database.entities.TemporaryBasal
import app.aaps.plugins.insulin.InsulinLyumjevPlugin
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import info.nightscout.insulin.InsulinLyumjevPlugin
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt
View file

@ -8,9 +8,9 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.extensions.iobCalc
import app.aaps.database.entities.TemporaryBasal
import app.aaps.plugins.insulin.InsulinLyumjevPlugin
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import info.nightscout.insulin.InsulinLyumjevPlugin
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock