From 84f032a7a2a6349cf559396d3a0d905bf751c124 Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 8 May 2020 17:58:01 +0200 Subject: [PATCH] Revert "Temp Basal icon switched" I replace first proposal with a new one with 3 icons This reverts commit 24112eb4 --- .../androidaps/plugins/general/overview/OverviewFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 021c3729e2..7194d39d61 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 @@ -667,7 +667,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList } overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) } ?: resourceHelper.gc(R.color.defaulttextcolor)) - overview_basebasal_icon.setImageResource(if (activeTemp == null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end) + + if (activeTemp != null) + overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low) + else + overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr ) // Extended bolus val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())