From 7fc215db9053785845ffd25f580ab0113a23a124 Mon Sep 17 00:00:00 2001 From: Philoul Date: Mon, 6 Dec 2021 23:06:27 +0100 Subject: [PATCH 1/4] Add byoda icon for CGM button --- .../plugins/general/overview/OverviewFragment.kt | 4 ++++ app/src/main/res/drawable/ic_byoda.xml | 9 +++++++++ icons/byoda.svg | 9 +++++++++ 3 files changed, 22 insertions(+) create mode 100644 app/src/main/res/drawable/ic_byoda.xml create mode 100644 icons/byoda.svg 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 24287366f3..f2115b59f5 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 @@ -557,6 +557,10 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val xDripIsBgSource = xdripPlugin.isEnabled() val dexcomIsSource = dexcomPlugin.isEnabled() binding.buttonsLayout.calibrationButton.visibility = ((xDripIsBgSource || dexcomIsSource) && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)).toVisibility() + if (dexcomPlugin.isEnabled()) + binding.buttonsLayout.cgmButton.setCompoundDrawables(rh.gd(R.drawable.ic_xdrip), null, null, null) + else if (xdripPlugin.isEnabled()) + binding.buttonsLayout.cgmButton.setCompoundDrawables(rh.gd(R.drawable.ic_byoda), null, null, null) binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility() // Automation buttons diff --git a/app/src/main/res/drawable/ic_byoda.xml b/app/src/main/res/drawable/ic_byoda.xml new file mode 100644 index 0000000000..1cb312cfb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_byoda.xml @@ -0,0 +1,9 @@ + + + diff --git a/icons/byoda.svg b/icons/byoda.svg new file mode 100644 index 0000000000..4feefdb599 --- /dev/null +++ b/icons/byoda.svg @@ -0,0 +1,9 @@ + + + + + + From a75451e80e882637eaa9bb01a99ee2f85b2a5ff4 Mon Sep 17 00:00:00 2001 From: Philoul Date: Mon, 6 Dec 2021 23:11:07 +0100 Subject: [PATCH 2/4] Add byoda in strings for CGM and Calibration buttons summary --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3185c9652b..5c11c93572 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -648,8 +648,8 @@ show_wizard_button show_insulin_button show_treatment_button - Sends a calibration to xDrip+ or open G5 calibration dialog - Opens xDrip+, back buttons returns to AAPS + Sends a calibration to xDrip+ or open BYODA calibration dialog + Opens xDrip+ or BYODA, back buttons returns to AAPS insulin_button_increment_1 insulin_button_increment_2 insulin_button_increment_3 From 61017e1b544e49cd520c8e6115eb631cebc05c68 Mon Sep 17 00:00:00 2001 From: Philoul Date: Mon, 6 Dec 2021 23:48:10 +0100 Subject: [PATCH 3/4] Set icon and text color in Overview according to MGC plugin --- .../plugins/general/overview/OverviewFragment.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 f2115b59f5..cbd3bfbb1d 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 @@ -557,10 +557,13 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val xDripIsBgSource = xdripPlugin.isEnabled() val dexcomIsSource = dexcomPlugin.isEnabled() binding.buttonsLayout.calibrationButton.visibility = ((xDripIsBgSource || dexcomIsSource) && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)).toVisibility() - if (dexcomPlugin.isEnabled()) - binding.buttonsLayout.cgmButton.setCompoundDrawables(rh.gd(R.drawable.ic_xdrip), null, null, null) - else if (xdripPlugin.isEnabled()) - binding.buttonsLayout.cgmButton.setCompoundDrawables(rh.gd(R.drawable.ic_byoda), null, null, null) + if (dexcomPlugin.isEnabled()) { + binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null) + binding.buttonsLayout.cgmButton.setTextColor(rh.gc(R.color.white)) + } else if (xdripPlugin.isEnabled()) { + binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_xdrip), null, null) + binding.buttonsLayout.cgmButton.setTextColor(rh.gc(R.color.colorCalibrationButton)) + } binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility() // Automation buttons From 9145a11563b53ac2e57ff35865e904ee550a0d85 Mon Sep 17 00:00:00 2001 From: Philoul Date: Tue, 7 Dec 2021 00:02:58 +0100 Subject: [PATCH 4/4] Simplify code --- .../androidaps/plugins/general/overview/OverviewFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 cbd3bfbb1d..b784b3cebc 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 @@ -557,10 +557,10 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val xDripIsBgSource = xdripPlugin.isEnabled() val dexcomIsSource = dexcomPlugin.isEnabled() binding.buttonsLayout.calibrationButton.visibility = ((xDripIsBgSource || dexcomIsSource) && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)).toVisibility() - if (dexcomPlugin.isEnabled()) { + if (dexcomIsSource) { binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null) binding.buttonsLayout.cgmButton.setTextColor(rh.gc(R.color.white)) - } else if (xdripPlugin.isEnabled()) { + } else if (xDripIsBgSource) { binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_xdrip), null, null) binding.buttonsLayout.cgmButton.setTextColor(rh.gc(R.color.colorCalibrationButton)) }