From 82bdb4df9a63cdbceb8f3e4a9a314cc7c5d0185d Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Thu, 9 Feb 2023 18:20:47 +0100 Subject: [PATCH 1/3] comboctl-main: Use the standard bolus' total amount as its immediate amount Signed-off-by: Carlos Rafael Giani --- .../info/nightscout/comboctl/main/Pump.kt | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt b/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt index beb1e5074e..13e5d845ef 100644 --- a/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt +++ b/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt @@ -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)) { From cf9605828657f493dedfe99475da0e480c1be3fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 08:59:25 +0000 Subject: [PATCH 2/3] chore(deps): bump dagger_version from 2.44.2 to 2.45 Bumps `dagger_version` from 2.44.2 to 2.45. Updates `com.google.dagger:dagger-android-processor` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) Updates `com.google.dagger:dagger-compiler` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) Updates `com.google.dagger:dagger` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) Updates `com.google.dagger:dagger-android` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) Updates `com.google.dagger:dagger-android-support` from 2.44.2 to 2.45 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.44.2...dagger-2.45) --- updated-dependencies: - dependency-name: com.google.dagger:dagger-android-processor dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-android-support dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6dbaeff066..91acb09ffd 100644 --- a/build.gradle +++ b/build.gradle @@ -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' From 7fc5612e54a533a6b0e914d4d7f51d085377dbe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 08:59:57 +0000 Subject: [PATCH 3/3] chore(deps): bump com.google.firebase:firebase-bom from 31.2.0 to 31.2.1 Bumps com.google.firebase:firebase-bom from 31.2.0 to 31.2.1. --- updated-dependencies: - dependency-name: com.google.firebase:firebase-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/utils/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/utils/build.gradle b/core/utils/build.gradle index 9059ced179..3f0423d48f 100644 --- a/core/utils/build.gradle +++ b/core/utils/build.gradle @@ -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