caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:pump:virtual cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-27 09:30:12 +02:00
parent c79b7cf477
commit d3e6fb0df9
14 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,7 @@ import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin
import app.aaps.plugins.sync.openhumans.OpenHumansUploaderPlugin
import app.aaps.plugins.sync.tidepool.TidepoolPlugin
import app.aaps.plugins.sync.xdrip.XdripPlugin
import app.aaps.pump.virtual.VirtualPumpPlugin
import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
@ -71,7 +72,6 @@ import info.nightscout.pump.combo.ComboPlugin
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 javax.inject.Inject
class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener {

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

@ -14,6 +14,7 @@ import app.aaps.plugins.main.di.PluginsModule
import app.aaps.plugins.source.di.SourceModule
import app.aaps.plugins.sync.di.OpenHumansModule
import app.aaps.plugins.sync.di.SyncModule
import app.aaps.pump.virtual.di.VirtualPumpModule
import app.aaps.shared.impl.di.SharedImplModule
import app.aaps.ui.di.UiModule
import dagger.BindsInstance
@ -36,7 +37,6 @@ import info.nightscout.pump.dana.di.DanaModule
import info.nightscout.pump.danars.di.DanaRSModule
import info.nightscout.pump.diaconn.di.DiaconnG8Module
import info.nightscout.pump.medtrum.di.MedtrumModule
import info.nightscout.pump.virtual.di.VirtualPumpModule
import info.nightscout.workflow.di.WorkflowModule
import javax.inject.Singleton

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

@ -52,6 +52,7 @@ import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin
import app.aaps.plugins.sync.openhumans.OpenHumansUploaderPlugin
import app.aaps.plugins.sync.tidepool.TidepoolPlugin
import app.aaps.plugins.sync.xdrip.XdripPlugin
import app.aaps.pump.virtual.VirtualPumpPlugin
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntKey
@ -68,7 +69,6 @@ import info.nightscout.pump.combo.ComboPlugin
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 javax.inject.Qualifier
@Suppress("unused")

2
implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt
View file

@ -3,11 +3,11 @@ package app.aaps.interfaces.pump
import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.main.pump.toHtml
import app.aaps.plugins.aps.loop.extensions.json
import app.aaps.pump.virtual.extensions.toText
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.pump.virtual.extensions.toText
import org.json.JSONObject
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test

2
plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt
View file

@ -20,11 +20,11 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.interfaces.RunningConfiguration
import app.aaps.database.impl.AppRepository
import app.aaps.pump.virtual.VirtualPumpPlugin
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.pump.virtual.VirtualPumpPlugin
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt
View file

@ -26,6 +26,7 @@ import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.plugins.constraints.objectives.objectives.Objective
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.pump.virtual.VirtualPumpPlugin
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
@ -41,7 +42,6 @@ import info.nightscout.pump.dana.DanaPump
import info.nightscout.pump.dana.R
import info.nightscout.pump.dana.database.DanaHistoryDatabase
import info.nightscout.pump.danars.DanaRSPlugin
import info.nightscout.pump.virtual.VirtualPumpPlugin
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt
View file

@ -16,11 +16,11 @@ import app.aaps.database.impl.AppRepository
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.source.GlimpPlugin
import app.aaps.pump.virtual.VirtualPumpPlugin
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.pump.virtual.VirtualPumpPlugin
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock

2
pump/virtual/build.gradle
View file

@ -13,7 +13,7 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.pump.virtual'
namespace 'app.aaps.pump.virtual'
}
dependencies {

6
pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt → pump/virtual/src/main/kotlin/app/aaps/pump/virtual/VirtualPumpFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.pump.virtual
package app.aaps.pump.virtual
import android.os.Bundle
import android.os.Handler
@ -21,9 +21,9 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.extensions.toStringFull
import app.aaps.pump.virtual.databinding.VirtualPumpFragmentBinding
import app.aaps.pump.virtual.events.EventVirtualPumpUpdateGui
import dagger.android.support.DaggerFragment
import info.nightscout.pump.virtual.databinding.VirtualPumpFragmentBinding
import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

6
pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt → pump/virtual/src/main/kotlin/app/aaps/pump/virtual/VirtualPumpPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.pump.virtual
package app.aaps.pump.virtual
import android.os.SystemClock
import androidx.preference.PreferenceFragmentCompat
@ -39,9 +39,9 @@ import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.main.extensions.convertedToAbsolute
import app.aaps.core.main.extensions.plannedRemainingMinutes
import app.aaps.core.utils.fabric.InstanceId
import app.aaps.pump.virtual.events.EventVirtualPumpUpdateGui
import app.aaps.pump.virtual.extensions.toText
import dagger.android.HasAndroidInjector
import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui
import info.nightscout.pump.virtual.extensions.toText
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONException

6
pump/virtual/src/main/java/info/nightscout/pump/virtual/di/VirtualPumpModule.kt → pump/virtual/src/main/kotlin/app/aaps/pump/virtual/di/VirtualPumpModule.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.pump.virtual.di
package app.aaps.pump.virtual.di
import app.aaps.core.interfaces.pump.VirtualPump
import app.aaps.pump.virtual.VirtualPumpFragment
import app.aaps.pump.virtual.VirtualPumpPlugin
import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.pump.virtual.VirtualPumpFragment
import info.nightscout.pump.virtual.VirtualPumpPlugin
@Module(
includes = [

2
pump/virtual/src/main/java/info/nightscout/pump/virtual/events/EventVirtualPumpUpdateGui.kt → pump/virtual/src/main/kotlin/app/aaps/pump/virtual/events/EventVirtualPumpUpdateGui.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.pump.virtual.events
package app.aaps.pump.virtual.events
import app.aaps.core.interfaces.rx.events.EventUpdateGui

2
pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt → pump/virtual/src/main/kotlin/app/aaps/pump/virtual/extensions/PumpEnactResultExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.pump.virtual.extensions
package app.aaps.pump.virtual.extensions
import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.interfaces.resources.ResourceHelper

2
pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt → pump/virtual/src/test/kotlin/app/aaps/pump/virtual/VirtualPumpPluginUTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.pump.virtual
package app.aaps.pump.virtual
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.db.PersistenceLayer