diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt b/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt similarity index 90% rename from core/core-main/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt rename to app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt index fa5e55a959..76eb41c39c 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt +++ b/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt @@ -1,8 +1,7 @@ -package info.nightscout.androidaps.events +package info.nightscout.rx.events import android.content.Context -import info.nightscout.core.main.R -import info.nightscout.rx.events.EventStatus +import info.nightscout.rx.R class EventPumpStatusChanged : EventStatus { @@ -48,7 +47,7 @@ class EventPumpStatusChanged : EventStatus { // status for startup wizard override fun getStatus(context: Context): String { return when (status) { - Status.CONNECTING -> context.getString(R.string.connectingfor, secondsElapsed) + Status.CONNECTING -> context.getString(R.string.connecting_for, secondsElapsed) Status.HANDSHAKING -> context.getString(R.string.handshaking) Status.CONNECTED -> context.getString(R.string.connected) Status.PERFORMING -> performingAction @@ -57,4 +56,4 @@ class EventPumpStatusChanged : EventStatus { Status.DISCONNECTED -> "" } } -} +} \ No newline at end of file diff --git a/app-wear-shared/rx/src/main/res/values/strings.xml b/app-wear-shared/rx/src/main/res/values/strings.xml new file mode 100644 index 0000000000..f2ac972013 --- /dev/null +++ b/app-wear-shared/rx/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ + + + Connecting for %1$d s + Handshaking + Connected + Disconnecting + Waiting for disconnection + + \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt index dfe2912bea..eb86467edd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt @@ -16,11 +16,10 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.LoopFragmentBinding import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui -import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.core.fabric.FabricPrivacy +import info.nightscout.core.pumpExtensions.toHtml import info.nightscout.interfaces.aps.Loop import info.nightscout.interfaces.constraints.Constraint -import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus @@ -170,44 +169,4 @@ class LoopFragment : DaggerFragment(), MenuProvider { binding.smbsetbypump.text = "" binding.swipeRefresh.isRefreshing = false } - - private fun PumpEnactResult.toHtml(rh: ResourceHelper): String { - var ret = "" + rh.gs(info.nightscout.core.main.R.string.success) + ": " + success - if (queued) { - ret = rh.gs(info.nightscout.core.main.R.string.waitingforpumpresult) - } else if (enacted) { - when { - bolusDelivered > 0 -> { - ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment - ret += "
" + rh.gs(info.nightscout.core.main.R.string.smb_shortname) + ": " + bolusDelivered + " " + rh.gs(info.nightscout.core.main.R.string.insulin_unit_shortname) - } - - isTempCancel -> { - ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted - ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment + - "
" + rh.gs(info.nightscout.core.main.R.string.cancel_temp) - } - - isPercent && percent != -1 -> { - ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment - ret += "
" + rh.gs(info.nightscout.core.main.R.string.duration) + ": " + duration + " min" - ret += "
" + rh.gs(info.nightscout.core.main.R.string.percent) + ": " + percent + "%" - } - - absolute != -1.0 -> { - ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment - ret += "
" + rh.gs(info.nightscout.core.main.R.string.duration) + ": " + duration + " min" - ret += "
" + rh.gs(info.nightscout.core.main.R.string.absolute) + ": " + DecimalFormatter.to2Decimal(absolute) + " U/h" - } - } - } else { - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment - } - return ret - } - - } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 9f75cc24fe..1ed28f48e7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -31,7 +31,6 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged import info.nightscout.androidaps.events.EventNewBG -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.directionToIcon import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.logging.UserEntryLogger @@ -94,6 +93,7 @@ import info.nightscout.rx.events.EventAcceptOpenLoopChange import info.nightscout.rx.events.EventExtendedBolusChange import info.nightscout.rx.events.EventMobileToWear import info.nightscout.rx.events.EventPreferenceChange +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventRefreshOverview import info.nightscout.rx.events.EventScale import info.nightscout.rx.events.EventTempBasalChange diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt index 6db8761907..535d947d34 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt @@ -6,7 +6,6 @@ import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.putDouble import info.nightscout.androidaps.extensions.putInt import info.nightscout.androidaps.extensions.putString @@ -29,6 +28,7 @@ import info.nightscout.plugins.general.overview.notifications.NotificationWithAc import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt index 8b13243a5f..093ed83101 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt @@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatActivity import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R import info.nightscout.androidaps.data.ProfileSealed -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin @@ -46,6 +45,7 @@ import info.nightscout.plugins.profile.ProfileFragment import info.nightscout.plugins.profile.ProfilePlugin import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventSWUpdate import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt index d73e0f5388..3538833520 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt @@ -9,11 +9,9 @@ import info.nightscout.androidaps.MainActivity import info.nightscout.androidaps.R import info.nightscout.androidaps.activities.NoSplashAppCompatActivity import info.nightscout.androidaps.databinding.ActivitySetupwizardBinding -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.setupwizard.elements.SWItem -import info.nightscout.rx.events.EventSWUpdate import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.interfaces.locale.LocaleHelper.update @@ -21,6 +19,8 @@ import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.events.EventProfileStoreChanged import info.nightscout.rx.events.EventProfileSwitchChanged +import info.nightscout.rx.events.EventPumpStatusChanged +import info.nightscout.rx.events.EventSWUpdate import info.nightscout.shared.sharedPreferences.SP import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt index 87551f9dc5..2bfe1ef0d3 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -32,6 +32,7 @@ import info.nightscout.interfaces.constraints.Objectives import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.plugin.PluginType +import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.pump.defs.PumpDescription import info.nightscout.interfaces.queue.CommandQueue @@ -89,8 +90,8 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { it.sp = sp it.dateUtil = dateUtil } - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } } } @@ -122,7 +123,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { `when`(rh.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") `when`(rh.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s") `when`(rh.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") - `when`(rh.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump") + `when`(context.getString(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump") `when`(rh.gs(R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started") // RS constructor diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt b/app/src/test/java/info/nightscout/androidaps/pump/PumpEnactResultTest.kt similarity index 91% rename from core/core-main/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt rename to app/src/test/java/info/nightscout/androidaps/pump/PumpEnactResultTest.kt index b6e491ab96..46a1ce51d7 100644 --- a/core/core-main/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/pump/PumpEnactResultTest.kt @@ -1,10 +1,14 @@ -package info.nightscout.androidaps.data +package info.nightscout.androidaps.pump import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBaseWithProfile import info.nightscout.core.main.R +import info.nightscout.core.pumpExtensions.toHtml import info.nightscout.interfaces.pump.PumpEnactResult +import info.nightscout.plugins.extensions.toText +import info.nightscout.plugins.sync.nsShared.extensions.json +import info.nightscout.plugins.sync.nsShared.extensions.log import org.json.JSONObject import org.junit.Assert import org.junit.Before @@ -16,8 +20,8 @@ class PumpEnactResultTest : TestBaseWithProfile() { private val injector = HasAndroidInjector { AndroidInjector { - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } } } @@ -130,7 +134,7 @@ class PumpEnactResultTest : TestBaseWithProfile() { Enacted: true Comment: AAA Insulin: 10.0 U - """.trimIndent(), per.toString() + """.trimIndent(), per.toText(rh) ) per = PumpEnactResult(injector).enacted(true).isTempCancel(true).comment("AAA") Assert.assertEquals( @@ -139,7 +143,7 @@ class PumpEnactResultTest : TestBaseWithProfile() { Enacted: true Comment: AAA Cancel temp basal - """.trimIndent(), per.toString() + """.trimIndent(), per.toText(rh) ) per = PumpEnactResult(injector).enacted(true).isPercent(true).percent(90).duration(20).comment("AAA") Assert.assertEquals( @@ -149,7 +153,7 @@ class PumpEnactResultTest : TestBaseWithProfile() { Comment: AAA Duration: 20 min Percent: 90% - """.trimIndent(), per.toString() + """.trimIndent(), per.toText(rh) ) per = PumpEnactResult(injector).enacted(true).isPercent(false).absolute(1.0).duration(30).comment("AAA") Assert.assertEquals( @@ -159,29 +163,29 @@ class PumpEnactResultTest : TestBaseWithProfile() { Comment: AAA Duration: 30 min Absolute: 1.0 U/h - """.trimIndent(), per.toString() + """.trimIndent(), per.toText(rh) ) per = PumpEnactResult(injector).enacted(false).comment("AAA") Assert.assertEquals( """ Success: false Comment: AAA - """.trimIndent(), per.toString() + """.trimIndent(), per.toText(rh) ) } @Test fun toHtmlTest() { var per: PumpEnactResult = PumpEnactResult(injector).enacted(true).bolusDelivered(10.0).comment("AAA") - Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
SMB: 10.0 U", per.toHtml()) + Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
SMB: 10.0 U", per.toHtml(rh)) per = PumpEnactResult(injector).enacted(true).isTempCancel(true).comment("AAA") - Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
Cancel temp basal", per.toHtml()) + Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
Cancel temp basal", per.toHtml(rh)) per = PumpEnactResult(injector).enacted(true).isPercent(true).percent(90).duration(20).comment("AAA") - Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
Duration: 20 min
Percent: 90%", per.toHtml()) + Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
Duration: 20 min
Percent: 90%", per.toHtml(rh)) per = PumpEnactResult(injector).enacted(true).isPercent(false).absolute(1.0).duration(30).comment("AAA") - Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
Duration: 30 min
Absolute: 1.00 U/h", per.toHtml()) + Assert.assertEquals("Success: false
Enacted: true
Comment: AAA
Duration: 30 min
Absolute: 1.00 U/h", per.toHtml(rh)) per = PumpEnactResult(injector).enacted(false).comment("AAA") - Assert.assertEquals("Success: false
Comment: AAA", per.toHtml()) + Assert.assertEquals("Success: false
Comment: AAA", per.toHtml(rh)) } @Test fun jsonTest() { diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt index 819daa59f5..4cadbb79da 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt @@ -7,6 +7,7 @@ import info.nightscout.androidaps.TestBase import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import info.nightscout.interfaces.Config +import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.utils.TimerUtil import info.nightscout.rx.bus.RxBus @@ -39,16 +40,16 @@ class ActionAlarmTest : TestBase() { it.dateUtil = dateUtil it.config = config } - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } } } @Before fun setup() { - `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK") - `when`(rh.gs(info.nightscout.core.main.R.string.alarm)).thenReturn("Alarm") + `when`(context.getString(info.nightscout.core.main.R.string.ok)).thenReturn("OK") + `when`(context.getString(info.nightscout.core.main.R.string.alarm)).thenReturn("Alarm") `when`(rh.gs(ArgumentMatchers.eq(R.string.alarm_message), ArgumentMatchers.anyString())).thenReturn("Alarm: %s") sut = ActionAlarm(injector) diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt index ecdcc68d5d..abe270509e 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt @@ -18,8 +18,9 @@ class ActionLoopDisableTest : ActionsTestBase() { fun setup() { testPumpPlugin.pumpDescription.isTempBasalCapable = true + `when`(context.getString(info.nightscout.core.main.R.string.disableloop)).thenReturn("Disable loop") `when`(rh.gs(info.nightscout.core.main.R.string.disableloop)).thenReturn("Disable loop") - `when`(rh.gs(R.string.alreadydisabled)).thenReturn("Disable loop") + `when`(context.getString(R.string.alreadydisabled)).thenReturn("Already disabled") sut = ActionLoopDisable(injector) } diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt index 7b750a0a7b..ac79bec92f 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt @@ -18,7 +18,7 @@ class ActionLoopEnableTest : ActionsTestBase() { testPumpPlugin.pumpDescription.isTempBasalCapable = true `when`(rh.gs(info.nightscout.core.main.R.string.enableloop)).thenReturn("Enable loop") - `when`(rh.gs(R.string.alreadyenabled)).thenReturn("Already enabled") + `when`(context.getString(R.string.alreadyenabled)).thenReturn("Already enabled") sut = ActionLoopEnable(injector) } diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt index dc953fbbed..e6e0ea5cdd 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt @@ -1,9 +1,9 @@ package info.nightscout.automation.actions -import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction -import info.nightscout.database.impl.transactions.Transaction import info.nightscout.automation.R import info.nightscout.database.entities.TemporaryTarget +import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction +import info.nightscout.database.impl.transactions.Transaction import info.nightscout.interfaces.queue.Callback import io.reactivex.rxjava3.core.Single import org.junit.Assert @@ -19,7 +19,7 @@ class ActionLoopResumeTest : ActionsTestBase() { fun setup() { `when`(rh.gs(info.nightscout.core.main.R.string.resumeloop)).thenReturn("Resume loop") - `when`(rh.gs(R.string.notsuspended)).thenReturn("Not suspended") + `when`(context.getString(R.string.notsuspended)).thenReturn("Not suspended") sut = ActionLoopResume(injector) } diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt index 22a8d204c6..ee2007379c 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.actions -import info.nightscout.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration +import info.nightscout.interfaces.queue.Callback import org.junit.Assert import org.junit.Before import org.junit.Test @@ -17,9 +17,9 @@ class ActionLoopSuspendTest : ActionsTestBase() { @Before fun setup() { - `when`(rh.gs(info.nightscout.core.main.R.string.suspendloop)).thenReturn("Suspend loop") + `when`(context.getString(info.nightscout.core.main.R.string.suspendloop)).thenReturn("Suspend loop") `when`(rh.gs(ArgumentMatchers.eq(R.string.suspendloopforXmin), ArgumentMatchers.anyInt())).thenReturn("Suspend loop for %d min") - `when`(rh.gs(R.string.alreadysuspended)).thenReturn("Already suspended") + `when`(context.getString(R.string.alreadysuspended)).thenReturn("Already suspended") sut = ActionLoopSuspend(injector) } diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt index 6abb4a39a8..d456dbc4f4 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt @@ -1,5 +1,6 @@ package info.nightscout.automation.actions +import android.content.Context import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase @@ -8,6 +9,7 @@ import info.nightscout.automation.elements.InputString import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.database.impl.transactions.Transaction +import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback import info.nightscout.rx.bus.RxBus import info.nightscout.shared.interfaces.ResourceHelper @@ -23,6 +25,7 @@ import org.mockito.Mockito.`when` class ActionNotificationTest : TestBase() { @Mock lateinit var rh: ResourceHelper + @Mock lateinit var context: Context @Mock lateinit var rxBus: RxBus @Mock lateinit var repository: AppRepository @@ -34,15 +37,15 @@ class ActionNotificationTest : TestBase() { it.rxBus = rxBus it.repository = repository } - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } } } @Before fun setup() { - `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK") + `when`(context.getString(info.nightscout.core.main.R.string.ok)).thenReturn("OK") `when`(rh.gs(info.nightscout.core.main.R.string.notification)).thenReturn("Notification") `when`( rh.gs( diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt index ae0b862b72..e5393dacb7 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt @@ -1,8 +1,8 @@ package info.nightscout.automation.actions -import info.nightscout.interfaces.queue.Callback import info.nightscout.automation.R import info.nightscout.automation.elements.InputProfileName +import info.nightscout.interfaces.queue.Callback import org.junit.Assert import org.junit.Before import org.junit.Test @@ -22,10 +22,10 @@ class ActionProfileSwitchTest : ActionsTestBase() { @Before fun setUp() { `when`(rh.gs(R.string.profilename)).thenReturn("Change profile to") `when`(rh.gs(ArgumentMatchers.eq(R.string.changengetoprofilename), ArgumentMatchers.anyString())).thenReturn("Change profile to %s") - `when`(rh.gs(R.string.alreadyset)).thenReturn("Already set") - `when`(rh.gs(info.nightscout.core.main.R.string.notexists)).thenReturn("not exists") - `when`(rh.gs(info.nightscout.core.main.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty") - `when`(rh.gs(info.nightscout.core.main.R.string.noprofile)).thenReturn("No profile loaded from NS yet") + `when`(context.getString(R.string.alreadyset)).thenReturn("Already set") + `when`(context.getString(info.nightscout.core.main.R.string.notexists)).thenReturn("not exists") + `when`(context.getString(info.nightscout.core.main.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty") + `when`(context.getString(info.nightscout.core.main.R.string.noprofile)).thenReturn("No profile loaded from NS yet") sut = ActionProfileSwitch(injector) } diff --git a/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt b/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt index a009848d9a..e6a32c4a29 100644 --- a/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt +++ b/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt @@ -1,5 +1,6 @@ package info.nightscout.automation.actions +import android.content.Context import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBaseWithProfile @@ -16,6 +17,7 @@ import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.plugin.PluginDescription import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.ProfileSource +import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.smsCommunicator.SmsCommunicator import info.nightscout.rx.logging.AAPSLogger @@ -65,6 +67,7 @@ ActionsTestBase : TestBaseWithProfile() { @Mock lateinit var smsCommunicator: SmsCommunicator @Mock lateinit var loopPlugin: TestLoopPlugin @Mock lateinit var uel: UserEntryLogger + @Mock lateinit var context: Context private val pluginDescription = PluginDescription() lateinit var testPumpPlugin: TestPumpPlugin @@ -156,8 +159,8 @@ ActionsTestBase : TestBaseWithProfile() { if (it is ActionStopProcessing) { it.rh = rh } - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } if (it is Trigger) { it.rh = rh @@ -179,7 +182,7 @@ ActionsTestBase : TestBaseWithProfile() { `when`(activePlugin.activeProfileSource).thenReturn(profilePlugin) `when`(profilePlugin.profile).thenReturn(getValidProfileStore()) - `when`(rh.gs(info.nightscout.core.main.R.string.ok)).thenReturn("OK") - `when`(rh.gs(info.nightscout.core.main.R.string.error)).thenReturn("Error") + `when`(context.getString(info.nightscout.core.main.R.string.ok)).thenReturn("OK") + `when`(context.getString(info.nightscout.core.main.R.string.error)).thenReturn("Error") } } \ No newline at end of file diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt index f13f211758..6231dede3d 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt @@ -9,7 +9,6 @@ import android.view.Window import android.view.WindowManager import dagger.android.support.DaggerDialogFragment import info.nightscout.androidaps.activities.DialogAppCompatActivity -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning import info.nightscout.core.main.R @@ -20,6 +19,7 @@ import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventOverviewBolusProgress +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/core-main/src/main/java/info/nightscout/core/pumpExtensions/PumpEnactResultExtension.kt b/core/core-main/src/main/java/info/nightscout/core/pumpExtensions/PumpEnactResultExtension.kt new file mode 100644 index 0000000000..8de34e0389 --- /dev/null +++ b/core/core-main/src/main/java/info/nightscout/core/pumpExtensions/PumpEnactResultExtension.kt @@ -0,0 +1,43 @@ +package info.nightscout.core.pumpExtensions + +import info.nightscout.androidaps.utils.DecimalFormatter +import info.nightscout.interfaces.pump.PumpEnactResult +import info.nightscout.shared.interfaces.ResourceHelper + +fun PumpEnactResult.toHtml(rh: ResourceHelper): String { + var ret = "" + rh.gs(info.nightscout.core.main.R.string.success) + ": " + success + if (queued) { + ret = rh.gs(info.nightscout.core.main.R.string.waitingforpumpresult) + } else if (enacted) { + when { + bolusDelivered > 0 -> { + ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted + if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment + ret += "
" + rh.gs(info.nightscout.core.main.R.string.smb_shortname) + ": " + bolusDelivered + " " + rh.gs(info.nightscout.core.main.R.string.insulin_unit_shortname) + } + + isTempCancel -> { + ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted + ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment + + "
" + rh.gs(info.nightscout.core.main.R.string.cancel_temp) + } + + isPercent && percent != -1 -> { + ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted + if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment + ret += "
" + rh.gs(info.nightscout.core.main.R.string.duration) + ": " + duration + " min" + ret += "
" + rh.gs(info.nightscout.core.main.R.string.percent) + ": " + percent + "%" + } + + absolute != -1.0 -> { + ret += "
" + rh.gs(info.nightscout.core.main.R.string.enacted) + ": " + enacted + if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment + ret += "
" + rh.gs(info.nightscout.core.main.R.string.duration) + ": " + duration + " min" + ret += "
" + rh.gs(info.nightscout.core.main.R.string.absolute) + ": " + DecimalFormatter.to2Decimal(absolute) + " U/h" + } + } + } else { + if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.main.R.string.comment) + ": " + comment + } + return ret +} \ No newline at end of file diff --git a/core/core-main/src/main/res/values/strings.xml b/core/core-main/src/main/res/values/strings.xml index 372f8be06e..116109a93a 100644 --- a/core/core-main/src/main/res/values/strings.xml +++ b/core/core-main/src/main/res/values/strings.xml @@ -110,14 +110,9 @@ Tempbasal delivery error Going to deliver %1$.2f U Waiting for pump - Connecting for %1$d s Delivering %1$.2f U - Handshaking Connecting - Connected Disconnected - Disconnecting - Waiting for disconnection AAPS started %1$.1f U %1$.2f U diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt index 67db266124..577a7171ed 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt @@ -5,7 +5,6 @@ import android.content.Context import android.os.Build import android.os.PowerManager import android.os.SystemClock -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.safeDisable import info.nightscout.androidaps.extensions.safeEnable import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning @@ -16,6 +15,7 @@ import info.nightscout.interfaces.Constants import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventQueueChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt index c9c1be3116..95471d7e49 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt @@ -24,6 +24,7 @@ import info.nightscout.interfaces.constraints.Constraints import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.pump.DetailedBolusInfo +import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.Command @@ -104,8 +105,8 @@ class CommandQueueImplementationTest : TestBaseWithProfile() { if (it is CommandLoadHistory) { it.activePlugin = activePlugin } - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } } } @@ -254,7 +255,7 @@ class CommandQueueImplementationTest : TestBaseWithProfile() { Assert.assertEquals(2, commandQueue.size()) // when - commandQueue.cancelAllBoluses(anyLong()) + commandQueue.cancelAllBoluses(null) // then Assert.assertEquals(0, commandQueue.size()) diff --git a/plugins/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt b/plugins/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt new file mode 100644 index 0000000000..3e97485abb --- /dev/null +++ b/plugins/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt @@ -0,0 +1,40 @@ +package info.nightscout.plugins.extensions + +import info.nightscout.interfaces.pump.PumpEnactResult +import info.nightscout.shared.interfaces.ResourceHelper + +fun PumpEnactResult.toText(rh: ResourceHelper): String { + var ret = rh.gs(info.nightscout.core.main.R.string.success) + ": " + success + if (enacted) { + when { + bolusDelivered > 0 -> { + ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.configbuilder_insulin)}: $bolusDelivered ${rh.gs(info.nightscout.core.main.R.string.insulin_unit_shortname)}" + } + + isTempCancel -> { + ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" + if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.cancel_temp)}" + } + + isPercent -> { + ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" + if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.duration)}: $duration min" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.percent)}: $percent%" + } + + else -> { + ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" + if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.duration)}: $duration min" + ret += "\n${rh.gs(info.nightscout.core.main.R.string.absolute)}: $absolute U/h" + } + } + } else { + ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" + } + return ret +} diff --git a/plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt b/plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt index 38bbf3ad2d..8c1ab06a9d 100644 --- a/plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt +++ b/plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt @@ -28,6 +28,7 @@ import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.utils.TimeChangeType import info.nightscout.plugins.R +import info.nightscout.plugins.extensions.toText import info.nightscout.plugins.pump.virtual.events.EventVirtualPumpUpdateGui import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus @@ -399,40 +400,4 @@ open class VirtualPumpPlugin @Inject constructor( } override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {} - - private fun PumpEnactResult.toText(rh: ResourceHelper): String { - var ret = rh.gs(info.nightscout.core.main.R.string.success) + ": " + success - if (enacted) { - when { - bolusDelivered > 0 -> { - ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.configbuilder_insulin)}: $bolusDelivered ${rh.gs(info.nightscout.core.main.R.string.insulin_unit_shortname)}" - } - - isTempCancel -> { - ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" - if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.cancel_temp)}" - } - - isPercent -> { - ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" - if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.duration)}: $duration min" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.percent)}: $percent%" - } - - else -> { - ret += "\n${rh.gs(info.nightscout.core.main.R.string.enacted)}: $enacted" - if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.duration)}: $duration min" - ret += "\n${rh.gs(info.nightscout.core.main.R.string.absolute)}: $absolute U/h" - } - } - } else { - ret += "\n${rh.gs(info.nightscout.core.main.R.string.comment)}: $comment" - } - return ret - } } diff --git a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt index a714f484c7..ceb3655cc5 100644 --- a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt +++ b/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt @@ -70,8 +70,8 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() { var injector: HasAndroidInjector = HasAndroidInjector { AndroidInjector { - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } if (it is AuthRequest) { it.aapsLogger = aapsLogger diff --git a/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt index aa09e834d6..dcba982f18 100644 --- a/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt +++ b/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt @@ -1,5 +1,6 @@ package info.nightscout.androidaps.plugins.pump.combo +import android.content.Context import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase @@ -9,6 +10,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus import info.nightscout.interfaces.constraints.Constraint import info.nightscout.interfaces.plugin.PluginType import info.nightscout.interfaces.profile.ProfileFunction +import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.rx.bus.RxBus @@ -30,11 +32,12 @@ class ComboPluginTest : TestBase() { @Mock lateinit var sp: SP @Mock lateinit var dateUtil: DateUtil @Mock lateinit var ruffyScripter: RuffyScripter + @Mock lateinit var context: Context private val injector = HasAndroidInjector { AndroidInjector { - if (it is PumpEnactResultObject) { - it.rh = rh + if (it is PumpEnactResult) { + it.context = context } } } @@ -44,7 +47,7 @@ class ComboPluginTest : TestBase() { @Before fun prepareMocks() { `when`(rh.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump") - `when`(rh.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump") + `when`(context.getString(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump") comboPlugin = ComboPlugin(injector, aapsLogger, RxBus(aapsSchedulers, aapsLogger), rh, profileFunction, sp, commandQueue, pumpSync, dateUtil, ruffyScripter) } diff --git a/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt index 20c781ba0d..691242ba93 100644 --- a/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt +++ b/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt @@ -14,7 +14,6 @@ import info.nightscout.androidaps.dana.activities.DanaHistoryActivity import info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity import info.nightscout.androidaps.dana.databinding.DanarFragmentBinding import info.nightscout.androidaps.dana.events.EventDanaRNewStatus -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.utils.WarnColors import info.nightscout.androidaps.utils.alertDialogs.OKDialog @@ -31,6 +30,7 @@ import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventExtendedBolusChange import info.nightscout.rx.events.EventInitializationChanged +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventQueueChanged import info.nightscout.rx.events.EventTempBasalChange import info.nightscout.rx.logging.AAPSLogger diff --git a/pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt index 37bd4ec142..fcf8439efe 100644 --- a/pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt +++ b/pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt @@ -15,7 +15,6 @@ import info.nightscout.androidaps.dana.database.DanaHistoryRecord import info.nightscout.androidaps.dana.database.DanaHistoryRecordDao import info.nightscout.androidaps.dana.databinding.DanarHistoryActivityBinding import info.nightscout.androidaps.dana.databinding.DanarHistoryItemBinding -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.core.profile.toUnitsString @@ -28,6 +27,7 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.events.EventDanaRSyncStatus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.LTag import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java index 49f88c27e7..5412a38b62 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java @@ -37,7 +37,6 @@ import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended; import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal; import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService; import info.nightscout.androidaps.dialogs.BolusProgressDialog; -import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification; import info.nightscout.interfaces.Constants; import info.nightscout.interfaces.constraints.Constraints; @@ -54,6 +53,7 @@ import info.nightscout.rx.bus.RxBus; import info.nightscout.rx.events.EventInitializationChanged; import info.nightscout.rx.events.EventOverviewBolusProgress; import info.nightscout.rx.events.EventProfileSwitchChanged; +import info.nightscout.rx.events.EventPumpStatusChanged; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.rx.logging.LTag; import info.nightscout.shared.interfaces.ResourceHelper; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt index dcc08e521e..d2d9fad9a6 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt @@ -4,10 +4,10 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.dana.DanaPump import info.nightscout.androidaps.danar.R import info.nightscout.androidaps.danar.comm.MessageBase -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.interfaces.pump.defs.PumpType -import info.nightscout.shared.utils.T +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.LTag +import info.nightscout.shared.utils.T import java.util.GregorianCalendar class MsgHistoryEventsV2 constructor( diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java index 4faef95548..5ae46913e6 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java @@ -49,7 +49,6 @@ import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended; import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal; import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService; import info.nightscout.androidaps.dialogs.BolusProgressDialog; -import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification; import info.nightscout.interfaces.Constants; import info.nightscout.interfaces.notifications.Notification; @@ -68,6 +67,7 @@ import info.nightscout.rx.bus.RxBus; import info.nightscout.rx.events.EventInitializationChanged; import info.nightscout.rx.events.EventOverviewBolusProgress; import info.nightscout.rx.events.EventProfileSwitchChanged; +import info.nightscout.rx.events.EventPumpStatusChanged; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.rx.logging.LTag; import info.nightscout.shared.interfaces.ResourceHelper; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java index 2f4bb92576..8152625dd4 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java @@ -39,7 +39,6 @@ import info.nightscout.androidaps.danar.comm.MsgHistoryRefill; import info.nightscout.androidaps.danar.comm.MsgHistorySuspend; import info.nightscout.androidaps.danar.comm.MsgPCCommStart; import info.nightscout.androidaps.danar.comm.MsgPCCommStop; -import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification; import info.nightscout.androidaps.utils.ToastUtils; import info.nightscout.core.fabric.FabricPrivacy; @@ -53,6 +52,7 @@ import info.nightscout.rx.bus.RxBus; import info.nightscout.rx.events.EventAppExit; import info.nightscout.rx.events.EventBTChange; import info.nightscout.rx.events.EventOverviewBolusProgress; +import info.nightscout.rx.events.EventPumpStatusChanged; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.rx.logging.LTag; import info.nightscout.shared.interfaces.ResourceHelper; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java index f76e77a9ef..4d3a4041d4 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java @@ -44,7 +44,6 @@ import info.nightscout.androidaps.danar.comm.MsgStatusBasic; import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended; import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal; import info.nightscout.androidaps.dialogs.BolusProgressDialog; -import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification; import info.nightscout.interfaces.Constants; import info.nightscout.interfaces.notifications.Notification; @@ -60,6 +59,7 @@ import info.nightscout.rx.bus.RxBus; import info.nightscout.rx.events.EventInitializationChanged; import info.nightscout.rx.events.EventOverviewBolusProgress; import info.nightscout.rx.events.EventProfileSwitchChanged; +import info.nightscout.rx.events.EventPumpStatusChanged; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.rx.logging.LTag; import info.nightscout.shared.interfaces.ResourceHelper; diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt index bc2986c2e4..3df8d189e2 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt @@ -7,13 +7,13 @@ import info.nightscout.androidaps.danars.DanaRSPlugin import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.databinding.DanarsEnterPinActivityBinding import info.nightscout.androidaps.danars.services.BLEComm -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.hexStringToByteArray import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.textValidator.DefaultEditTextValidator import info.nightscout.androidaps.utils.textValidator.EditTextValidator import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.rx.AapsSchedulers +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.shared.sharedPreferences.SP import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt index 6303fad958..7425729e94 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt @@ -4,12 +4,12 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.dana.DanaPump import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage import info.nightscout.interfaces.pump.DetailedBolusInfo import info.nightscout.interfaces.pump.PumpSync import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt index 1f0d5a758b..7b058e89b3 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt @@ -30,7 +30,6 @@ import info.nightscout.androidaps.danars.comm.DanaRSPacketEtcKeepConnection import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.androidaps.danars.encryption.EncryptionType import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.notify import info.nightscout.androidaps.extensions.waitMillis import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification @@ -39,6 +38,7 @@ import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.interfaces.notifications.Notification import info.nightscout.interfaces.pump.PumpSync import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt index 2c40416a5f..ba0ca98f51 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt @@ -55,7 +55,6 @@ import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionSetPumpTime import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionSetPumpUTCAndTimeZone import info.nightscout.androidaps.danars.comm.DanaRSPacketOptionSetUserOption import info.nightscout.androidaps.dialogs.BolusProgressDialog -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.interfaces.Constants @@ -76,6 +75,7 @@ import info.nightscout.rx.events.EventAppExit import info.nightscout.rx.events.EventInitializationChanged import info.nightscout.rx.events.EventOverviewBolusProgress import info.nightscout.rx.events.EventProfileSwitchChanged +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt index e87fa80349..3cb55f408e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt @@ -13,7 +13,6 @@ import info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity import info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity import info.nightscout.androidaps.diaconn.databinding.DiaconnG8FragmentBinding import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.utils.WarnColors import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.interfaces.plugin.ActivePlugin @@ -24,6 +23,7 @@ import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventExtendedBolusChange import info.nightscout.rx.events.EventInitializationChanged +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventQueueChanged import info.nightscout.rx.events.EventTempBasalChange import info.nightscout.rx.logging.AAPSLogger diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt index b7470d7a0b..f07a34152c 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt @@ -15,7 +15,6 @@ import info.nightscout.androidaps.diaconn.common.RecordTypes import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao import info.nightscout.androidaps.diaconn.databinding.DiaconnG8HistoryActivityBinding -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.interfaces.plugin.ActivePlugin @@ -23,6 +22,7 @@ import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.rx.AapsSchedulers +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt index 56535fdfbe..9204a7854b 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt @@ -38,7 +38,6 @@ import info.nightscout.androidaps.diaconn.pumplog.LOG_SUSPEND_V2 import info.nightscout.androidaps.diaconn.pumplog.LOG_TB_START_V3 import info.nightscout.androidaps.diaconn.pumplog.LOG_TB_STOP_V3 import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage import info.nightscout.interfaces.plugin.ActivePlugin @@ -47,6 +46,7 @@ import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.pump.defs.PumpDescription import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.LTag import info.nightscout.shared.extensions.safeGetPackageInfo import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt index dc355d6366..6d5df45aaa 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt @@ -25,12 +25,12 @@ import info.nightscout.androidaps.diaconn.packet.DiaconnG8ResponseMessageHashTab import info.nightscout.androidaps.diaconn.packet.DiaconnG8SettingResponseMessageHashTable import info.nightscout.androidaps.diaconn.packet.InjectionBlockReportPacket import info.nightscout.androidaps.diaconn.packet.InsulinLackReportPacket -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.notify import info.nightscout.androidaps.extensions.waitMillis import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.rx.bus.RxBus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt index b7f225c2b1..e5ff1dc471 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt @@ -45,7 +45,6 @@ import info.nightscout.androidaps.diaconn.packet.TimeInquirePacket import info.nightscout.androidaps.diaconn.packet.TimeSettingPacket import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil import info.nightscout.androidaps.dialogs.BolusProgressDialog -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage import info.nightscout.core.fabric.FabricPrivacy @@ -68,6 +67,7 @@ import info.nightscout.rx.events.EventAppExit import info.nightscout.rx.events.EventInitializationChanged import info.nightscout.rx.events.EventOverviewBolusProgress import info.nightscout.rx.events.EventProfileSwitchChanged +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java index 1fb0b81518..bb6b67a12e 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java @@ -8,7 +8,6 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; -import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.plugins.pump.eopatch.R; import info.nightscout.androidaps.plugins.pump.eopatch.RxAction; import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode; @@ -47,6 +46,7 @@ import info.nightscout.interfaces.queue.CommandQueue; import info.nightscout.rx.AapsSchedulers; import info.nightscout.rx.bus.RxBus; import info.nightscout.rx.events.EventCustomActionsChanged; +import info.nightscout.rx.events.EventPumpStatusChanged; import info.nightscout.rx.events.EventRefreshOverview; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.shared.interfaces.ResourceHelper; diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt index 168756a19f..a09c97d3f2 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt @@ -9,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import dagger.android.support.DaggerFragment -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice @@ -34,6 +33,7 @@ import info.nightscout.pump.core.defs.PumpDeviceState import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventExtendedBolusChange +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventQueueChanged import info.nightscout.rx.events.EventRefreshButtonState import info.nightscout.rx.events.EventTempBasalChange diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt index d39d640855..93ce2ef285 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt @@ -9,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import dagger.android.support.DaggerFragment -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewPodInfoBinding @@ -39,6 +38,7 @@ import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventPreferenceChange +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.rx.events.EventQueueChanged import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt index 61dd8c44b2..695fe6fa02 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt @@ -15,7 +15,6 @@ import android.widget.TableLayout import android.widget.TableRow import android.widget.TextView import info.nightscout.androidaps.activities.NoSplashAppCompatActivity -import info.nightscout.androidaps.events.EventPumpStatusChanged import info.nightscout.androidaps.extensions.total import info.nightscout.core.fabric.FabricPrivacy import info.nightscout.core.main.R @@ -28,6 +27,7 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.events.EventDanaRSyncStatus +import info.nightscout.rx.events.EventPumpStatusChanged import info.nightscout.shared.SafeParse import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.utils.T