Merge remote-tracking branch 'origin/dev' into ns15
This commit is contained in:
commit
c6ec76488e
3 changed files with 22 additions and 7 deletions
|
@ -9,7 +9,7 @@ buildscript {
|
|||
rxkotlin_version = '3.0.1'
|
||||
room_version = '2.5.0'
|
||||
lifecycle_version = '2.5.1'
|
||||
dagger_version = '2.44.2'
|
||||
dagger_version = '2.45'
|
||||
coroutines_version = '1.6.4'
|
||||
activity_version = '1.6.1'
|
||||
fragmentktx_version = '1.5.5'
|
||||
|
|
|
@ -22,7 +22,7 @@ dependencies {
|
|||
implementation project(':app-wear-shared:shared')
|
||||
|
||||
//Firebase
|
||||
api platform('com.google.firebase:firebase-bom:31.2.0')
|
||||
api platform('com.google.firebase:firebase-bom:31.2.1')
|
||||
api "com.google.firebase:firebase-analytics-ktx"
|
||||
api "com.google.firebase:firebase-crashlytics-ktx"
|
||||
// StatsActivity not in use now
|
||||
|
|
|
@ -1533,11 +1533,26 @@ class Pump(
|
|||
pumpMode = null,
|
||||
isIdempotent = false,
|
||||
description = DeliveringBolusCommandDesc(
|
||||
totalBolusAmount,
|
||||
immediateBolusAmount,
|
||||
durationInMinutes,
|
||||
standardBolusReason,
|
||||
bolusType
|
||||
totalBolusAmount = totalBolusAmount,
|
||||
// A standard bolus only has an immediate portion, no extended one. This
|
||||
// implies that its total amount is also its immediate amount. As the
|
||||
// function documentation states, the user only species the total amount
|
||||
// when delivering a standard bolus - the immediateBolusAmount argument
|
||||
// of deliverBolus() is ignored. It makes no sense for users to have
|
||||
// to specify the same value twice.
|
||||
//
|
||||
// For UI elements it is however useful to have immediateBolusAmount be
|
||||
// automatically set to the totalBolusAmount when delivering a standard
|
||||
// bolus. One example for why this is useful is when during the immediate
|
||||
// portion of a bolus, a modal dialog is shown with a progress bar, while
|
||||
// the extended portion shows no such dialog.
|
||||
//
|
||||
// For this reason, assign the totalBolusAmount quantity to the
|
||||
// immediateBolusAmount field of the command desc if this is a standard bolus.
|
||||
immediateBolusAmount = if (bolusType == CMDDeliverBolusType.STANDARD_BOLUS) totalBolusAmount else immediateBolusAmount,
|
||||
durationInMinutes = durationInMinutes,
|
||||
standardBolusReason = standardBolusReason,
|
||||
bolusType = bolusType
|
||||
)
|
||||
) {
|
||||
require((totalBolusAmount > 0) && (totalBolusAmount <= 250)) {
|
||||
|
|
Loading…
Reference in a new issue