caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

combov2: Apply changes from comboctl

Browse source 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
This commit is contained in:
Carlos Rafael Giani 2023-01-02 21:20:42 +01:00
parent aff55d2f60
commit fffe014d4e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
View file

@ -81,7 +81,7 @@ class ComboV2Fragment : DaggerFragment() {
else else
rh.gs(R.string.combov2_cancelling_tbr) rh.gs(R.string.combov2_cancelling_tbr)
is ComboCtlPump.DeliveringBolusCommandDesc -> is ComboCtlPump.DeliveringBolusCommandDesc ->
rh.gs(R.string.combov2_delivering_bolus_cmddesc, desc.bolusAmount.cctlBolusToIU()) rh.gs(R.string.combov2_delivering_bolus_cmddesc, desc.immediateBolusAmount.cctlBolusToIU())
is ComboCtlPump.FetchingTDDHistoryCommandDesc -> is ComboCtlPump.FetchingTDDHistoryCommandDesc ->
rh.gs(R.string.combov2_fetching_tdd_history_cmddesc) rh.gs(R.string.combov2_fetching_tdd_history_cmddesc)
is ComboCtlPump.UpdatingPumpDateTimeCommandDesc -> is ComboCtlPump.UpdatingPumpDateTimeCommandDesc ->

4
pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
View file

@ -1768,8 +1768,8 @@ class ComboV2Plugin @Inject constructor (
is RTCommandProgressStage.DeliveringBolus -> is RTCommandProgressStage.DeliveringBolus ->
rh.gs( rh.gs(
R.string.combov2_delivering_bolus, R.string.combov2_delivering_bolus,
stage.deliveredAmount.cctlBolusToIU(), stage.deliveredImmediateAmount .cctlBolusToIU(),
stage.totalAmount.cctlBolusToIU() stage.totalImmediateAmount.cctlBolusToIU()
) )
else -> "" else -> ""
} }